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
5,797 Commits 63 Branches 22 Tags 194 MiB
9470e5562a
Commit Graph

5797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thunder2
55d562238e Applied changes from the trunk to the GXS forums. 
Cleaned old and unused files.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5868 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-21 18:55:52 +00:00
defnax
ae0e93ac41 set default Album Thumbnail picture 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-21 16:51:23 +00:00
defnax
9e30148c63 Added Header Images and Text for Albums Dialogs 
Enabled always "Create Album" functionality, not only when own Album is selected.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5866 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-21 15:46:08 +00:00
defnax
b18a95ac9b Added a headerframee icon for Create Album 
Added a close button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-21 13:41:10 +00:00
defnax
3bac522e5f update changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-21 11:38:40 +00:00
defnax
c154c6b408 update version and Changelog for 0.5.4c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-21 08:25:41 +00:00
csoler
63ceac29d2 suppressed bug due to not cleaning source lists. Would cause transfers to have inconsistent direct sources 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 21:42:21 +00:00
defnax
96b0d4a372 Added subscribe/unsubscribe to album icons 
Fixed layout spaces for GxsGroupDialog.ui, when some labels/buttons is hided.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 14:08:28 +00:00
thunder2
d99e410561 Now the english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 13:15:18 +00:00
thunder2
d7a2fe01c2 Update english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 12:47:08 +00:00
csoler
44992631cc updated version number to 0.5.4c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5856 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 12:09:45 +00:00
csoler
03c331e43f updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5855 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 12:07:28 +00:00
defnax
03a3499a1b changed view icon for PhotoShare 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5854 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 11:27:15 +00:00
defnax
fd981f453c Added the default Posted icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 10:29:40 +00:00
csoler
6f1c165763 fixed wording for asking passwd so that it works ok for both login in and signing 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-20 08:58:20 +00:00
defnax
163cec0eda Added icons for Posted 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 23:56:54 +00:00
csoler
b2e97407b5 added dynamic addign of direct sources from file lists. Useful for channels. Is called once every 61 seconds. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5850 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 22:45:37 +00:00
drbob
c90d0d6abd Added Identity stuff into the GUI. 
- Generic Classes:
	- GxsIdChooser: gets a list of current OwnIds for user to select AuthorId.
	- GxsIdLabel: retrieves and displays Author Information.
	- GxsIdTreeWidgetItem: retrieves and displays Author Information, in specified column.
 - Added GxsIdChooser into GxsGroupDialog & CreateGxsForumMsg.
 - Added GxsIdTreeWidgetItem into Forum Thread listings.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 22:14:45 +00:00
drbob
c6e6d444bf Added Identity Info retrieval to rsIdentities. 
This is now pretty much complete for Phase 1 of GXS.
Still todo:
	- PGPHash signatures.
	- Reputations.

 - Added two helper classes GxsTokenQueue: similar to TokenQueue, but for libretroshare
       & RsTickEvent: schedule one shot events, and basic stats.
 - Reorganised/simplified p3IdService using these two classes.
 - Added fns to load/reload a list of Own Identities.
 - Improved the Cache to store all GUI required Info.
 - Updater retroshare/rsidentity.h with new Identity interface.
 - added fns to update Cache from internal background tasks.
 - Modified RsMemCache to support replace operation.
 - Found nasty Bug that caused PGPHASHes not to match & Patched same bug in GXS.
 - added generic CacheArbitration.
 - Added AuthorIds to dummy Forum messages.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5848 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 22:00:05 +00:00
csoler
93501bdc12 patch from AC to perform html optimization of forum posts using the canonical function optimizeHtml() 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 21:35:48 +00:00
csoler
e6563eba52 removed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5846 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 21:28:12 +00:00
csoler
14a8bb8283 fixed bug preventing share manager to modify more than one directory at once 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 21:19:44 +00:00
defnax
6e349749d0 Added to hide logo label and logo button, when calling "Create Wiki Group" 
switch text for some labels, when "Create Wiki Group" is called.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 16:27:39 +00:00
thunder2
a8d1d05405 Moved most of the hardcoded colors of lists and trees to the file qss.default (with help from braindead). 
Now the stylesheet can redefine these colors.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-19 16:01:21 +00:00
csoler
9c1d702128 patch to allow compilation on BSD 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-18 16:22:58 +00:00
defnax
ec6aef8d45 Added some headerFrame's 
changed some button order

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-18 14:42:54 +00:00
defnax
e24ea71348 Added Author and Timestamp Label's for GxsForums 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-18 01:36:22 +00:00
defnax
8da8f24683 restored back some of my changes, 
added serviceheader text for Wiki and Forum

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-18 00:18:46 +00:00
defnax
3fe147d5eb Added some icons for Wiki Pages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-17 22:37:48 +00:00
chrisparker126
92f1673729 A stab at progressing posted, got post creation working and parameterised GxsGroupDialog for creating "create <service>" header for all gxs services 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-17 21:43:21 +00:00
chrisparker126
ae5cbecaba Fixed relatedMsgData bug (PARENT | LATEST), same issue as ALL_VERSION opt flags, was using origMsgId used for filtering (filtering worked as bugged request was actually requesting all msgs instead). 
Added test for (PARENT | LATEST)
All tests passed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-17 18:45:14 +00:00
chrisparker126
d591d795bd Fix providing mask for setting group subscribeFlag, msgStatus and grpStatus 
Tests updated

Also setting msg and grp Status to unprocessed and unread on receipt from a sync (see rsgxsflag.h). These are set on bits masked by 0xf00.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5834 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-17 14:35:21 +00:00
csoler
414ae0d97f fixed simulator to work with new file permission code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5833 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-16 21:15:39 +00:00
csoler
0aa921b010 fixed variable collision 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-16 21:02:20 +00:00
defnax
c5fee54ee7 Added some icons for the Wiki Pages Dialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-16 16:41:59 +00:00
thunder2
3521bfb6de Added multiselective mute/unmute to chat lobby. 
Added mute/unmute with double click on icon.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-16 00:53:13 +00:00
drbob
eb23479611 * Made GxsForum messages load again. 
* Hijacked "Next unread" button => force Reload, until update is working.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 23:51:57 +00:00
drbob
9373d26be0 * Added Dummy Forums and Messages to GxsForums. 
* Extra GxsForums::getRelatedMessages() fn + HACKs to cover up GXS bugs.
 * more debugging in rsgenexchange.
 * fixed up some of wikis text.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 23:50:54 +00:00
chrisparker126
2230bd1a96 Added getMsgRelatedData test 
Fixed bug with getmsgRelatedFucntion for msgs with no relatives (message with no relatives would end of pulling itself, i.e. the id/data/meta of message whose relative are
being searched for)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 23:09:56 +00:00
thunder2
182792e538 Update english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 21:37:34 +00:00
thunder2
968f72f303 Fixed missing seconds in time format. 
Added new basic class for date/time format.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 21:35:37 +00:00
csoler
8a3973de81 fixed command to grab upnp patched version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 14:18:52 +00:00
defnax
4c077eda2e update Chinese translation from transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 12:34:33 +00:00
csoler
4e2f454907 reduced calls to flags/group update code to the minimum, to avoid sending file lists except when the share manager / share dialog gets closed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-14 22:56:25 +00:00
drbob
b5910e0314 * Updated wiki service to support new MsgRelated data. 
* Added Wiki Dummy pages to explain it briefly.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-14 21:27:37 +00:00
drbob
81e172d6f8 Modifications to use MsgRelatedData for Wiki pages. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-14 21:27:34 +00:00
csoler
7fa9dbb2b1 patch from AC to solve compilation w.r.t. patched libupnp whatever the version number. Should work on debian as well. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-14 20:24:07 +00:00
defnax
40b80c4e84 redesigned the Chatlobby participants list 
- used now QTreeWidget instead of a QListWidget
- added icons for display the muted participants
- added context menu for "Mute participant" ( context menu fix from thunder)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-14 14:39:08 +00:00
chrisparker126
f74a328d61 Bug fix for ES_GXS_MSG_COMMENTS option 
Fix for run thread loop of RsGenExchange (was using logic rather than isRunning, which led to some crashes on rs close

Added request and get MsgRelated function for ids, meta and data 
added template function to ease getting meta data from back end;

Updated Nxs tests, tests passed (failed initially because of change option requirements)
Added test for msgrelated Ids, still need to add test for all msgRelated functions (bug with mask, not filtering correctly)

Made changes for forum and wiki gui to use new API but gui needs to call correct get functions now (Bob).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5817 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-13 22:36:06 +00:00
csoler
d3a3efd492 added additional checking of incoming compressed chunk map, in case the data is currupted, which might happens with a corrupted ft_transfer.cfg file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-13 20:13:09 +00:00