Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,463 Commits 63 Branches 22 Tags 194 MiB
dacc60d28f
Commit Graph

3801 Commits

Author SHA1 Message Date
thunder2
a4b54e1021 Fixed compile on Windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7194 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-21 14:50:34 +00:00
chrisparker126
e2c8c6e141 Compilation fix. Rs compiles now, group and message creation work ok, more testing to do still 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-20 11:26:53 +00:00
drbob
5b472c34e2 adding back compile error 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7190 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-19 12:11:17 +00:00
chrisparker126
0f29d28b1b merge of branch v0.6-idclean 7180 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-17 20:56:06 +00:00
drbob
7815efb16f remove reference to uncommited file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-10 09:39:31 +00:00
notdefine
9dedf6f461 Update Doxfiles for Online Doxygen generation http://notdefine.de/retroshare/retroshare-gui/html/index.html and http://notdefine.de/retroshare/libretroshare/html/index.html 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-08 13:07:34 +00:00
defnax
d9aead7709 update icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-07 16:21:17 +00:00
drbob
740de02489 Added ServicePermissions Settings page. 
This just presents dummy data at the moment.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7172 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-07 13:48:33 +00:00
defnax
a621dcc4d1 clean up old icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-06 15:35:34 +00:00
defnax
76ecaffccb updated the MinGW build bat files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-05 22:46:37 +00:00
defnax
e21564f72e cleanup old icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-28 17:54:52 +00:00
defnax
ddf811f80a added new icons and splash images from Feal, cleaning up old icons, still need more cleanup 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-28 17:01:14 +00:00
defnax
265bc65299 changed the default identity icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-19 16:20:19 +00:00
drbob
4bdd7b3b4d - Correct missed parts for fixed updateGroup. 
- Updated IdDialog to support Modifying Opinions on GxsIds.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-19 11:11:06 +00:00
defnax
b785132cbe Fixing layout changes in Id Edit Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-13 11:55:14 +00:00
drbob
d65bdca1ec Improved GxsGroupDialog for Show / Edit of Groups. 
- Added Show/Edit Menu Options for all services.
 - Fixed up BUTTONBOX_OK bugs.
 - Tested name changes for all services.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-09 10:43:59 +00:00
defnax
c626feeed5 improving they combobox layout direction, for better look. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7097 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-06 16:49:15 +00:00
drbob
bbd28256b6 fixed circlesComboBox enabled in gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7093 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-05 07:08:29 +00:00
defnax
307404fa0f improving the layout for the hidden checkbox 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7089 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-04 18:34:13 +00:00
drbob
f51efde985 added missing header for Linux. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-04 08:10:44 +00:00
chrisparker126
accdf7e982 fixed segfault in forum show dialog 
prob merge issue

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-02 23:17:07 +00:00
drbob
a4f0221d89 Added in Icons to GxsIDs. 
Can support:
	- "Unique" Icon based of GxsID.
	- Icon indicating PGP/Anon.
	- Icons for RecognTags.

Needs more work to Make Unique Icons look good.
and Add Icon sets.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-02 11:25:11 +00:00
csoler
10bf083ca3 imported IdEditDialog.ui from v0.6-initdev branch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 15:55:03 +00:00
defnax
d706a98dd6 merging the ui changes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 15:18:33 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk. 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 14:16:15 +00:00
csoler
1aa2e221d2 put compilation error in place and redirect users to branch 0.5.5. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7071 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-29 20:07:48 +00:00
csoler
1d19938295 added jpeg to the list of image extensions for messages/avatars/etc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:38:11 +00:00
csoler
730554d397 improved gui message for known peers that are not friends 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:33:17 +00:00
drbob
08f442d65b updated version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 09:03:34 +00:00
drbob
3b71e8e140 Improvements to enable Edit/Show of GxsGroups. 
NB: The actual update doesn't happen yet - mainly just the display of info.
  - Fixed up Constructor, and loading of MetaData via TokenService.
  - Fixed up Enabled / ReadOnly for Show.
  - Updated children to match new functionality.
  - Fixed up Show in Circles Dialog too.
  - removed a few compile errors.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 07:57:58 +00:00
defnax
5896de972e update changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-25 14:48:51 +00:00
csoler
91c49fa992 added ElidedLabel to be used in places where labels might be too long and therefore trigger an unwanted window resize. This is currently used as forum thread titles (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 20:03:24 +00:00
drbob
46518ebf51 revert GUI part of svn commit 7042 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 07:29:54 +00:00
chrisparker126
f3afc128ee Chozabu patch 
- New db created for parent group id field, you will all previous gxs data
- posted now support sub post topics

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 23:38:48 +00:00
csoler
efd1447a84 removed code for old certificate format. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 14:42:16 +00:00
drbob
45bd72203e Added TOR Configuration page. Allows STD Nodes to configure Proxy too. 
Moved most of hidden node parameters to this page.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7038 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 06:27:02 +00:00
drbob
d39c5c028a fixed up hidden addresses and removed whitespace from onion address. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 23:29:22 +00:00
csoler
037abea5eb Fixed spaces in copy/paste of rich text (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 22:55:14 +00:00
thunder2
741424dd72 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 21:23:56 +00:00
csoler
affdd49001 made cert of versions 0.5 and 0.6 incompatible. Removed old cert format parse/display 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 16:53:19 +00:00
drbob
ee09c3ce9c Allow Local Address to be saved and modified in hidden mode. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 05:05:35 +00:00
drbob
bbe3ee8d2f - Switched to new RsAccounts interface. 
- Reworked ServerPage to support HiddenNode configuration.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 02:35:06 +00:00
csoler
735eb7a5c6 updated version numbers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-17 17:53:12 +00:00
csoler
09467cf87e updated ts files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7025 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-17 17:47:38 +00:00
defnax
bdecf3def1 Improving some layouts for the Feed Items 
Update Splash Image

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-17 00:40:28 +00:00
csoler
b8c65db00e limit max number of feed items to 500, to avoid flooding possibility. Improved text 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 20:51:13 +00:00
csoler
8594d68985 improved text for security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 20:20:17 +00:00
csoler
bbdc978d00 improved display/fixed bugs in security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 19:57:08 +00:00
defnax
6fa0d894d0 clean up SecurityItem, removed unused old stuff 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 17:52:41 +00:00
defnax
7f71619c93 changed the default stylesheet color for the Security Feed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7019 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-16 17:36:01 +00:00
csoler
613f822133 added new feed item types and logic to show connection attempts from forged certificates (e.g. bad signature, bad certificate) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-15 20:19:17 +00:00
thunder2
9eaea5de12 Updated english translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-14 11:41:34 +00:00
defnax
ff8e30db55 Enabled to display the Notes text on the Post Item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-12 14:53:57 +00:00
defnax
c869fd863d Âdded to change the string for the OK Button, for each different GXS Group Dialog . 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7010 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-11 22:02:05 +00:00
thunder2
e78d14c67b Fixed compile with Qt 5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7008 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-11 18:34:38 +00:00
defnax
90fa8128d0 Enabled, to get selectable/copyable by mouse the RS version number Label 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7007 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-11 13:42:04 +00:00
defnax
97cd659679 Improving Posted Links, changed some strings, added a info label, not allow blank posts without a title. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7005 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-10 18:41:08 +00:00
defnax
2c59fe8ab5 redesign the Posted Links Item, to look more user friendly 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-09 02:05:20 +00:00
thunder2
dacec52e4f Fixed display of the nickname for the chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-08 11:37:16 +00:00
csoler
630824aa1b Updated the notification system. Main changes are: 
- the notification system is now a service, p3Notify, that is a public RsNotify.
- RsNotify does nothing except providing a registration system for new notify clients.
- Clients should derive a notify client from the NotifyClient class and register it to rsNotify
- all registered clients get all notifications, so only derive the needed methods. This should allow 
  plugins to get notifications as well.
- updated the code to call RsServer::notify()->[notification method] from inside libretroshare
- pqiNotify has been removed.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-07 22:51:22 +00:00
defnax
3cc8c144a8 corrected uploads name column item size 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6995 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-07 20:58:56 +00:00
defnax
03c27dcdc3 fixed temporary to load the Wiki Groups Tree at startup, auto update seems not to work. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-07 19:14:38 +00:00
defnax
b7bb1c25cb * Enabled the Filter Line edit for filtering friends, by nick/ID for Create Circles Dialog's Known Identities Widget. 
* Set some minimum header sizes for some items
* Enabled sorting for the QTreeWidget's

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-06 18:31:12 +00:00
thunder2
3e13311be0 Fixed slot for signal "filesPreModChanged" and "filesPostModChanged" on SharedFilesDialog. 
The list of files is now updated also when the tab is visible.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6990 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-05 22:51:54 +00:00
thunder2
aff10a352c Optimized filling of shared files (local and remote). 
Added cache to RemoteDirModel.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6989 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-04 22:39:34 +00:00
defnax
50ebd781e5 * Corrected the layout of the Connect Progress Dialog 
* Added few more file type icons for "cpp", "h" nd "c"
* Corrected some strings
* Moved Uploads to Downloads Tab. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-04 19:54:07 +00:00
defnax
469da4914f Added a default FileType icon for the "patch" and "diff" extensions. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-03 19:32:53 +00:00
thunder2
92fabf4c56 Modified the patch from electron. 
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat).
Recompile needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 00:56:46 +00:00
defnax
7b0a6afa56 patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows now Buttons from different Plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 22:25:49 +00:00
defnax
0e134d0a92 Added to change the text for the Play Button, when file is not a media file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 16:58:52 +00:00
thunder2
abd6b46ca0 Added a custom context menu for pasting RS-links to the base class MimeTextEdit and removed the custom context menu from derived classes. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-30 19:12:16 +00:00
csoler
3b381b9d22 patch "Fix_ChannelNotificationFeedLink" from Phenom. Allows to finish loading a channel before jumping to the linked post 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6973 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 22:15:53 +00:00
csoler
03c68c1276 patch "AddSearchFilesourceSorted_6951.diff" from Phenom. Adds correct sorting for search results. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:25:49 +00:00
defnax
93c331f40b * Enabled min and max buttons for settings window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6967 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 19:59:25 +00:00
defnax
51ed2ca9f9 * Changed the logo size for some news feed items to use same size for better look. 
* Added to display blue/black forum message icons for the forum feeds, when forum is anon or signed. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 18:24:13 +00:00
csoler
490abbeffc fixed small issue in chat lobby list. Not yet the cause for the ghost lobby 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-26 21:44:02 +00:00
csoler
cb7dccf0b8 added lobby ID as tooltip to lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-26 19:35:12 +00:00
defnax
9d78ad8942 renaming strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-25 17:16:17 +00:00
defnax
beedc07de8 Added a default background color for the Channel Message Logo for a better look and feel, removed stretching of the logo, set a minimum size, background is now filled black. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-23 20:03:46 +00:00
chrisparker126
39909b705f merging rs_gxs-finale to v0.6 branch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-21 18:20:47 +00:00
thunder2
dbfe3f6c51 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-20 18:51:12 +00:00
thunder2
607458dad7 Added missing language files. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 16:12:16 +00:00
thunder2
3d48e8b4cb - Added language Catalan (ca_ES) 
- Updated english translation
- Updated languages from Transifex

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 15:08:36 +00:00
thunder2
a0f6b6f36c Fixed version file rsguiversion.in 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:38:35 +00:00
csoler
57c66bd06f forgot to commit this: show correct connect address (local or global) depending on the current status 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:12:02 +00:00
csoler
f6bdbd5e21 removed HandleRichText.cpp from last commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 13:52:47 +00:00
csoler
6380f6121c moved defines for version to .h, as it is super hard to script the replacement of the defines in the cpp file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 13:50:10 +00:00
csoler
01588f6f53 fixed bug introduced in 6910, due to calling member on deleted mCreator 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-28 19:43:14 +00:00
csoler
75c178082f fixed last received time stamp so that it displays the last time data was actually received 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-27 20:01:09 +00:00
defnax
eab486f5db Added back the Subscribe Button to Channels 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-21 00:02:33 +00:00
thunder2
c447ab2829 Channels: 
- Use destination directory when manually downloading a file from a channel
- Show destination directory in channel details
- Fixed utf8 issue when choosing the destination directory

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6902 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-16 13:21:25 +00:00
csoler
fc56b95d3f show fingerprint in ConfCertDialog, and splitted the string with spaces. Removed the use of the ambiguous peer id for both pgp and locations ids 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-09 22:52:26 +00:00
thunder2
a20109a8ee Fixed version files (*.in) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-05 23:53:39 +00:00
csoler
f3750d0d61 added copy-rs-link to SubFileItem (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-02 14:56:22 +00:00
thunder2
5304865fc4 Added freeze option in NetworkView (Modified patch from K. Eisentraut) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6879 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-27 23:07:47 +00:00
drbob
bd0b1a5ac5 Updated SVN revision number for v0.5.5b. 
Moved #defines to code files for better encapsulation.
Removed other references to #defines.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-25 00:42:49 +00:00
thunder2
0ad20e6911 Updated german and french language from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-24 07:42:13 +00:00
thunder2
758b5d0079 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-23 11:07:17 +00:00
thunder2
e6d67ebf5a Code maintenance for Qt 5: 
- Added some more includes needed by MinGW-w64 for GXS

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-23 09:23:32 +00:00
defnax
e80330e7c5 changed some icons for the context menu in transfers dialog 
added default stylesheets

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6872 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-22 16:07:31 +00:00