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,583 Commits 63 Branches 22 Tags 194 MiB
325fa4f222
Commit Graph

5583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
thunder2
df9ff91c3f Fixed compile under Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-30 21:13:55 +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
csoler
b4f26dcf8f fixed bug due to not using realloc correctly (thanks valgrind) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6385 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-30 19:43:05 +00:00
csoler
0d3d8ed2bd fixed uninitialized memory read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6384 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-30 18:26:50 +00:00
csoler
37854a4697 removed asserts left in packet-parse that would be triggered by the new cleaning code in openpgp-sdk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6383 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-30 16:50:17 +00:00
csoler
0266329dc8 - Added a drop-down item to allow removing unused keys, in the Network dialog. 
- added key removal method in OpenPGP-SDK
- improved FriendSelectionDialog/Widget to enable select all/none keys, and show non friend keys
- added safe key removal method in PGPHandler. Removed keys from other locations will not cause errors.
- added backup system to public keyring, impossibility to remove public parts of owned secret keys, etc.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-29 21:32:02 +00:00
csoler
02890c737a added columns for last used statistics on pgp keys in network dialog. Fixed bug due to missing Qt connection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-27 10:43:34 +00:00
csoler
e667e6b790 updated packaging scripts/rules to commit 6335 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6380 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-25 20:16:58 +00:00
csoler
8b1f4e6ee1 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6379 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-25 12:04:36 +00:00
thunder2
3a8a8c1e64 Removed unused member mChanReadStatus from p3Channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6378 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-24 14:57:33 +00:00
csoler
9eafd88c77 fixed missing dialog box for channel custom directory 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6377 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-24 12:45:35 +00:00
csoler
c2fa746991 added choice for default auto-download directory per channel. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6376 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-23 21:47:50 +00:00
csoler
2986e81f7e added ability to keep track of when keys have been last used for signature check, signing and encryption, so that we can later detect which keys are unused and get rid of them 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6374 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-21 22:38:00 +00:00
csoler
bb916ad1cc Ensured that inserConnect() is only called when the widget is visible 
- added new method RsautoUpdatePage::securedUpdatePage()
- made insertConnect() private to disallow connecting it with callbacks in notifyQt.cpp
- this should also correct some possible deadlocks in passphrase handling
Needs full recompile + qmake of GUI



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-21 12:55:03 +00:00
csoler
469b37aa60 patch from phenom to all resizing lobby participant lists 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6372 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-20 14:05:53 +00:00
thunder2
a497157110 FeedReader: 
- added new setting to save the config in the background for slow systems
- fixed memory leak in p3FeedReader::saveList

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6349 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-05-01 21:16:46 +00:00
thunder2
05f8b15cfe Added missing file "stream.proto" to the automatic generation in retroshare-nogui.pro. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6336 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 21:43:24 +00:00
drbob
f02383f5d6 from retroshare/code/branches/v0.5-rpc-b1 
--- Merging r6107 through r6332 into the rest of retroshare.

Updated version of RPC protocol with fancy new features like:
 - streaming.
 - add / remove friends.
 - file listings.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 21:10:34 +00:00
drbob
9e091c16b6 from retroshare/code/branches/v0.5-rpc-b1 
-- Merging r6107 through r6332 into 'libretroshare':



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6334 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 21:05:55 +00:00
thunder2
7810e7ace3 Added patch from Henry Morgan 
Fixed some typos.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6333 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 20:41:39 +00:00
defnax
322c3e70a1 Added a info Label for the Friend Request Page 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 15:19:58 +00:00
drbob
1f01eda2e2 Added missing rpcprotoutils file. 
Updated files RPC with TransferState



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 22:43:02 +00:00
drbob
19ac059ad2 Added Transfer State to RPC messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6330 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 22:40:30 +00:00
thunder2
dd0ef691c5 Fixed online time in profile widget. 
Fixed width of settings dialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6329 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 21:12:38 +00:00
thunder2
fea35e1e3c Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6326 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 16:34:03 +00:00
thunder2
6be253e9f8 Fixed sending of status typing in chat. Modifier keys does not send typing anymore. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 20:18:58 +00:00
thunder2
be34ede8fd Enabled history for chat lobbies (not saved to disc) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 16:43:49 +00:00
chrisparker126
c5c559ffe1 Fixed sql injection bug using sqlite prepared statements. 
added more doc detail to contentvalue (put takes private copy of data).
binds to content pointers take private copy of content.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6320 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-20 13:39:02 +00:00
thunder2
533d1f429a Added new icon for news feed from Agurer. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 21:30:50 +00:00
csoler
1dd8e9067f patch (from Henry Morgan) to make the tooltips translate-able in the group flags widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6317 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 21:09:05 +00:00
csoler
ae5e1c7ae5 reverted last commit. Fixed the perm bug in ConnectFreindWizard (Patch from Henry Morgan) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 11:54:39 +00:00
csoler
3240b1f71b patch from Henry Morgan to use ConfCertDialog rather than connectFriendWizard from Security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 18:54:53 +00:00
csoler
be795e4dd2 made passwd box modal 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 18:41:51 +00:00
chrisparker126
f0b31371f7 potential solution to SQL injection bug using radix64 enc/dec. 
-disabled for now (RADIX_STRING to enable), causing segfaults for no obvious reason, works on offline code. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 17:26:37 +00:00
csoler
c2fcd8bc71 patch from Henry Morgan to avoid removing peer permission flags when removing locations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-16 20:10:31 +00:00
thunder2
6590167475 Fixed compile with disabled Circles and PhotoShare. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-15 09:23:24 +00:00
csoler
35994e7197 changed priority for forwarded turtle traffic. The priority was so low that it explains why tunnels of length > 2 are so slow 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6303 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-10 21:44:33 +00:00
csoler
86ebfc5d2b calling the right function to get permission flags 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-08 19:55:21 +00:00