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
5,940 Commits 63 Branches 22 Tags 194 MiB
cb4e28f5db
Commit Graph

5940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2be8033c7c updated changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-03 16:14:48 +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
af5c31a4f5 Use the best network interface to route an ip instead of the first interface in getLocalInterfaces on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6469 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-01 15:12:06 +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
1ebde8788f fixed packaging with GXS 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-25 22:02:38 +00:00
csoler
8d7bbb25f8 fixed slite lib linkage 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-25 19:48:51 +00:00
csoler
3560729ba7 fixed define for encrypted database 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6462 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-25 19:31:59 +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
csoler
748f7db7a4 Made pqiStore accept packets even after deserialization error, so that it is retrocompatible (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6459 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-23 21:53:14 +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
chrisparker126
4252270cd6 new db for release, TESTNET5, old TESTNET4 db's are not keyed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-22 16:21:13 +00:00
csoler
c2b06d47ad updated ubuntu changelog. Added additional script 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6455 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-22 13:06:38 +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
chrisparker126
87bb66e349 removed inlined #define RS_ENABLE_GXS 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6450 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-20 21:17:57 +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
chrisparker126
6b0594dfe1 Fixed database keying bug, left db closed causing meta modification fail. 
- needed to keep ssl pword a little while longer after rs init

Added more sturdy logic to prevent segv on failed msg/grp meta modification

Added, Data base does not key database if key string is empty

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-20 19:50:25 +00:00
csoler
5e319b1261 fixed autoWash() method in p3turtle. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6447 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-20 19:12:33 +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
8ab9c59a9f drop generic items with inconsistent peer id vs. tunnel directions 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-17 20:38:20 +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
63339153de removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6434 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-16 20:55:36 +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
chrisparker126
777366a79b Enabled db encryption and changed gxs folder 
- need sql cipher to compile if gxs compile flags are enabled

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6431 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-13 21:21:33 +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