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
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
- Added Basic CreateCircle Dialog.
- Fixed up subscribe in both Posted and GxsChannels, tweaks to GxsForums too.
- added update checks in GxsChannels.
- made subscribe changes refresh Group List too.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6277 b45a01b8-16f6-495d-af2f-9b41ad6348cc
* Added Circles into generic GxsGroupDialog.
- Fixed up display of circles in GxsGroupDialog,
- and correctly set GroupMetaData for circles.
* Added new Circles Window to ApplicationWindow (doesn't do much yet).
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5988 b45a01b8-16f6-495d-af2f-9b41ad6348cc