Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,540 Commits 63 Branches 22 Tags 196 MiB
13256578ed
Commit Graph

6540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chrisparker126
accdf7e982 fixed segfault in forum show dialog 
prob merge issue

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-02 23:17:07 +00:00
drbob
a4f0221d89 Added in Icons to GxsIDs. 
Can support:
	- "Unique" Icon based of GxsID.
	- Icon indicating PGP/Anon.
	- Icons for RecognTags.

Needs more work to Make Unique Icons look good.
and Add Icon sets.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-02 11:25:11 +00:00
csoler
731d28bd41 added isNull() method to rsid to allow checking for meaningless ids. Consequenctly the null id 000... is implicitly not an id. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-02 10:16:25 +00:00
csoler
235280399f - changed Sha1CheckSum from hand-made class to instance of t_GenericIdType<> (should be backward compatible) 
- updated ft/, p3msgservice and p3chatservice accordingly
- added a new class for Sha1Sum in t_GeneridIdType<>, and an additional template argument to make ids of identical size 
	incompatible.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 19:10:45 +00:00
csoler
10bf083ca3 imported IdEditDialog.ui from v0.6-initdev branch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 15:55:03 +00:00
csoler
9e23f59e3a compilation warning fix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 15:26:53 +00:00
defnax
d706a98dd6 merging the ui changes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 15:18:33 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk. 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 14:16:15 +00:00
csoler
8bb90bb9f8 fixed stupid (and very old!) mistake causing 100 seconds hang ups on windows when file rename fails. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7077 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 12:00:05 +00:00
drbob
7ca3ed78ae fixed up nogui for new rsaccounts stuff. 
added missing OSX make stuff.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 03:26:26 +00:00
drbob
6855a7ac98 Added OSX protobuf section. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 03:22:41 +00:00
csoler
e12929d9d7 Added connexion to the msg system and fingerprint into grouter addresses. flushing current changes before 0.6 merge. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-30 22:14:37 +00:00
csoler
1aa2e221d2 put compilation error in place and redirect users to branch 0.5.5. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7071 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-29 20:07:48 +00:00
chrisparker126
82b50d3b46 Optimisation 
- excessive calls to sql SELECT in genexchange and gxsnet, naive algo

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7068 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:47:51 +00:00
csoler
1d19938295 added jpeg to the list of image extensions for messages/avatars/etc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:38:11 +00:00
csoler
730554d397 improved gui message for known peers that are not friends 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:33:17 +00:00
drbob
08f442d65b updated version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 09:03:34 +00:00
drbob
edac83d471 updated version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 09:01:50 +00:00
drbob
3caeb0ab7f Dont know why this breaks OSX build - but it does... 
will investigate if the change affects others.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 08:59:19 +00:00
drbob
3b71e8e140 Improvements to enable Edit/Show of GxsGroups. 
NB: The actual update doesn't happen yet - mainly just the display of info.
  - Fixed up Constructor, and loading of MetaData via TokenService.
  - Fixed up Enabled / ReadOnly for Show.
  - Updated children to match new functionality.
  - Fixed up Show in Circles Dialog too.
  - removed a few compile errors.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 07:57:58 +00:00
csoler
257d865804 removed asserts and did proper error handling in crypto.c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7061 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-27 19:55:43 +00:00
csoler
a8feff606e added missing error handling in validation of key signature and data signature (thx to HM for pointing this out) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-26 20:54:23 +00:00
csoler
928927e038 forgot to commit this in previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-26 20:32:51 +00:00
csoler
ef0a9e43ca fixed proper return of decryption result so that the PGPHandler can report it 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7058 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-26 20:30:10 +00:00
defnax
5896de972e update changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-25 14:48:51 +00:00
csoler
4164b97004 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-24 20:10:36 +00:00
csoler
a44d2b281d demoved debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-24 17:34:27 +00:00
csoler
f198f9c784 removed potential uninitialized memory read in TlvKey item. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7054 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-24 13:39:55 +00:00
csoler
fd682ed23d fixed mismatched free/delete in p3channels.cc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7053 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-23 21:42:43 +00:00
thunder2
bb0d02f3dc Fixed compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7052 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-22 22:31:42 +00:00
csoler
ff2cb0fe09 fixed bug introduced in 6965 that prevented people joining private lobbies to see the messages and talk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-22 22:23:17 +00:00
csoler
11bc15b9cf generalized the test for valid strings to all methods in AuthGPG 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7050 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-21 21:01:22 +00:00
csoler
1f4580304f put a hard limit to packet size in pqistore to avoid calling realloc with fancy numbers when the stream has been corrupted 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7049 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-21 20:09:09 +00:00
csoler
43a32f23e1 fixed potential attack by supplying non hexadecimal strings as certificate common name 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7048 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-21 18:09:05 +00:00
csoler
158249d66e removed some debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 21:13:17 +00:00
csoler
f3af40337f fixed compilation of introserver.cc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 20:06:55 +00:00
csoler
91c49fa992 added ElidedLabel to be used in places where labels might be too long and therefore trigger an unwanted window resize. This is currently used as forum thread titles (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 20:03:24 +00:00
drbob
ae5942733e - Split majority of p3posted into p3postbase.cc - so that it can be reused by other services. 
- Fixed iterator overflow into rsgxsupdateitems.cc
 - Fixed Mutex deadlock in pqiperson.cc
 - Removed old code.
 - Fixed lots of compile warnings - mainly wrong variable ordering in constructors.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 11:42:27 +00:00
drbob
46518ebf51 revert GUI part of svn commit 7042 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-20 07:29:54 +00:00
chrisparker126
f3afc128ee Chozabu patch 
- New db created for parent group id field, you will all previous gxs data
- posted now support sub post topics

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 23:38:48 +00:00
csoler
efd1447a84 removed code for old certificate format. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 14:42:16 +00:00
csoler
07239883c8 Allow loading packets of large size from config files (fixed storing of big messages), and continue on config files skipping items that cannot be deserialised (Modified patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7040 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 14:29:29 +00:00
drbob
06a582564d Fixes for failed Proxy Connection Attempts: 
- create Timeout Fn so it can be called by classes derived from pqissl.
 - set HIDDEN timeout to 30 seconds.
 - add reset_locked() calls on errors in pqisslproxy.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7039 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 11:35:31 +00:00
drbob
45bd72203e Added TOR Configuration page. Allows STD Nodes to configure Proxy too. 
Moved most of hidden node parameters to this page.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7038 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 06:27:02 +00:00
drbob
6526dd6c4b Tweaked linkmgr to allow loopback connections. 
This allows STD -> HIDDEN connections!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7037 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-19 06:25:49 +00:00
drbob
d39c5c028a fixed up hidden addresses and removed whitespace from onion address. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 23:29:22 +00:00
csoler
037abea5eb Fixed spaces in copy/paste of rich text (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 22:55:14 +00:00
thunder2
741424dd72 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 21:23:56 +00:00
csoler
affdd49001 made cert of versions 0.5 and 0.6 incompatible. Removed old cert format parse/display 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 16:53:19 +00:00
drbob
8c8baae044 fixed bad parse of addresses in certificate. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7032 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 05:42:44 +00:00