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
9,204 Commits 63 Branches 22 Tags 194 MiB
4b00d47d3a
Commit Graph

9204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cyril Soler
85c8274f47 Merge pull request #342 from PhenomRetroShare/Fix_AllowOnlyOneInst 
Fix Allow Only One Instance
 2016-04-08 20:41:12 -04:00
Phenom
08e5679019 Fix Allow Only One Instance 
If RS_GUI is started without arguments, it is started with a new
instance.
 2016-04-08 02:14:27 +02:00
Cyril Soler
554251df53 Merge pull request #341 from PhenomRetroShare/Add_WebUIClearButton 
Add a Clear button on WebUI
 2016-04-07 19:50:02 -04:00
Phenom
24b3f0de0e Add a Clear button on WebUI 
And Fix clear history update from GUI.
 2016-04-08 01:31:36 +02:00
csoler
b90808dca8 changed update of server update TS in subscribeStatusChange from 0 to time(NULL) 2016-04-07 18:26:18 -04:00
Cyril Soler
c8cae4c33c Merge pull request #297 from PhenomRetroShare/Add_AllowOnlyOneIntanceAndPassArg 
Allow only one instance. If exists, pass to it arguments.
 2016-04-07 00:09:00 -04:00
csoler
4ad3b11ef5 fixed compiler warning 2016-04-06 22:27:02 -04:00
csoler
4bf9262382 merged with upstream/master 2016-04-06 22:26:34 -04:00
csoler
60ffcd21b7 fixed double item deletion in RsGxsNetService::handleRecvItem() 2016-04-06 22:23:10 -04:00
csoler
c79c9bae5e added encryption of message sync requests for external circles-restricted groups, and verification that properly encrypted requests are sent before sending encrypted msg ID lists 2016-04-06 21:12:54 -04: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
csoler
f26348b710 fixed bug in grouter which caused sending of messages to some offline peers, hence wasting some routes, and causing " p3ServiceServer::sendItem() Fails Filtering for packet id=2001810" messages. 2016-04-05 18:09:02 -04:00
csoler
7817a542f2 merged with trunk 2016-04-05 17:55:03 -04:00
Cyril Soler
9871b37ef2 Merge pull request #305 from realityfabric/openssl_crypto_infinite_loop 
Changed a while loop to prevent an infinite loop
 2016-04-04 23:02:09 -04:00
csoler
9217ec3c9d added circle distribution info in forum summary page 2016-04-04 21:36:37 -04:00
csoler
ff4c360e27 fixed display bug in bw statistics graph 2016-04-04 21:16:05 -04:00
Cyril Soler
b206317442 Merge pull request #339 from PhenomRetroShare/Fix_UnitTests_Compilation 
Fix UnitTests Compilation
 2016-04-04 12:17:34 -04:00
Phenom
f2b995768b Fix UnitTests Compilation 2016-04-04 17:18:42 +02:00
csoler
d34b2e885a allow to change the author ID of a group during update. Set proper value in group author widget 2016-04-03 17:11:13 -04:00
csoler
18dd7ee7bd moved "too many routing clues" message to debug output, since it can be caused by normal lobby operation 2016-04-03 11:42:45 -04:00
csoler
3554e48c7e output packet error with some details (inspired by Phenom-PR289) 2016-04-03 11:38:53 -04:00
csoler
a3890ad1c3 added gathering of routing clues from lobbies 2016-04-03 11:00:03 -04:00
csoler
9ced5175fe improved tooltips in people list 2016-04-02 16:54:30 -04:00
csoler
53dbc526a8 removed mention of null PGP ids in People 2016-04-02 16:50:22 -04:00
csoler
f8639e5486 fixed bug considering null PGP ids in ban list 2016-04-02 16:44:41 -04:00
csoler
5bbaa1e8e5 added people settings page, removed debug output 2016-04-02 16:14:18 -04:00
csoler
9d9b790a3e exposed un-verified PGP signatures on GXS ids in GUI. Added auto-ban of GXS ids signed by a PGP ids that has already signed a large enough set of GXS ids. Still needs some GUI to change the threshold. 2016-04-02 16:14:18 -04:00
csoler
9a6bcf81d7 removed blue color for admin flag in forums, since admin flag is already indicated by position in "My Forums" list, and it also hides the anti-spam flags 2016-04-02 16:14:18 -04:00
csoler
7c4d85dcd1 fixed compilation for ubuntu xenial 2016-04-02 16:14:18 -04:00
Cyril Soler
0350c1de82 Merge pull request #335 from PhenomRetroShare/Add_ClearWebAPIWhenClearChatHistory2 
Clear WebAPI when clear chat history in GUI.
 2016-04-01 17:47:03 -04: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
thunder2
ab78825966 Enabled webui build script for Windows compile 2016-03-31 10:23:23 +02:00
Cyril Soler
21421ab8bf Merge pull request #334 from zeners/master 
webui: windows build-script
 2016-03-30 14:03:50 -04:00
zeners
8def6174c9 webui: windows build-script 
new location for web sources
 2016-03-30 19:50:11 +02:00
Cyril Soler
741db1333f Merge pull request #333 from zeners/webui 
webui: patch init.sh like build.sh
 2016-03-30 12:34:32 -04:00
zeners
f570477991 webui: patch init.sh like build.sh 2016-03-30 18:20:59 +02:00
defnax
cee3477734 Fixed the default splitter expanding of People Dialog 2016-03-30 17:06:34 +02:00
Cyril Soler
351af4723f Merge pull request #332 from zeners/master 
compatible to g++11 / QT5
 2016-03-29 15:42:23 -04:00
zeners
aca88308ea compatible to g++11 / QT5 
method suggested by cyril
 2016-03-29 21:22:14 +02:00
electron128
5783c59463 Merge pull request #318 from realityfabric/remove_empty_file 
Delete empty BUGS file
 2016-03-29 20:16:44 +02:00
electron128
475cb409c4 Merge pull request #328 from PhenomRetroShare/Fix_WebUI_MakeSrcBuild 
Fix WebUI Make Source build script for LMDE and other using /bin/sh.
 2016-03-29 20:13:24 +02:00
electron128
5b5504cf83 Merge pull request #330 from zeners/webui 
fixed missing webui files in make install
 2016-03-29 19:42:07 +02:00
zeners
be328e223e webui: include files in install 2016-03-29 18:57:18 +02:00
zeners
f5f27edd43 Merge branch 'master' 2016-03-29 18:56:00 +02:00
thunder2
a53fbad1e4 Fixed Windows compile. 2016-03-29 08:13:28 +02:00
csoler
7c288fcb1f added xenial as build target 2016-03-28 23:24:50 -04:00
csoler
2366566414 updated ubuntu changelog 2016-03-28 23:24:22 -04:00
Phenom
d6723c1412 Fix WebUI Make Source build script for LMDE and other using /bin/sh. 2016-03-28 20:54:18 +02:00
electron128
3701366078 Merge pull request #327 from zeners/webui 
Webui
 2016-03-28 14:07:19 +02:00
zeners
dfa2cba045 webui: menu in gui mode fixed 2016-03-28 13:03:49 +02:00