Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-14 00:55:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
6360 commits 63 branches 22 tags 233 MiB
Commit graph

6360 commits

This branch
This branch
All branches
Author SHA1 Message Date
csoler
14788b578b ID cleaning. Saving progress. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7122 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-16 16:39:09 +00:00
csoler
11ef4fab9e removed old rsid.h 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-16 12:19:34 +00:00
chrisparker126
13a029f9ad added PgPID and sslid support in gxs components. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7120 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-15 16:12:29 +00:00
csoler
cf653b380f ID cleaning. Saving progress 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7119 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-15 10:55:38 +00:00
csoler
fe96317b65 ID cleaning. Savign progress 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-13 21:49:06 +00:00
csoler
e865b0b7c3 ID cleaning. Saving progress 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7117 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-13 21:22:38 +00:00
csoler
65ccabced7 compilation works, except gxs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-13 21:09:31 +00:00
csoler
2b10076273 added types for GXS group id, circle id, msg id and GXS id 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-13 21:07:25 +00:00
csoler
37dd5821b9 ID cleaning. Saving progress. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7114 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-13 13:02:46 +00:00
csoler
919003814a ID cleaning. saving progress 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7112 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-12 22:15:39 +00:00
csoler
096678ec6b ID cleaning. Saving progress 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7110 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-12 21:53:18 +00:00
csoler
4b7a2160b9 ID cleaning - saving work 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7108 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-11 20:58:33 +00:00
csoler
328d820421 ID cleaning. Saving progress 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7105 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-10 21:55:09 +00:00
csoler
55e35975e9 ID cleaning. Saving progress 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7103 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-09 23:05:31 +00:00
csoler
c56e1627f4 ID cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-07 22:48:26 +00:00
csoler
18f5128319 ID cleaning. Unfinished yet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7098 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-06 22:32:08 +00:00
csoler
effbf8f683 ID cleaning. Unfinished yet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-06 14:13:25 +00:00
csoler
c4c8414a79 id cleaning - continued 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-04 22:51:19 +00:00
csoler
33ab4ee3b5 saving intermediate work for id cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7087 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-03 20:38:24 +00:00
csoler
08d64be2e5 created this branch to clean IDs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7086 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-03 20:25:39 +00:00
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