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
6,428 Commits 63 Branches 22 Tags 194 MiB
97a069007f
Commit Graph

6428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
drbob
97a069007f removed debug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-30 11:52:08 +00:00
drbob
6e4883f606 removed debug messages. 
fixed bug in circles receive list.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-30 11:50:45 +00:00
defnax
52b3c372a2 Set the Text for the Add Share Button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-29 21:53:29 +00:00
defnax
06fe72e0d8 Removed Left side ToolBar. 
Moved Info, About & Options to the Top ToolBar
Moved Add Friend Button to Friends Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-29 11:52:13 +00:00
drbob
d5af5e7a96 Added Warning when Group has EXTERNAL_CIRCLE but mCircleId.isNull(). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-29 10:28:46 +00:00
thunder2
07e57836bf Merged revision 7165 from v0.5.5 
Create a hard link for preview on Windows with the real name of the downloading file


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-28 23:20:29 +00:00
csoler
4569c21cb0 Moved Forums and Channels to main window. Renamed Friends->Network. Code simplification in MainWindow. Next step: merge Circles and Identities 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-27 14:23:27 +00:00
drbob
b184bc1809 Add Gxs Circle test. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-27 13:26:14 +00:00
drbob
23480be883 Added PgpAuxUtils to allow Mocking of Pgp functions for simulations. 
Cleaned up some of the debug messages.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-27 13:14:07 +00:00
chrisparker126
4fe6161d58 -fixed msg sync test, now passing 
-enabled msg circle checking


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-26 23:48:33 +00:00
csoler
75188fb6f0 moved forums and channels into main window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-26 16:32:33 +00:00
chrisparker126
c6059906d0 Added msg sync unit test 
- not passing yet but almost, more tweaking needed 
TODO: identity and circle vet test
- added retrieve msg id for convenience
- updated .pro file

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7303 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-26 10:07:25 +00:00
chrisparker126
4cab2aaa65 Added another convenience class to simplify testing 
(automates comparisons)
fixed some unit tests caused by copy constructor removal


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7302 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-25 22:02:34 +00:00
csoler
71a02003be fixed compilation of FeedReader plugin 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-23 20:48:02 +00:00
csoler
7d13a7f85b updated network simulator with new grouter methods 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7300 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-23 16:17:12 +00:00
csoler
7e517906fd small optimizations to grouter 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7299 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-23 16:16:44 +00:00
defnax
8ec000220f Added new "Type" Label for the radio items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-22 23:23:11 +00:00
defnax
d18ac1fc84 added icons for the radio items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7297 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-22 22:35:23 +00:00
csoler
aa0c236607 removed debug info for grouter 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7296 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-21 13:13:00 +00:00
csoler
ac7f505efc fixed uninitialised memory read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7295 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-21 13:09:31 +00:00
csoler
9beb33f172 fixed enabling of distant messages, fixed serialisation bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7294 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-21 13:08:42 +00:00
csoler
4d2907efed - added client notification to grouter 
- now distant messages stay in outgoing box until notified to be received.
- fixed serialisation bug



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7293 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-21 12:39:30 +00:00
csoler
a3ddc0ac7d remvoed some debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7292 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-21 12:38:08 +00:00
drbob
6319733113 3 GXS BugFixes: 
- GxsCircles was created twice, removed second.
 - Modified Gxs DataLayer to always write AuthorId, modified retrieval to clear string if NULL.
      This originally caused AuthorId to filled with GroupId.
 - Fixed rsgxsnetservice to use mInternalCircle, rather than mCircleId.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7291 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-21 10:13:35 +00:00
csoler
bce35d26e3 fixed deadlock (found by Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7290 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-21 08:22:58 +00:00
csoler
33abca82e5 - removed LinksCloud from plugins (based on obsolete cache system) 
- removed copy constructor of RsGenericId from std::string as it allowed many inconsistencies and double transforms of IDs from/to strings


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 16:34:26 +00:00
csoler
160e04fe9a fixed VOIP plugin to work with v0.6 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 14:21:53 +00:00
csoler
ca6b463a31 fixed up plugin system to work with v0.6 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7287 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 14:20:13 +00:00
defnax
2d2a906ef2 update dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7286 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 12:20:23 +00:00
chrisparker126
5573fcc672 bug fix, str should be cleared of previous data to 
prevent fall through of previous result

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7285 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-20 09:12:26 +00:00
csoler
ed198af807 - added notification from global router to client services 
- keep distant messages in outbox until they get notified to be received
- cleanup dead code


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7284 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-19 16:02:11 +00:00
csoler
11e370c56d fixed non working tunneling system, due to wrong service id used to query online peers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7283 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-19 15:52:06 +00:00
defnax
0c224b014d Added default icons for the radio items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7282 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-19 13:48:02 +00:00
csoler
2c0a22b68e fixed compilation of rs-nogui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7281 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-19 12:42:27 +00:00
chrisparker126
4907d29156 group sync unit test now working 
added to .pro file


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7280 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-19 10:20:07 +00:00
chrisparker126
ef8f48ae73 Added rsshared ptr helper object (only use in test for memory management) 
Added first nxs_test
modified pserviceserver to allow better dependency injection 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-18 21:58:14 +00:00
csoler
a929f80596 final fixes to global routing algorithm. Ensured messages are kept long enough and re-tried less and less wth time. Corrected 2 routing bugs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7278 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-15 22:10:53 +00:00
thunder2
06ef59856f - Revert remove of forum settings 
- Added process of description in GxsGroupDialog (forum, wiki, channel, posted)
- Show forum description in GsxForumThreadWidget when no thread is selected
- Updated some todo's

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7277 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-14 22:36:10 +00:00
thunder2
0be1f8ee98 IdDialog: 
- Added missing tooltip "Edit Identity"
- Fixed gui layout
- Updated todo

IdEditDialog:
- Added window icon
- Added spacer to gui layout
- Set recogn tags at dialog start to hidden

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7276 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-14 15:37:06 +00:00
chrisparker126
e916299ceb - reviving nxs tests for gtest framework 
- removed double update bug thunder found

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7275 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-13 21:52:53 +00:00
csoler
5be7910cf5 improved network simulator, added display for message propagation and selective debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7274 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-13 19:27:50 +00:00
thunder2
50fcd401b1 Show "Add group" action in context menu of FriendList without groups. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7273 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-13 14:54:49 +00:00
drbob
23f6c405c8 Added framework for testing a pair of GXS services. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7272 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-13 12:21:51 +00:00
drbob
6be4a464a5 Add second testing Simulator. 
It has a number of PeerNodes, and captures traffic for examination.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-13 12:13:55 +00:00
csoler
3a13b2ac65 removed dsdv that was re-enabled probably by mistake 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7270 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-12 19:59:23 +00:00
csoler
9efb7f4136 improved routing algorithm. Fixed several bugs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7269 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-12 19:58:45 +00:00
drbob
9f358c5480 fixed printout of nxs items. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7268 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-12 07:25:33 +00:00
drbob
181dc9111b Added Gxs Service tests 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7267 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-12 07:24:17 +00:00
drbob
df4cf6030e Added NxsNetMgr to simulator 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-12 07:22:57 +00:00
drbob
1d17290e78 move #include out of header. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7265 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-12 03:53:30 +00:00