Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-28 08:16:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,673 Commits 63 Branches 22 Tags
Commit Graph

2731 Commits

Author SHA1 Message Date
thunder2
2a9a6f8a75 Changed order of the shutdown to fix a crash of the WebUI plugin. 
First stop the plugins then the other services.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 17:13:41 +00:00
thunder2
92fabf4c56 Modified the patch from electron. 
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat).
Recompile needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 00:56:46 +00:00
defnax
7b0a6afa56 patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows now Buttons from different Plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 22:25:49 +00:00
csoler
be3a593ee2 enabled load/save of grouter configuration. Checked that keys and info is properly restored at startup 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6975 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-28 21:47:15 +00:00
csoler
146465a53f fixed cipher list for openssl, since ECDHE is not configured, it cannot be used 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6974 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-28 21:41:43 +00:00
csoler
ee4985c935 patch "Fix_ChatLobbyAutoSubscribe_6951.diff" from Phenom. Fixes request for existing lobbies when no lobby ihas been found yet. Code beautification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:21:44 +00:00
csoler
5c52890ad5 added grouter as a msg sending service. Not enable yet. Added serialisation for grouter items and test methods in tests/serialiser/. Added saveList/loadList for grouter. set connectToTurtleRouter() and connectToGRouter() to be mandatory methods 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6970 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:06:47 +00:00
csoler
da1b6ac845 added serialisation methods for SSLId and time_t 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6969 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:02:25 +00:00
csoler
98847c60b1 moved SSLIdType to rsid.h which has less dependencies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6968 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:01:47 +00:00
csoler
d5cfa5c9b5 fixed ghost lobby issue (thx to thunder for spotting it out) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 09:16:43 +00:00
csoler
7edfa21ffd added routing methods for data in grouter. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-24 16:41:07 +00:00
csoler
03bd9dbef4 added serialisation methods and tests for grouter 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6959 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-23 16:05:46 +00:00
csoler
22f41b8e16 fixed parsong of file_cache. %ld was used in place of %lu 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6957 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-22 19:50:46 +00:00
csoler
1e52c7f22b added an option in the pro file for dsdv, as it is compiled when not used 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6956 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-22 17:10:56 +00:00
csoler
fd994a546b progress in grouter code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6955 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-22 17:04:13 +00:00
chrisparker126
8aca56bc4f merge fix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6954 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-21 19:27:48 +00:00
chrisparker126
39909b705f merging rs_gxs-finale to v0.6 branch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-21 18:20:47 +00:00
chrisparker126
cc7569e396 - enabled config saving of sync information 
- additional fixes for sync reloading
- confirmed sync now working with A B test

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6951 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-20 14:48:32 +00:00
csoler
f7142be9dd fixed parsing of size on non windows systems. unsigned long int requires %lu. Needs to be tested on MacOS 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6948 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-17 19:46:35 +00:00
chrisparker126
dab782fbaa Fixes for gxsupdate item serialisation 
- now works

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-15 20:11:39 +00:00
csoler
d839301b7c added missing services in RsPluginInterface class 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6946 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-15 19:35:14 +00:00
csoler
d26d6fa355 added check to only import version 4 keys in the keyring 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6945 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 20:58:06 +00:00
csoler
3add068cdd removed status member from FileDetails. Not used => misleading 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6944 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 19:41:52 +00:00
csoler
5800069acf error handling in pgphandler.cc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6938 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-10 10:08:41 +00:00
csoler
3e88b54ae3 removed asserts and put proper error handling in compress.c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6937 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-10 09:49:13 +00:00
chrisparker126
972674173d added tests for gxs update items 
- need to fix to allow saving sync config

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6936 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-09 22:24:49 +00:00
csoler
162ef94b70 extended max chunk TTL to 1 hour. A short TTL is not anymore needed since chuns are shared between sources 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-09 13:35:06 +00:00
csoler
b2bea751aa restriction to only accept self-signed certificates for friend keys 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6928 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-07 14:29:46 +00:00
csoler
68138fc1c8 fixed import of retroshare identities that have multiple signatures from the same key ID. Fixed bug reported by claude37 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-07 13:46:00 +00:00
csoler
214375ede1 added test program for identity import 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-07 13:10:57 +00:00
csoler
79e25b5dce added post-hash check for file modification. If the file has been modified while being hashed, it will not be shared until re-hashed. Should prevent chunks error in files that get hashed while being copied. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-05 20:11:32 +00:00
thunder2
e269128bdc Fixed compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-05 17:44:46 +00:00
csoler
028c9f8c07 split lastRecvTimeStamp into two different time stamps: one for last time the file is wrote (or data is received) and one for last activity that is used (and sometimes reset) by ftcontroller when queuing files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6921 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-04 20:26:54 +00:00
csoler
dd22bd24d9 fixed display of correct IP for connected friends. Only the external IP was shown previously. Port is not shown because it is random and could be misleading. Needs full recompilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-30 13:48:39 +00:00
csoler
6fe16d55e1 fixed up some debug text (patch from H.Morgan) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6917 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-29 22:09:13 +00:00
csoler
a1ab524bdf reduced string for lol bomb filtering, to filter out <\?xml* instead of <\?xml\ * 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6916 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-28 21:11:53 +00:00
csoler
f7a36d65a9 filter out disallowed direct sources from file request source list. Should systematically prevent unwanted direct transfers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-28 20:53:03 +00:00
csoler
01588f6f53 fixed bug introduced in 6910, due to calling member on deleted mCreator 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-28 19:43:14 +00:00
chrisparker126
e50f017572 Fixes of msg sync optimisation 
- msg sync opt now working
 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-27 21:54:05 +00:00
csoler
dda9d4eca5 do not accept keys without a uid. Previously this was crashing RS 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-27 20:37:24 +00:00
csoler
830404a25e fixed the bug that caused unwanted direct downloads. A check was missing in ftController::FileRequest 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6911 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-27 20:12:16 +00:00
csoler
75c178082f fixed last received time stamp so that it displays the last time data was actually received 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-27 20:01:09 +00:00
chrisparker126
3460457771 nxs grp sync optimisation now working 
- msg still needs a bit of work
- bug fix in grp sync found (reputation logic wrong)
- bug in nxssyncmsg serialisation from recent work


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6909 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-25 22:28:17 +00:00
chrisparker126
db30ea3ad4 forgot serialiser bad init 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6908 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-24 12:38:21 +00:00
chrisparker126
1cdf329bb1 fix for trigger statement, and readjusted algo to use self gen-exchange generated time stamps 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-24 12:37:17 +00:00
chrisparker126
24839ee237 decided to use polling and a database trigger to maintain consistentency of last group post for database sync 
- db reset done, you will lose your current gxs data

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6906 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-23 23:39:55 +00:00
chrisparker126
6cbb3a65f8 fixed linker issue, and bad initialisation of pointer bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6904 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-17 23:15:39 +00:00
chrisparker126
f74aacd759 remaining code for nxs sync optimisation 
- still needs testing

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-16 13:40:04 +00:00
chrisparker126
2e886bf443 Add gxs update items for nxs sync optimisation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-10 22:27:50 +00:00
csoler
d2ddf9c4c4 computation/update of routing probabilities 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6899 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-08 22:22:40 +00:00