Commit Graph

3511 Commits

Author SHA1 Message Date
thunder2
a823cc9edc Fixed some utf8 issues in identities.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6538 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-24 14:33:47 +00:00
thunder2
a2ab72fed3 Added frame to title bar in NewsFeed page.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6533 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-23 09:24:36 +00:00
thunder2
fef4a87c7c Simplify layout of NewsFeed dialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6531 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-22 19:14:49 +00:00
thunder2
83f0920721 Fixed layout of forums dialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6530 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-22 16:20:26 +00:00
csoler
9e7d6aa00b changed welcome message in broadcast chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6529 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-22 12:34:05 +00:00
csoler
b105d02524 updated strings for translation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-22 11:59:36 +00:00
csoler
d43a43963f fixed layout in NewsFeed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6526 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-21 19:52:48 +00:00
thunder2
3730645808 Fixed layout of forums dialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6523 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-20 17:30:58 +00:00
thunder2
024479d518 GXS:
- Enabled generate of mass data for forums and channels

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-19 21:06:19 +00:00
csoler
15f1df9e63 added more help panels
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-19 18:36:09 +00:00
csoler
d7e25e24e5 Remorked GUI layout a little bit:
- made all pages have a bar with full width
- added help button to each of them (needs adding text)
- improved help system so that it's easy to register a new help button
FriendsDialog still needs some cleaning.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-19 12:18:58 +00:00
thunder2
9c40fb878f GxsChannels:
- cleaned source code
- added auto refresh
- added todo button
- removed some debug output
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6517 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-19 09:48:51 +00:00
csoler
0b0010ff59 improved completion for chat (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6515 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-18 21:50:32 +00:00
csoler
a07e8d889a added help system to the MainPage class. Each page can now derive its own help string and show it using a two-states help button. To try it, I have implemented it on the NewsFeed page
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-18 19:32:12 +00:00
csoler
7c6a7edfde Sorted out the mess in friends list:
- removed entries from rightmost menu:
	* add friend: removed, already on the left bar
	* add group, recommendations and service perms => moved to context menu in friend list
	* create chat lobby: removed. Not relevant.
	* avatar and state string: removed. Can be done right at right, by clicking on the things.
- removed rightmost menu
- icons in context menu still need fixing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-16 22:33:45 +00:00
csoler
09971a06c6 removed messenger button from mainWindow
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6511 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-16 21:35:49 +00:00
csoler
36ea99da03 add date to chat msg if it is mroe than 1 day old
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6510 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-16 21:14:48 +00:00
csoler
ed9b6e0784 removed dual window in NetworkDialog. Changed checkbox name to something more accurate.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6509 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-16 21:08:09 +00:00
csoler
d215ca1af9 renamed known people into keyring
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-16 20:00:46 +00:00
thunder2
f4ee02bb01 TokenQueue:
- fixed stop of TokenQueue polling when events are locked

RsProtectedTimer:
- switched to faster poll when events are locked


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6507 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-16 00:03:20 +00:00
thunder2
4edcec6fe9 Posted Links:
- cleaned source code
- added auto refresh
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6506 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-15 18:39:39 +00:00
thunder2
11d2701edc GxsForums:
- added automatic refresh after subscribe/unsubscribe
- removed some debug output
- moved GxsForumsDialog.* to gui/gxsforums

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6505 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-15 14:22:33 +00:00
thunder2
6ac95b28cd Circles:
- cleaned source code
- added auto refresh
- added todo button
- fixed utf8 issues
- added new strings to translation
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6504 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-15 01:03:39 +00:00
thunder2
621c8037bc GXS:
- added three new classes for automatic refresh of ui
  - RsGxsUpdateBroadcastBase
  - RsGxsUpdateBroadcastWidget
  - RsGxsUpdateBroadcastPage
- prevent call to :singleShot on RsProtectedTimer
- extend RsGxsUpdateBroadcast
- added automatic refresh to Identity and Forums (except subscribe/unsubscribe)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-14 18:48:40 +00:00
csoler
14890ef007 added ACK system to make sure the secured tunnels for distant chat are actually working, before one starts using it.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6502 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-14 13:59:38 +00:00
csoler
2e32892a27 moved all files related to file transfer in gui/FileTransfer/
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-14 12:53:38 +00:00
thunder2
9eeacf7f83 GxsForums:
- optimized steps of the progressbar when loading
- added UIStateHelper
- removed debug output
- added Todo button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6500 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-12 17:24:11 +00:00
thunder2
207d86543c Fixed some spaces in the sourcecode.
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-11 08:14:38 +00:00
thunder2
f02cc51409 Identity:
- Redesigned dialog
- Fixed high CPU usage when showing reputation list
- Added todo button

UIStateHelper:
- Added new base class for easier handling of ui elements with token request (show "Loading", set enable state, ...)

RsProtectedTimer:
- Fixed compile on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-10 21:57:23 +00:00
csoler
e36557d542 added Specific protected timer class RsProtectedTimer to avoid passwd deadlock.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6494 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-10 21:11:11 +00:00
thunder2
c0cc792300 Added filter of items to RSTreeWidget.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-09 11:58:55 +00:00
thunder2
249f2ff2e0 Added new method cancelActiveRequestTokens to TokenQueue.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-09 11:57:57 +00:00
csoler
940ffd6d9c make friendlist fully resizable (Patch from phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 21:45:18 +00:00
csoler
9cfce22f88 added DynDNS to RS certificate link if available
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 20:27:29 +00:00
csoler
fd81d2bca8 added menu to enable/disable individual columns in Transfers (patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6486 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 19:34:34 +00:00
thunder2
71413bc325 Add expand all/collapse all on download list (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6485 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 15:48:40 +00:00
thunder2
dc29793da6 Disabled completer in private chat.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 15:37:22 +00:00
thunder2
e9db631f8f Fixed crash in completer of MimeTextEdit (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6483 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 15:17:34 +00:00
thunder2
4ce08bee38 Renamed the lib of sqlcipher to libsqlcipher.a for Windows too.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 00:58:17 +00:00
csoler
fa3cc82790 latest version of sqlcipher has changed the lib name to libsqlcipher.a
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-05 18:57:56 +00:00
thunder2
393e799e5f Show forum description as post text when no thread is selected.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6480 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-04 22:51:43 +00:00
chrisparker126
c1dddadb91 disabled photoshare
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-04 22:48:49 +00:00
csoler
9592baab3b removed email field from GenCertDialog, since it is not useful inside RS
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-04 20:22:09 +00:00
csoler
66d38ff1bb added column with IP for connected peers (modified patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-04 20:11:36 +00:00
thunder2
3208cf9e3a Removed some more hardcoded colors
- NetworkDialog
- ChatLobbyWidget
- FeedReader
Fixed style blacknight

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-04 20:09:46 +00:00
csoler
90e7a3cd54 added completer to MimeTextEdit and ChatWidget (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6475 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-04 19:36:12 +00:00
csoler
33f4e5b779 fixed deadlock (reported by Like)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6474 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-04 19:22:02 +00:00
csoler
12e228eba6 added eventsLocked() protection to UpdateGUI() timer callback
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-02 19:55:13 +00:00
csoler
f78e5da41e consistent renaming of columns in transfers tab and display of last time file has been written (Patch from Phenom)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-01 21:03:20 +00:00
thunder2
30c4a6ef93 Added quick fix to show the plain name and title in the chat lobby.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-01 20:35:07 +00:00
thunder2
81874da2cc Fixed showing utf8 characters in chat lobby name
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-30 13:58:17 +00:00
thunder2
1dfcc78cfb - Updated build instruction in file readme.txt (Patch from Henry)
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-30 09:56:52 +00:00
csoler
7414659bd9 Patch (modified) from Phenom to allow auto-subscribe to chat lobbies
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-29 16:15:33 +00:00
csoler
9f88917ac1 added display of SSL encryption parameters in PeerDetails dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6465 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-28 21:47:25 +00:00
csoler
9e91664ef0 fixed sqlite3.a path so that we use the correct .a (the one that really encrypts the database)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6461 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-25 19:05:59 +00:00
csoler
4868a90d81 patch from Henry morgan to fix soem typos (e.g misspelled connexion into connection)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-24 21:23:50 +00:00
thunder2
02f36b3bbb GxsIdChooser
- Sort items
- Added timer to load not cached RsGxsId's

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6458 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-23 18:55:30 +00:00
thunder2
233953cab9 Set path to sqlcipher instead of sqlite for Windows compile.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-23 00:00:40 +00:00
thunder2
766bd9c6ae - Fixed fill of news feed.
- Added display of feed count in main action.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-22 00:05:02 +00:00
defnax
0a10092816 Added flag for Netherlands
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6453 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-21 12:51:04 +00:00
thunder2
ea161b3be6 Added missing break in NotifyQt::notifyListChange.
The signal "groupsChanged" was emitted when the event "NOTIFY_LIST_CHAT_LOBBY_LIST" occurs.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-21 12:25:27 +00:00
defnax
7bc9e2ba53 Added a new icon for "connection refused by remote peer"
removed not good looking avatar label border stylesheet.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-21 11:45:11 +00:00
csoler
b8239abf40 fixed small bug that prevented online status in chat window to be updated
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-20 20:19:10 +00:00
thunder2
2db6d74b76 Localized Greek and Dutch (patch from Henry)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6446 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-20 18:24:13 +00:00
thunder2
e1ee7cca9c Fixed layout of distant chat page in settings.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-20 18:09:13 +00:00
thunder2
61d43e8e72 Disabled refill of FriendSelectionWidget after group changed when no groups are shown.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-20 12:27:51 +00:00
thunder2
c6e2034b66 - Fixed typo (patch from Henry)
- Updated english translation.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-19 16:24:07 +00:00
thunder2
cac96b8317 - Added some performance optimizations in FriendSelectionWidget::peerStatusChanged
- Fixed some ui design

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-19 13:18:15 +00:00
csoler
771ae5ba58 fixed transfer of color when pasting text (patch from AC)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-18 21:24:27 +00:00
csoler
c6a7dba418 fixed initialization of friend selection dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6440 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-18 20:32:10 +00:00
csoler
491438055d added proper naming functions for distant chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6439 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-18 20:13:58 +00:00
thunder2
e6c0217801 Fixed deadlock in FriendSelectionWidget (patch from Cyril)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-18 09:58:47 +00:00
csoler
b21fae52d0 improved status display for distant chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6437 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-17 21:58:26 +00:00
csoler
c45f2776ed added missing call to ChatDialog::chatFriend()
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6435 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-17 18:53:47 +00:00
csoler
69bf523c7a Enabled distant chat system.
Added system to collect and create chat invites from pgp keys.
Finished the GUI (some layouts need fixing, especially the link creation window).
Still needed: QoS on generic turtle data items. Will need a new item class for any anyway.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-16 14:39:44 +00:00
defnax
94b78a8444 Added default stylesheet for the QTextEdit in ProfileManager
Fixed, set only the TextEdit to read only mode.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6432 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-15 16:18:30 +00:00
csoler
ff544da72e added proper tunnel closing mechanism with notification of the talking peer, and popups to inform the chat participants
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6430 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-13 21:12:07 +00:00
thunder2
7ba8be0a56 Updated english translation.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-13 17:37:30 +00:00
thunder2
4e1ae88ee9 Fixed sort of friends in shared files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6428 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-13 15:19:38 +00:00
csoler
10d83d72b3 fixed wording (patch from HM)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6427 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-12 21:18:39 +00:00
csoler
42db43e590 - fixed a few bugs in PopupDistantChatDialog (Possible deadlock, wrong window for private chat)
- added method to properly close distant chat conversation (Still needs some work)
- improved chat link creation window + clipboard copy



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-12 21:10:09 +00:00
csoler
3f752b9eae improved GUI for distant chat link management
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6425 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-11 21:26:12 +00:00
thunder2
b427d5a4f2 Fixed typo (patch from Henry)
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6423 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-10 17:18:51 +00:00
thunder2
def0bd31de Updated languages from transiflex.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6422 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-10 16:45:07 +00:00
thunder2
27d72c6fba Fixed some compiler warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-10 13:27:24 +00:00
csoler
3b5bd220cf fixed compilation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6418 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-09 13:18:31 +00:00
csoler
f22972d0f4 fixed compilation for Qt 4.6
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6414 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-08 12:54:24 +00:00
thunder2
12ebb6aa9d Fixed compile on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-06 21:42:15 +00:00
csoler
dc2521cf71 Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410).
- adds turtle router as a generic tunneling service
- made ftServer a client of the service. Now turtle file items are handled in ftServer
- added new client: p3MsgService to send/recv pgp-encrypted distant messages
- added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels.
- The GUI is disabled for now, since it needs some polishing before being fully usable.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-06 19:58:30 +00:00
csoler
1450ae8a5e disabled distant chat/msg by default before merge
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-05 20:18:48 +00:00
csoler
9c69ad0500 added a new per-friend flag to allow to seek for direct transfers. Disabled for existing friendds (should be added manually), enabled by default for new friends
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-05 12:57:11 +00:00
thunder2
9adfc32155 Updated english translation.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6403 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-04 23:44:21 +00:00
thunder2
d44d3055c7 Added new languages - Greek and Dutch.
Update languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6402 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-04 23:39:07 +00:00
chrisparker126
325fa4f222 merging gxs_phase2 branch
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-04 21:00:43 +00:00
thunder2
1150366913 Updated english translation.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-03 16:43:00 +00:00
csoler
bedb77af73 fixed display of friend name instead of id in file lists
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6397 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-02 18:50:09 +00:00
csoler
e11f60150c improved error handling, and ensures that keyring is always kept consistent
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6395 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-31 19:16:04 +00:00
csoler
044858953a restored updated .ts file for english
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-31 11:25:21 +00:00
csoler
2751543d1b fixed translatable string with .arg (Req. From H. Morgan)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6387 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-30 20:26:16 +00:00
csoler
3b1bc50bd2 updated language file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6386 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-30 20:22:17 +00:00