Commit Graph

6672 Commits

Author SHA1 Message Date
drbob
5b472c34e2 adding back compile error
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7190 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-19 12:11:17 +00:00
drbob
8f6e00cf67 fixed up gxsreputation - temporary fixes to new ids.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7189 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-19 12:02:48 +00:00
chrisparker126
8cd578f09e compile fixes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7188 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-18 22:29:24 +00:00
chrisparker126
0f29d28b1b merge of branch v0.6-idclean 7180
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-17 20:56:06 +00:00
drbob
7815efb16f remove reference to uncommited file.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-10 09:39:31 +00:00
notdefine
9dedf6f461 Update Doxfiles for Online Doxygen generation http://notdefine.de/retroshare/retroshare-gui/html/index.html and http://notdefine.de/retroshare/libretroshare/html/index.html
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-08 13:07:34 +00:00
defnax
d9aead7709 update icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-07 16:21:17 +00:00
drbob
740de02489 Added ServicePermissions Settings page.
This just presents dummy data at the moment.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7172 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-07 13:48:33 +00:00
defnax
a621dcc4d1 clean up old icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-06 15:35:34 +00:00
defnax
76ecaffccb updated the MinGW build bat files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-05 22:46:37 +00:00
drbob
15449cdc74 added extra parameters to generic map
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-04 10:06:16 +00:00
defnax
e21564f72e cleanup old icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-28 17:54:52 +00:00
defnax
ddf811f80a added new icons and splash images from Feal, cleaning up old icons, still need more cleanup
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-28 17:01:14 +00:00
chrisparker126
15af443c31 Added reputation filtering to genexchange and reputation threshold setting function
- NOTE: you will lose all data with this build, new db schema
Checked into wrong repo folder on previous commit

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7147 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-23 00:08:11 +00:00
defnax
265bc65299 changed the default identity icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-19 16:20:19 +00:00
drbob
4bdd7b3b4d - Correct missed parts for fixed updateGroup.
- Updated IdDialog to support Modifying Opinions on GxsIds.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-19 11:11:06 +00:00
drbob
1b2ed66814 Implementation of GxsId Opinion, and start of Reputation system.
- Removed old reputation system from p3idservice
 - Removed old Msg types as well (no longer needed)
 - Added real submitOpinion()
 - Modified serviceString to support Reputation System.
 - Added reputation information to both Cached Data, and Standard ID Data.
 - Added basics of new reputation system as alternative service. (not gxs).
 - Added Generic TLV types for maps.
 - Moved configuration files to their own directory .rs/config/
 - Finally, fixed up bits missed from the change to updateGroup!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7131 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-19 11:08:37 +00:00
chrisparker126
9a4c696688 not checked in, likely needed to compile, sorry
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-18 22:44:03 +00:00
chrisparker126
a31f39c4bd Removed meta update filter for updateGroup, all meta changes now allowed.
- be careful not tested

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7124 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-16 22:28:23 +00:00
defnax
b785132cbe Fixing layout changes in Id Edit Dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-13 11:55:14 +00:00
thunder2
f818bb8e9a Fixed Windows compile with Qt 5 (Merged from branch v0.5.5)
- Revert change of revision 7063 in openpgpsdk.pro for Windows compile
- Changed order of the libraries in FeedReader plugin

Fixed Windows compile with MinGW 4.8.0
- Added missing include

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7111 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-12 22:03:20 +00:00
chrisparker126
df34a6818c comments to help debug circles sync issue
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7106 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-10 23:50:47 +00:00
csoler
a5efb4a59a increased TCP buffer size on windows. Makes transfers faster.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-10 21:50:59 +00:00
drbob
d65bdca1ec Improved GxsGroupDialog for Show / Edit of Groups.
- Added Show/Edit Menu Options for all services.
 - Fixed up BUTTONBOX_OK bugs.
 - Tested name changes for all services.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-09 10:43:59 +00:00
drbob
d9e483c48a added updateGroup functions to gxs services.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7101 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-09 10:33:16 +00:00
chrisparker126
0fd46e4f2b Added specific IDs to GXS service serialisers
NOTE! YOU WILL LOSE CURRENT GXS data!

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7100 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-08 11:13:10 +00:00
defnax
c626feeed5 improving they combobox layout direction, for better look.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7097 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-06 16:49:15 +00:00
drbob
bbd28256b6 fixed circlesComboBox enabled in gui.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7093 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-05 07:08:29 +00:00
thunder2
cedbd051ac Deactivated code for old forum handling in FeedReader plugin
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-04 22:06:33 +00:00
thunder2
98e4271695 Fixed compile on Windows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-04 21:59:55 +00:00
defnax
307404fa0f improving the layout for the hidden checkbox
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7089 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-04 18:34:13 +00:00
drbob
f51efde985 added missing header for Linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-04 08:10:44 +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