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,413 Commits 63 Branches 22 Tags 194 MiB
7e517906fd
Commit Graph

6413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
thunder2
dbfe3f6c51 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-20 18:51:12 +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
a4a4d3bdda added check for malloc success in packet-parse.c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6950 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-19 22:16:17 +00:00
csoler
2f188b8217 removed asserts in packet-parse.c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6949 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-18 20:22:59 +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
thunder2
607458dad7 Added missing language files. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 16:12:16 +00:00
thunder2
3d48e8b4cb - Added language Catalan (ca_ES) 
- Updated english translation
- Updated languages from Transifex

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 15:08:36 +00:00
csoler
d8f42ddac7 fixed mistake introduced in 6937 that prevents correct writing of uncompressed packets 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-12 17:32:23 +00:00
csoler
156db5fb7c removed asserts and added proper error handling 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6940 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-10 19:51:47 +00:00
csoler
f4ec563595 removed asserts in reader_armoured.c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-10 14:20:17 +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
thunder2
a0f6b6f36c Fixed version file rsguiversion.in 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:38:35 +00:00
csoler
9bd1d035b4 fixed up packaging script for debian 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:13:29 +00:00
csoler
57c66bd06f forgot to commit this: show correct connect address (local or global) depending on the current status 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:12:02 +00:00
csoler
f6bdbd5e21 removed HandleRichText.cpp from last commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 13:52:47 +00:00
csoler
6380f6121c moved defines for version to .h, as it is super hard to script the replacement of the defines in the cpp file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 13:50:10 +00:00
csoler
b2db781f65 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 09:54:53 +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
e2384724c3 removed asserts from validate.c. This needs to be tested against bad keys! 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6925 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-05 20:33:09 +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
70a407504f removed asserts in signature.c. Replaced by proper error handling 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6922 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-04 20:58:57 +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
d0d85c0242 removed one assert in ops 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6920 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-02 19:45:25 +00:00
csoler
7d0d51dc2a removed assert that would cause RS to stop if a signature ptag is not recognised. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6919 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-02 19:31:19 +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
defnax
eab486f5db Added back the Subscribe Button to Channels 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-21 00:02:33 +00:00