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
8,576 Commits 63 Branches 22 Tags 194 MiB
85149df1ef
Commit Graph

8576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
electron128
85149df1ef Merge branch 'master' into webui 2016-02-14 13:24:33 +01:00
electron128
821c14426c remove dead code from RsNotify (old forum and channel read status changed notify) 2016-02-14 12:48:52 +01:00
electron128
63a8260cb9 change RsNotify to use RsGxsId for chat lobby events 2016-02-14 11:53:27 +01:00
zeners
253182032a webui: chat-channel subscribe 2016-02-13 20:25:31 +01:00
defnax
8637d3cb31 Fixed issue #263 2016-02-13 16:15:41 +01:00
zeners
9d9a456a67 Merge remote-tracking branch 'origin/master' into webui 2016-02-13 12:31:46 +01:00
Cyril Soler
3e4c1546c4 Merge pull request #275 from PhenomRetroShare/Fix_GenCertDialogOnMac 
Fix GenCertDialog on Mac stay on.
 2016-02-12 23:08:59 -05:00
Phenom
3ebb8c6ce8 Fix GenCertDialog on Mac stay on. 
Only call processEvent() if hasPendingEvents().
If no events are available, this function will wait until more are
available and return after processing newly available events.
 2016-02-12 17:54:35 +01:00
defnax
4033f35fa9 update todo 2016-02-08 21:34:45 +01:00
electron128
3d814b7926 libresapi: added chat/send_status 
usage:
$ curl --data "{\"chat_id\":\"<chat_id>\",\"status\":\"Hi there\"}" http://<host:port>/api/v2/chat/send_status
 2016-02-07 14:28:46 +01:00
electron128
2c2c7936e5 libresapi: make list of chat lobby participants available at chat/lobby_participants/<chat_id> 2016-02-07 14:28:46 +01:00
electron128
3a9ff8e1ea fix integer sizing issues in webserver 2016-02-07 14:28:46 +01:00
electron128
116513963f libresapi: added statetoken to identity handler responses 2016-02-07 14:28:45 +01:00
electron128
f4f37cc354 webui: added todo 2016-02-07 14:28:45 +01:00
thunder2
7ded128b3a Update rsversion.in 2016-02-06 19:18:22 +01:00
csoler
4a8edee615 reverted commits 1843a5460d and 48d7c57662 for the release, since they dont fit the GUI style and cause problems, until they are made right 2016-02-06 12:01:39 -05:00
csoler
d46f1ad13e locally merged latest commits 2016-02-06 10:44:20 -05:00
thunder2
ccf96a35c3 Updated languages from Transifex 2016-02-05 20:04:46 +01:00
csoler
562e783c3f fixed date format in changelog 2016-02-04 20:31:04 -05:00
defnax
182f816674 update todo 2016-02-04 21:30:23 +01:00
defnax
80ac88994f Merge pull request #265 from PhenomRetroShare/Add_SaveOpMode 
Save last state of OpMode status bar droplist and restore it at start.
 2016-02-04 20:11:47 +01:00
thunder2
b46e2a9aa2 Updated english translation 2016-02-04 12:07:43 +01:00
csoler
c6bb23aff7 updated french text, and improved message in IdDialog 2016-02-03 21:20:16 -05:00
csoler
d9e512da8b fixed update of GroupNetworkStats and proper reset when loadList is called (thx Jo) 2016-02-03 18:58:28 -05:00
Phenom
1843a5460d Add colored style sheet to OpModeStatus ComboBox. 2016-02-03 18:00:01 +01:00
Phenom
48d7c57662 Save last state of OpMode status bar droplist and restore it at start. 2016-02-03 18:00:01 +01:00
csoler
464e89b766 updated french translation (unfinished) 2016-02-02 23:13:07 -05:00
csoler
26744d552a worked a bit on the french translation 2016-02-02 22:50:59 -05:00
thunder2
ca8eee50d6 Updated english translation 2016-02-02 19:36:35 +01:00
Cyril Soler
06b7417eed added comment in rsinit.cc for the initialisation of NetService for GxsIds 2016-02-02 12:34:26 -05:00
thunder2
4394580e55 Fixed Windows installer script. 2016-02-02 18:26:45 +01:00
Cyril Soler
3664626704 added missing check for mNetService 2016-02-02 12:14:39 -05:00
Cyril Soler
dc9fadd7c9 added missing subscription change notify in rsgenexchange when creating a new group 2016-02-02 09:46:16 -05:00
csoler
14a1c0ebd2 updated ubuntu changelog 2016-02-01 19:03:47 -05:00
Cyril Soler
a41d9df4da fixed small bug in probability computation in grouter 2016-02-01 09:59:13 -05:00
csoler
6d1a3937d6 fixed but in re-sending of failed grouter items 2016-02-01 00:33:11 -05:00
csoler
aa194caea3 fixed bug preventing save of routage info in distant messaging 2016-01-31 20:27:53 -05:00
zeners
57d1d0868a webui: adding and listing identities 2016-01-31 18:16:26 +01:00
electron128
94b02943e6 libresapi: added identity/create_identity 2016-01-31 16:04:34 +01:00
zeners
284e5a9ed0 webui: reorganize counterfnkt 2016-01-31 15:58:20 +01:00
electron128
22afc8e67b libresapi: fix empty peers list 2016-01-31 15:07:25 +01:00
electron128
b649088b20 webui: added todo 2016-01-31 15:07:17 +01:00
zeners
9e1fc59c6e webgui: fixed menu-display 2016-01-31 13:37:55 +01:00
zeners
67475b30e7 Merge branch 'master' into webui 2016-01-31 10:57:27 +01:00
csoler
a85b5d2fab re-enabled GRouter tunnels (disabled for testing). Removed debug output. 2016-01-30 20:35:08 -05:00
csoler
f0a49a427e changed global router routing strategy. Should be more effective now. 2016-01-30 20:27:56 -05:00
csoler
59d4c2c829 removed some compilation warnings 2016-01-30 20:27:27 -05:00
thunder2
3cfd976c0e Added Windows installer script for Qt5. 2016-01-29 16:23:28 +01:00
csoler
58e59d1181 added sounds to chat lobbies (patch fromManuel Davis) 2016-01-28 20:19:44 -05:00
thunder2
8dde723e90 Added security hardening flags for ASLR and DEP protection for Windows compile. 2016-01-28 19:02:42 +01:00