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

5706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
csoler
d5c645e383 fixed assert crash due to using non RSA key 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-11 20:51:39 +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
a6e315db54 added include that might be necessary on some architectures 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6420 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-09 18:49:39 +00:00
thunder2
a304ffbab7 Fixed some compiler warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6419 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-09 17:54:54 +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
046a3548fe fixed update of flag for peer signature over own key 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6417 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-09 13:09:36 +00:00
csoler
90b5e76f25 fixed bug in anti-search-by-depth mechanism; removed some compiation warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6416 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-08 20:48:02 +00:00
thunder2
9fcb18553a Fixed crash with Windows compile. 
Renamed method "RsFiles::CopyFile" to "RsFiles::copyFile" (lower case) to avoid renaming of "CopyFile" to "CopyFileW" with the newly included "windows.h".

From windows.h
#define CopyFile CopyFileW

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-08 20:03:29 +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
f6509bef31 only add direct sources that have flag for direct DL enabled 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6412 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-06 20:52:24 +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
264f92cf15 disabled debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6409 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-05 19:55:10 +00:00
csoler
900abd0f54 fixed compilation of network simulator 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-05 19:54:34 +00:00
thunder2
faac2987db Revert changes for Windows compile in libretroshare.pro after merging gxs_phase2 branch. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-05 14:19:21 +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
csoler
ef2ebcc1d6 removed unused code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6405 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-05 12:55:48 +00:00
csoler
451dc2da5e disabled gxs by default in libretroshare to be consistent with rs-gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6404 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-05 12:11:46 +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
2804b9af69 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6399 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-02 21:48:52 +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
6914897584 fixed destination directory when downloading channel items in auto DL mode 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6396 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-01 12:33:54 +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
4b21232beb fixed bug potentially causing keyring corruption. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6394 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-31 17:33:20 +00:00
csoler
554234d385 no time stamp when merging from disk without signature modification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-31 12:42:16 +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
465420c59c fixed update of time_stamps for keys from disk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6391 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-31 08:13:16 +00:00
csoler
58319bc8ff fixed default initialization of time_stamps for keys 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-31 07:30:05 +00:00