Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-16 03:14:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,583 Commits 63 Branches 22 Tags 195 MiB
325fa4f222
Commit Graph

3351 Commits

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
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
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
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
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
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
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
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
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
chrisparker126
9a37bde4c8 user test version 
- disabled circles and photoshare

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6291 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-04 17:23:10 +00:00
drbob
c5a323f3cc GXS Improvements: 
- Added Basic CreateCircle Dialog.
 - Fixed up subscribe in both Posted and GxsChannels, tweaks to GxsForums too.
 - added update checks in GxsChannels.
 - made subscribe changes refresh Group List too.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6277 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-24 16:29:08 +00:00
csoler
3a8c9ad496 fixed bug in deferred signature code, due to thread copy+write mechanism 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-22 21:59:27 +00:00
defnax
1c27366cfa update changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6270 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-22 16:44:18 +00:00
csoler
263c15d6bd removed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-21 20:55:07 +00:00
csoler
fad59e4de3 Better chat lobby layout for small screens (patch from AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6265 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-21 20:32:04 +00:00
csoler
ff5fde090c added adaptive factor to force convergence of network graph 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6264 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-21 20:19:43 +00:00
csoler
b913c8ae4f made one additional string translat-able 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6263 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-21 12:00:29 +00:00
thunder2
3f0b21b396 Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6261 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 21:28:29 +00:00
csoler
72da514e0a fixed auto DL for own channels. Apparently the channel status is missing for this special case. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6259 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 20:34:03 +00:00
csoler
eca77205de fixed typos (patch from Henry Morgan) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6257 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 14:22:42 +00:00
csoler
214100be7d updated english translation strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6256 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 22:35:46 +00:00
thunder2
60e617150e Set initial size of the chat lobby splitter. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6255 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 22:34:30 +00:00
csoler
0b7f836eb1 removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6254 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:45:13 +00:00
csoler
64c5a7ece2 patch from AC to improve the list of participants in chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6253 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:37:38 +00:00
csoler
6e3a388f52 allow to unselect "create new identity" when the keyring is empty. This makes the Import Identity button appear 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6252 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:18:49 +00:00
csoler
1353cd3411 restored the profile manager, but only kept the export button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6251 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:10:54 +00:00
csoler
9348310f79 attempt at fixing layout in chat lobby widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6250 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:49:24 +00:00
csoler
1500fda2fd clicking on download for channel item marks the item as read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6248 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:32:46 +00:00
csoler
ef240cc6f0 removed column 1 and 2 of lobby lists. Put the info in tooltip => space gained. Enabled sorting in lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6244 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 19:46:39 +00:00
csoler
bffef991d8 fixed bug showing time shift warning multiple times. Removed the time estimate from the message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6243 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 19:37:26 +00:00
csoler
7f53f0e0cc added consistent detection of time-shift in chat lobbies. Shows a warning when the shift is larger than 2^9 seconds (approx. 10 minutes. Warning shown only once). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6242 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-18 23:19:37 +00:00
csoler
a850b18be2 renamed Security page Profile. Disabled profile manager for now, since generating a new profile while RS is running corrupts the current session. More work is needed to make the profile manager usable which RS is running. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6241 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-18 14:16:22 +00:00
csoler
2cd709d4bf updated english ts file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6240 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-18 14:04:28 +00:00
thunder2
813a8fad34 - Moved the created GxsIdRSTreeWidgetItem from the forum fill thread to the main thread so the signal to fill the id can be processed. 
- Removed QTimer from GxsIdTreeWidgetItem and GxsIdRSTreeWidgetItem.
- Added new tick signal (every second) on Rshare to fill the id.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6238 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-17 16:31:30 +00:00