Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-25 01:10:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,219 Commits 63 Branches 22 Tags
Commit Graph

774 Commits

Author SHA1 Message Date
csoler
83049259f2 added bullets to show subscription status of circles. Enabled message sync in circles. Changed flags in GxsCirclesDetails to include new subscription flags 2016-05-06 21:37:17 -04:00
Cyril Soler
40f8313236 Merge pull request #307 from hunbernd/fix/sqlcipher-version 
Sqlcipher version fix
 2016-05-04 15:32:17 -04:00
csoler
6d2bfcf04e restored average kicking rate to a more reasonnable value. To be tested (for too much CPU use). Dynamically changing this value is probably needed for VOIP 2016-04-29 18:52:58 -04:00
csoler
654e0fc1d8 added missing call to SSL_pending, which caused decrypted data to wait in the SSL buffer when the bio is not receiving anything more 2016-04-29 17:53:21 -04:00
csoler
a4430647de various changes to measure RTTs more accurately 2016-04-26 23:42:44 -04:00
Nyfor
5e94c772b3 Fixed compilation for Clang. 2016-04-23 09:50:49 +02:00
Phenom
10bb542e83 Allow only one instance for useLocalServer option activated. If exists, 
pass to it arguments.

For now, only allow to pass RsCollection file and retroshare://
protocol.
 2016-04-06 22:04:53 +02:00
Phenom
c6f1cc4e63 Clear WebAPI when clear chat history in GUI. 
Move notifyChatCleared call to p3ChatService
To maintain notify direction.
 2016-03-31 22:52:53 +02:00
zeners
aca88308ea compatible to g++11 / QT5 
method suggested by cyril
 2016-03-29 21:22:14 +02:00
csoler
6c8737c84a merged with upstream/master 2016-03-25 21:09:37 -04:00
Phenom
5061046c96 Add Plugins Path for Apple 
From Jenster
 2016-03-19 18:58:00 +01:00
hunbernd
ff5189996c Fixed display of SQLCipher version 
RS used to show SQLite's version
 2016-03-15 19:02:34 +01:00
csoler
051806227f fixed circle auto-subscribe 2016-03-13 11:29:21 -04:00
csoler
4eebe24ee2 disabled auto-sync for messages in GXS circles, while keeping Grp auto-sync 2016-03-09 20:23:33 -05:00
csoler
3db3ccf636 merged with upstream 2016-02-10 00:00:21 -05:00
Cyril Soler
06b7417eed added comment in rsinit.cc for the initialisation of NetService for GxsIds 2016-02-02 12:34:26 -05:00
csoler
2072ca4ade fixed bug in getPeerDetails causing callstacks to be displayed for non initialised IPs 2016-01-26 22:08:17 -05:00
thunder2
748147f73b Fixed Windows compile. 2016-01-15 21:41:23 +01:00
csoler
fd04f0b3bb updated to upstream/master 2016-01-13 20:27:08 -05:00
Cyril Soler
b56881e6d9 fixed windows compilation 2016-01-13 10:23:21 -05:00
csoler
d13526facd added a new method rs_malloc that checks its arguments and prints a stacktrace on error/weird call. Changed the code everywhere to use this instead of malloc. Removed some mallocs and replaced with RsTemporaryMemory 2016-01-12 21:10:11 -05:00
electron128
09ed1ea22c removed getVirtualPeerId method from rsmsgs lobby interface. 
It is not neccesary anymore to have the virtual peer id exposed to the GUI layer.
 2016-01-10 14:22:06 +01:00
electron128
67e1495d9a use ChatId instead of virtual peer id for chat lobby popup. Removed a now unused method from rsmsgs interface and DistributedChatService. 2016-01-10 13:29:40 +01:00
csoler
8ec0e10019 updated v0.6-Circles with latest trunk 2016-01-01 22:18:43 -05:00
csoler
9da8a8abc3 fixed compilation of RsNxsTransaction encryption code 2016-01-01 21:37:27 -05:00
electron128
9cb81f57ea don't create wiki dataservice if wiki is not enabled for compile 2016-01-01 12:01:49 +01:00
electron128
55ea8a54f8 init pointer in RsServer 2016-01-01 11:49:03 +01:00
Gio
1303d855e6 more cleanups + sanitize p3Peers::getPeerDetails avoid to look for port on null sockaddr_storage 2015-12-31 19:32:46 +01:00
csoler
140205108a added backend for distant message and distant chat filtering based on contact list 2015-12-25 22:37:06 -05:00
csoler
5d9272055f merged with upstream/master 2015-12-22 18:33:01 -05:00
electron128
f7ab3ad04f allow plugins to integrate into the JSON API 2015-12-15 19:56:49 +01:00
csoler
0c1e6301b3 merged with latest upstream trunk 2015-12-05 16:49:00 -05:00
electron128
7cd880e1e4 removed member gxs_id from ChatId class, because ChatId now uses tunnel ids stored in distant_chat_id for distant chat. 
reverted naming confusion in in libresapi ChatHandler and fixed author of distant chat messages (distant chat is still unfinished)
 2015-12-05 17:00:57 +01:00
csoler
be17a563d1 fixed compilation and added flag function for permissions in messaging 2015-12-04 23:08:49 -05:00
csoler
9193d3579b merged with latest master before creating PR 2015-12-04 21:24:51 -05:00
csoler
81ab43beb9 fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation 2015-11-30 00:02:44 -05:00
csoler
6951d730a5 debugging of GxsTunnel service - fixed transport layer 2015-11-28 18:02:57 -05:00
csoler
6ca49a2d98 fixed serialisation methods for GxsTunnel service 2015-11-27 23:37:39 -05:00
csoler
a2e0f4196b updated GUI for new distant chat 2015-11-26 20:40:06 -05:00
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08:00
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Cyril Soler
8e6c7cd075 changed SSL cert size to 4096 bits as suggested by cave 2015-10-16 12:49:10 -04:00
csoler
71c8dfdc58 manual merge before creating a conflict-free PR 2015-10-12 14:45:11 -04:00
csoler
317e7ea5ab added some backend for reputation system 2015-10-04 23:14:49 -04:00
csoler
22d4893721 removed a few compilation warning that might cause compilation errors on some systems 2015-09-24 18:03:19 -04:00
sirjenster
68fd1b206e First Mac/OSX compile fixes 2015-09-22 18:33:16 -07:00
csoler
7293cd3afa updated ubuntu changelog 2015-09-21 22:58:58 -04:00
Cyril Soler
66691d4f37 Merge pull request #108 from sehraf/i2p 
Adding I2P support to RS
 2015-09-16 20:01:39 -04:00
sehraf
d24b281948 optimizations 
* reduced calls to mPeermgr
* use switch convenience
* small fixes
 2015-09-15 17:10:48 +02:00
sehraf
bfcf43f0e1 fixed connection type detection and other small things 2015-09-15 16:18:46 +02:00