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
* Added few more file type icons for "cpp", "h" nd "c"
* Corrected some strings
* Moved Uploads to Downloads Tab.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
Some changes on Circle Dialog with icons and layout fixes.
Changed tray new message icon, to look or use same like from the Toaster.
Added context menu icons on MessagesDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6680 b45a01b8-16f6-495d-af2f-9b41ad6348cc
- added automatic refresh after subscribe/unsubscribe
- removed some debug output
- moved GxsForumsDialog.* to gui/gxsforums
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6505 b45a01b8-16f6-495d-af2f-9b41ad6348cc
- Added GxsChannels
- Added New Common Comments GUI elements.
- Moved Posted over to use Comments.
Lots done, but lots to do!
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6212 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.
* GXS Backend.
* GXS Services:
- Identities.
- Circles
- Photos
- Wiki
- GxsForums
- Posted.
* SSH no-gui server.
See branch commits for more info.
To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 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
Removed V2 references: TokenQueueV2 and RsTokReqOptionsV2 are now TokenQueue and RsTokReqOptions and renamed file
Added initialisation of Posted back end service successfully
Added new msg status flags GXS_SERV::MSG_STATUS_UNPROCESSED and ::MSG_STATUS_UNREAD
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5707 b45a01b8-16f6-495d-af2f-9b41ad6348cc
* Disabled all the VEG services, until GUI has been tweaked to match new interface.
* Deleted <placeholder> text from PhotoItem.ui - to compile with older version of Qt.
* Fixes to Retroshare.pro (restore libdht path, disable compilation of VEG classes)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
Reactivated Photodialog. almost completed integration, publishing and item storage working,
but data retrieval algorithm needs to be changed (request flags need to be translated, based on update call rather than client assumption)
fixed bug in rsgenexchange notification.
Added LGPL notices
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5387 b45a01b8-16f6-495d-af2f-9b41ad6348cc
TokenQueueV2 added,
first change to photoshare to deal with gxs backend
needed to redirect meta types to mine in order to get compilation working and definition fixes
to rsgenexchange.
Next step is to get GxsRunner going
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5377 b45a01b8-16f6-495d-af2f-9b41ad6348cc
* Mainly just update header file locations.
* ForumsV2Dialog needs changes/improvements from ForumsDialog applied to it.
- This merge has broken bits of the code (#warning's inserted).
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5339 b45a01b8-16f6-495d-af2f-9b41ad6348cc
- Revisions 4771 => 5334
* This merge brings a lot of unfinished code for GXS (new cache system)
- See branch commits for more details.
* Code is disabled, and should have minimal effect on trunk build.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5338 b45a01b8-16f6-495d-af2f-9b41ad6348cc