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,302 Commits 63 Branches 22 Tags 194 MiB
e66a9117e2
Commit Graph

5302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
csoler
edd47f814d removed some debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-11 22:22:00 +00:00
csoler
60af8cefe0 corrected stupid mistake in previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5970 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-11 22:16:40 +00:00
csoler
71ed00cd68 made warning about missign fingerprint beingprinted only once 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5969 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-11 21:55:47 +00:00
csoler
c91dfb5bbf updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5968 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-11 21:41:42 +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
csoler
58dff54b3e remove debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-10 22:29:03 +00:00
thunder2
f8c83779af Switched compiler to gcc for Windows too. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-10 22:28:18 +00:00
csoler
2f7b7c4366 use a std::map to search file hashes instead of sweeping the entire database (ouch) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-10 22:25:57 +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
drbob
5be03af4cd * Switch wiki dummy pages to use RsTickEvent. 
* Add extra dummy page showing Markdown formatting.
 * Reduced number of dummy Ids generated.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-10 19:21:53 +00:00
drbob
b54e1d4bc4 switched compiler to gcc in general. 
removed CXX references, as it is all C files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-10 18:58:02 +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
drbob
62176264d3 added single function to call dht, with thread cleanup. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5954 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 13:19:28 +00:00
drbob
3be22536df adding pegmarkdown support library. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-09 12:12:57 +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
drbob
80c89599a2 increased expected dht startup period, as message rate has been dropped. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5950 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-08 17:27:08 +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
csoler
8f7f00c6b9 removed compilation warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-04 21:28:35 +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
defnax
385b37bc01 fixed layout 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5938 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-04 10:37:15 +00:00
drbob
c1702fc13a Improvements to Wiki. 
- Enabled Selection of Snapshots in WikiEditDialog
 - Added CheckBoxes for Merge selection. (TODO).
 - Fixed up bugs related to text reload.
 - Removed Edits from main Wiki Page.
 - Added a Search Bar (TODO).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5937 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-04 00:47:34 +00:00
thunder2
85c089b09b Fixed #ifdef for Windows compile in openpgpsdk. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5936 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 18:08:16 +00:00
thunder2
2de928dc64 Moved new files for ops_open from util to openpgpsdk. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 16:20:44 +00:00
thunder2
b85bccbbe6 Added function "ops_open" to openpgpsdk to open files with utf8 characters on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 15:58:44 +00:00
defnax
7339af3a21 corrected string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 15:55:01 +00:00
defnax
9721b5a924 renamed translation string 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-03 14:21:22 +00:00
csoler
898011e514 changed fopen into RsDirUtil::rs_fopen, to allow paths with utf8 chars on windows. Shoudl probably fix many startup issues 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-02 21:12:31 +00:00
chrisparker126
bcf9f443b4 added option to RsTokReqOptions for group subscription filter 
added code for rank calculation best,top, and newest (not enabled, not working yet...)
added variables for circles to grp meta type and modified storage and serialisation accordingly




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-02 19:40:17 +00:00
drbob
083c4411b8 More improvements to Wiki, mainly EditMode. 
- Fixed display of Edit History. (Date, Author, PageId)
 - Added GxsId for Author Display.
 - Enabled/Disabled History depending on Modification & oldHistory flags.
 - Fixed bug where preview triggered Modification Flag.
 - Switched WikiDialog to Rendered Mode, and removed spacer.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-02 19:06:43 +00:00
drbob
bcd67a8651 Added random AuthorId to Dummy Wiki pages. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5928 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-02 19:01:51 +00:00
defnax
700c6e316e fixed background of the icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-02 14:04:41 +00:00
thunder2
d2b6efddb3 Added patch from Henry 
Renamed gpg to pgp

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-02 00:25:11 +00:00