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,347 Commits 63 Branches 22 Tags 194 MiB
2bed14865f
Commit Graph

3757 Commits

Author SHA1 Message Date
defnax
2bed14865f forget to commit this, vote buttons not yet done. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7229 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-04 13:55:00 +00:00
drbob
46fd60f1e4 fixup GUI with changes to libretroshare serialisers. 
added back in the other gxs services.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7222 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-02 11:28:06 +00:00
csoler
1042744685 merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-29 14:18:05 +00:00
drbob
a9a1b054dd record Permission Changes and pass to libretroshare. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-25 12:22:16 +00:00
drbob
057939270f Fixed double increment bug, enabled GXS in gui by default. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7202 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-23 03:33:04 +00:00
drbob
708f6d6b43 load actual permissions from rsServiceControl 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7199 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-22 11:12:10 +00:00
thunder2
a4b54e1021 Fixed compile on Windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7194 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-21 14:50:34 +00:00
chrisparker126
e2c8c6e141 Compilation fix. Rs compiles now, group and message creation work ok, more testing to do still 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-20 11:26:53 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
ee09c3ce9c Allow Local Address to be saved and modified in hidden mode. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 05:05:35 +00:00
drbob
bbe3ee8d2f - Switched to new RsAccounts interface. 
- Reworked ServerPage to support HiddenNode configuration.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 02:35:06 +00:00
csoler
735eb7a5c6 updated version numbers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-17 17:53:12 +00:00
csoler
09467cf87e updated ts files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7025 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-17 17:47:38 +00:00