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
4,642 Commits 63 Branches 22 Tags 195 MiB
a2b6b97ef9
Commit Graph

4642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
a2b6b97ef9 added systray notifications for chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5357 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-30 13:27:40 +00:00
drbob
bbae97b88d missing header file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5355 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-30 11:22:29 +00:00
drbob
4e7cae83b2 fixed incorrect spelling of headers... 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5354 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-30 11:21:50 +00:00
drbob
29e0b2b7a3 Missed a line which should have be commented out - sorry. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5353 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-30 11:12:36 +00:00
thunder2
a360419f97 Enabled some more translations in news feed items and fixed german translation. 
Removed not needed file "Thumbs.db" in skin directory.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5350 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-29 20:24:09 +00:00
thunder2
2367653146 Fixed crash when using rs_sprintf/bd_sprintf or rs_sprintf_append/bd_sprintf_append with empty result (maybe only on Windows). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5349 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-29 13:28:45 +00:00
drbob
6a24bdc62c Improved the Id Reputation System to the point of compilation. 
-> Its not tested, or running with the checkin.
 * Added NEWMSG Flag to groups in test backend.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5348 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-29 13:09:36 +00:00
drbob
ceb4298208 Updated forumV2 support forms to latest version (from forums/) 
* Can now create new forum & post/reply messages. 
 	Flags have not been finished for these.
 * Edit/Details are not yet complete.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5347 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 21:09:53 +00:00
chrisparker126
17da89938f gxs back end now compilable, need to test 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5346 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 20:01:30 +00:00
drbob
d5520a1cd8 Merged parallel improvements to ForumsDialog into ForumsV2Dialog. 
* Also fixed load bug for empty forums & inserting the actual Post.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 17:36:41 +00:00
csoler
2159ab92f2 fixed compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 15:43:25 +00:00
csoler
2440b2d74a return false when ssl passphrase is of length 0. This should not happen, unless the file is void, since openpgp does not complain about decrypting empty files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5343 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 15:41:14 +00:00
csoler
0d72ad1806 fixed compilation on ubuntu (apparently QTreeWidgetItem(NULL) is not accepted 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5342 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 13:52:54 +00:00
defnax
eb16607601 fixed missed include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5341 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 09:25:10 +00:00
drbob
ef3ae10c63 * Fix Deadlock in GXS Test Backend ... double Mutex lock for ALL Msgs removed. 
* Disable periodic print out of bandwidth control.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5340 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-28 01:49:09 +00:00
drbob
2e4cc099dc Changes to allow the GXS services to compile with up-to-date GUI code. 
* 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
 2012-07-27 15:41:52 +00:00
drbob
bec1407648 Merged Code from: /branches/v0.5-new_cache_system/ into main trunk. 
- 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
 2012-07-27 15:03:16 +00:00
csoler
cde076aac6 added auto-clean of certificates at load time. Removes many errors. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 14:26:05 +00:00
csoler
2dba7e96bc removed deadly assert in case of parse failure 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5336 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 14:15:00 +00:00
csoler
a28786513e improved pgp cleaning function 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 14:08:35 +00:00
drbob
b8ee58ca98 Disabling GXS Services for merge back into the trunk. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5334 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 12:46:43 +00:00
drbob
02b2c72f61 * Added a bunch of unfinished code for Id reputation management (#ifdef'd out). 
* Disabled GXS services from compilation, or running as services.
 * moved retrodb.cc into newcache group, as it introduces new sqlite dependancy




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5333 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 12:45:52 +00:00
drbob
da8a8ec659 updated config file for OSX compilation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 12:30:46 +00:00
drbob
f34f617f00 Changes to get openpgpsdk version working on OSX. 
- switch to OSX10.6 for upgraded SSL, with different fn signature.
 - correct library paths in libretroshare.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-27 12:28:40 +00:00
chrisparker126
d50ecd145f cache stuff does not compile. just saving lots of coding i've done. 
Completed most of the coding for first new cache service, need to fix compile errors and test. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5330 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-26 21:48:54 +00:00
thunder2
515a0abdb3 Switched to OpenSSL-1.0.1c for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5329 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-26 16:59:42 +00:00
csoler
10eab84b7c fixed bug due to misinterpreting non SSLid drectories as potential locations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5328 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-25 22:43:43 +00:00
csoler
49ef54dc26 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5327 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-25 12:37:12 +00:00
chrisparker126
b2c74a045f Tidying up of libretroshare.pro, removed gxs from compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5326 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-24 18:55:32 +00:00
csoler
b098617802 updated french translation (Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5325 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-23 21:45:53 +00:00
csoler
6e47f2f9e7 removed output of SSL passwd in terminal 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-23 21:43:00 +00:00
csoler
d06780744e possible fix for bug on ARM archs (reported by Ralfk) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5323 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-23 21:42:16 +00:00
thunder2
219c5db3c9 Added a new button in ChanMsgItem and ForumMsgItem to set the message as read (without expanding the message) and remove the item from the news feed. 
Redesigned ChanMsgItem.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-22 22:48:13 +00:00
chrisparker126
5fbd591517 replaced string grp and msg ids with typedefs 
started implementing gen exchange client calls
finished implementing msgrelated info dataAccess routine
more refinements to various interface - need to think about how meta is passed about the various
layers of gxs and kept consistent with sqldb

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5321 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-22 21:38:15 +00:00
defnax
cd3ec84d15 improved build bat file (san) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5320 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-22 12:03:11 +00:00
thunder2
e305ab547d Moved the include folder OpenSSL to the other external includes for Windows compile. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5319 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-21 23:21:39 +00:00
csoler
616825ec4b fixed possible bug due to misplaced mutex (Reported by bNK) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-20 21:42:16 +00:00
csoler
ee77ec8c6c added warning for unsupported keys. It is triggered when no valid keypairs are found at start, and when unsupported keys pairs are found when copying the keyring 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5317 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-20 19:00:10 +00:00
defnax
bd1f0cc71b moved create profile button into top groupbox and changed the size 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-20 09:42:53 +00:00
csoler
24f8ee6222 Added dynamic choose of sources for chunk crc requests. Fixes the bug that would let 
a transfer not finish if the original surce for a crc is not here anymore.

If you have a unfinished transfer do a force-check after restart to get back chunks that 
where still on verificaiton stage.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5315 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-19 20:52:04 +00:00
chrisparker126
3534aad90d more dbase implementation 
removed msgrelatedinfo request as this can be merged to normal msg request

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-18 21:35:41 +00:00
defnax
b52fc7708f removed not needed info buttons for the infodialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-18 14:08:53 +00:00
defnax
dece8cc8b6 added openpgpsdk compile to build-all-mingw32make.bat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-18 10:53:17 +00:00
thunder2
47d652b4ec Fixed a possible crash at startup. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-17 22:16:56 +00:00
chrisparker126
90c1aa4903 begun in ernest implementing data access (RsTokenService) interface for gui 
added request processing and generalised request base class (switch to casts)
msg request now have grpId option
ci code not part of build


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-17 21:27:43 +00:00
csoler
cda4adbf5b moved channel action menu into right click, for better consistency 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-17 21:22:37 +00:00
csoler
233914c02d desactivated TrustMatrix, by the time we decide wether it is worth keeping it, and implement a better version of it 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-17 20:40:51 +00:00
csoler
c21fd10521 updated french translation (Max Romeo) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-16 21:30:47 +00:00
csoler
7a04f22eef attempt at fixing the .gnupg/ lookout issue at start 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-16 21:23:01 +00:00
thunder2
9389849e53 Fixed crash when starting the help browser from friend details the second time. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-15 22:24:03 +00:00