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,571 Commits 63 Branches 22 Tags 194 MiB
2751543d1b
Commit Graph

5571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9b776ce6a4 fixed library (sqlite) config in .pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5992 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 15:30:21 +00:00
drbob
7b8bb8dff7 Cleaned up GXS compilation. now single config option (gxs) in .pro file. 
Removed GXS headers from p3face.h and used class declarations.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 15:04:52 +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
drbob
95cbb57abf * Created dummy Circles (This takes a while - as we have to wait for dummyIds to be made). 
* Provide CircleList, and Circle Details via rs interface.
 * Added debugging to help check its all working.
 * disabled caching of localIds - as this just causes cache to be flushed in p3IdService



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5987 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 23:07:12 +00:00
csoler
68c3e19a19 fixed compilation for SheevaPlug (Anonymous patch #61) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 22:43:31 +00:00
csoler
08d6bad6f0 added missing include for debian squeeze 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5985 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 21:03:34 +00:00
csoler
4ff8b55845 added missign dependency, fixed .tgz package for debian 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5984 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 21:01:20 +00:00
csoler
a438c92a77 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 13:42:08 +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
thunder2
ef7a2aaa59 Added missing closeConnection when the connection dies with SSL_ERROR_SYSCALL. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 22:54:17 +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
chrisparker126
eed8c28d7b git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5976 b45a01b8-16f6-495d-af2f-9b41ad6348cc 2012-12-12 22:41:21 +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
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