Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 10:54:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,319 Commits 63 Branches 22 Tags 195 MiB
7e19517451
Commit Graph

3231 Commits

Author SHA1 Message Date
thunder2
7e19517451 Activated disabled code in GxsForums before merging. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-27 15:56:57 +00:00
csoler
d893d30883 - made errors of certificate (new formaT) parsing translatable. 
- added checksum code for new format certificate. Will be enabled in v0.6, since it is not backward compatible
- fixed very stupid bug in radix64 cleaning function, causing any certificate to be accepted as a radix string
- added list of non backward compatible changes in README.txt, so that we can track them


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-22 21:22:03 +00:00
thunder2
e66a9117e2 Added patch from Henry 
- fixed typo in FeedReader
Updated english translation.
Updated languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-22 15:47:12 +00:00
thunder2
13ac670eec Changed config type of the FeedReader. There was a conflict with general config. 
Added warning in p3ConfigMgr::addConfiguration when a config type is used twice.
Removed checkbox for "Experimental Features" in general page without function.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6027 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-22 00:02:40 +00:00
thunder2
fc78f6c7ac Added patch from Henry 
- some more corrections

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-21 20:26:09 +00:00
thunder2
0a499634dd FeedReader: 
- added notify in main window, systray icon and settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 13:30:16 +00:00
thunder2
b1d887b614 Added patch from Henry: 
- removed hardcoded font Arial
- fixed some strings
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 12:16:53 +00:00
thunder2
e6839c3245 Fixed compiler warning in Serverpage.ui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6019 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 11:11:28 +00:00
chrisparker126
470b3df7c2 Added update broadcast component, works, but don't use yet, will change 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6017 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-18 22:25:00 +00:00
defnax
cb6d161518 update changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-18 09:39:16 +00:00
csoler
6571279b70 fixed (again) bug with bad chars notification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6007 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 20:58:35 +00:00
thunder2
04510b1fa1 Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6001 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 13:21:22 +00:00
thunder2
f764a82408 Fixed compile of gxs on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 22:39:58 +00:00
drbob
d8e327afcc * Patched for Arch. 
* Disabled FeedReader until is compiles properly.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 21:12:26 +00:00
drbob
069b72e0b2 Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995) 
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
 2012-12-16 19:17:11 +00:00
csoler
dc57acb20c fixed bug in notification of substituted chars in RetroShareLink 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5995 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 16:28:00 +00:00
csoler
f1b7a3eee5 fixed display of ongoing chunks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 16:10:43 +00:00
drbob
9217dcc8f7 simplified gxs compilation, now a single switch. 
attempted to fixup extra library includes (might not work for everyone).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5993 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 15:52:49 +00:00
drbob
bfe9271740 Added basics to Circles Dialog. 
- List of Friends & List of Circles.
 - Hightlighting friend or Circle will show what they are members of.
 - cleaned up old code.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5990 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 14:19:24 +00:00
chrisparker126
17bdfa7cad enabled token expiration, 30 seconds 
add new, and hot ranking, and fixed top ranking for posts (not comments yet)
top ranking decay period set at 4 seconds for testing
enabled ranking posts 
fixed comments generation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5989 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 00:43:15 +00:00
drbob
7935c5547f * Added gxs Circle Helper Classes: GxsCircleLabel / Chooser. 
* 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
 2012-12-15 23:11:11 +00:00
csoler
a14f893acc updated version numbers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5982 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 13:31:28 +00:00
thunder2
a28267a8e7 Updated translations from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-14 00:29:10 +00:00
csoler
bb7645549f extended character filtering to fit a common denominator for all filesystems 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 22:48:36 +00:00
csoler
892057b53e added replacement of \ and / in filenames from RsLinks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 22:13:58 +00:00
csoler
bf3194f035 added proper filtering of slash and backshash from directory and file names in RsCollection to avoid files that can be redirected to wrong locations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 21:53:27 +00:00
drbob
2d4c89aacf Switched on Markdown Rendering in the GUI. 
Enabled linking against pegmarkdown library.
Added Circle files to .pro, but disabled for now.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5975 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-12 19:27:02 +00:00
thunder2
8078ad3aab Fixed utf8 characters for group names in RemoteDirModel (shared files). 
Changed some strings in GroupFlagsWidget.
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5974 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-12 00:04:01 +00:00
thunder2
751756c543 Fixed layout of the FriendRequestPage in ConnectFriendWizard. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5973 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-11 23:43:53 +00:00
chrisparker126
3eaf844ec8 Reworked ranking process flow 
added ranking retrieval in gui 
removed locks from TokenQueue
refactored gxs p3 pointers in p3face header file 
and gxs services now shutdown correctly using join(led to bad segfaults on shutdown)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-11 22:26:11 +00:00
defnax
959f04e5e0 removed html from the warning label, and added stylesheet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5967 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-11 16:58:13 +00:00
defnax
bd3d08a2ae removed html from the User Permission Label, for better translation 
added a default stylesheet for better look,
added icons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-11 14:35:00 +00:00
drbob
664d1e02c5 * Added IdChooser to WikiEditDialog 
* removed generateDummyData() from gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-10 19:26:33 +00:00
csoler
3dd81f3e77 removed unnecessary button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5959 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-10 08:28:35 +00:00
chrisparker126
30b48c59ef Comment and Vote update now functional 
Voting and comment count update in gui added via msg notification
clarified comments in RsTokenService

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5958 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 22:38:49 +00:00
drbob
fd992ac813 * add ToolTip to OpModeStatus .... (can't actually view - please correct as necessary) 
* disable bitdht printStatus



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5957 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 22:27:34 +00:00
thunder2
63d66ee53c Fixed display of "TextLabel" in SecurityItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5956 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 18:26:30 +00:00
csoler
6e60be0ef7 fixed bug in ShareManager causing directory flags to be set on wrong directory after sorting 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5955 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 15:00:50 +00:00
thunder2
4413536926 Forums: 
- Switched from own token member to the new methods on TokenQueue.
- Reactivated thread from the old forum to fill the messages.
- Load all messages at once.
- Added processing of missing messages.
- Fixed new/read/unread status.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 02:32:47 +00:00
chrisparker126
6527aaf2d8 Recommiting from old repo: 
commit msg from last:

Fixed minor bug in group creation
msg now set to unread and unprocessed on creation (added read flag in gxsflags.h also)
Got topic and post generation working 

Additional changes:

Voting update now working

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5951 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-08 21:50:13 +00:00
thunder2
0c49fba4d8 Switched base class of TokenQueue from QWidget to QObject. 
Fixed unlock of the mutex in TokenQueue.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5949 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-06 17:51:07 +00:00
defnax
54e669cb68 disabled, needs to be fixed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5948 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-06 16:00:13 +00:00
thunder2
8596b2ca9e Added patch from Henry 
- enable italian language
Updated languages from transiflex.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-06 14:31:40 +00:00
defnax
b7934e9e6a removed some unused images 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5946 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-06 09:58:08 +00:00
chrisparker126
de757cfcae Added user type interogation of tokenQueue 
fix for posteditem serialisation
added voting to gui, but no feedback yet
post and topic generation code added for testing 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5945 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-05 22:45:44 +00:00
defnax
8cdefe9764 Added "Edit Share Permissions" Context Menu entry to My Directions, to edit easily share permissions for each directory 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5944 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-05 13:26:26 +00:00
defnax
bf70038ad2 - Fixed HeaderFrame icon to use correct one (Share Dialog) 
- Change Header Text/ Window Title when Share Dialog is in Edit mode.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-05 10:27:54 +00:00
csoler
d01745e54f Made the private lobbies more accessible: 
- record which friend participates in a lobby even after they unsubscribed. The lobby list that is sent to these 
  friends contains the privaye lobby as well. In practice, people jsut need to be invited once to a private lobby. 
  Afterwards, they get the lobby in the list of nearby lobbies and can join by clicking on it.

- added new item RsChatLobbyList_deprecated2, to replace old existing item. Should be removed in v0.6
- changed PublicLobbies for VisibleLobbies in the code, to avoid confusion

- the change is backward compatible, although old peers won't receive private lobby info from new peers, of course.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-04 21:36:05 +00:00
thunder2
694885963e Added CancelRequest on second request. 
Added new icon for the forum thread tab for the state loading.
Started to lock the gui when data is loaded.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5940 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-04 16:06:21 +00:00
thunder2
a3e3566304 Set email address in GenCertDialog to optional. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-04 11:42:34 +00:00