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,604 Commits 63 Branches 22 Tags 194 MiB
c5f127f3b1
Commit Graph

8604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zeners
c5f127f3b1 webui: contains => match 2016-02-19 18:48:17 +01:00
zeners
5979d2f827 Merge branch 'master' into webui 2016-02-19 18:18:15 +01:00
Cyril Soler
5a48070171 Merge pull request #281 from sehraf/pr-disc-increase-auto-clean-time 
discovery: don't remove new added locations too soon
 2016-02-19 10:45:18 -05:00
sehraf
4140969fcb added seperated limit for discovery (30 days) 2016-02-19 16:35:11 +01:00
Thunder
6695a384b0 Merge pull request #283 from PhenomRetroShare/Fix_ChatMsgItemAvatar_updateAvatar 
Fix connect in ChatMsgItem for avatar updateAvatar.
 2016-02-18 17:21:15 +01:00
Phenom
e639dc57ce Fix connect for avatar updateAvatar in ChatMsgItem and MessengerWindow. 
As it is already connected in AvatarWidget's constructor.
 2016-02-18 11:48:58 +01:00
Thunder
b059a8eb3f Merge pull request #284 from PhenomRetroShare/Fix_CannotUpdateAvatarError 
Fix "(EE) cannot update avatar. mId has unhandled type." error.
 2016-02-17 20:23:44 +01:00
Phenom
dc2578b528 Fix "(EE) cannot update avatar. mId has unhandled type." error. 
Error was raised because event pass trought all widgets.
 2016-02-17 18:18:56 +01:00
csoler
697ef4061c added test against arbitrary large items in turtle search requests. 2016-02-17 09:39:08 -05:00
csoler
51d90a4ef4 added test against arbitrary large items in turtle search requests. 2016-02-17 09:39:08 -05:00
Cyril Soler
c15e8b5c35 Merge pull request #282 from PhenomRetroShare/Add_MinSizeForStackPages 
Add minimal Size for stackPages in MainWindow for first start.
 2016-02-16 17:46:34 -05:00
Cyril Soler
d878334551 Merge pull request #206 from realityfabric/master 
Added top level license file for GPL 2.0
 2016-02-16 17:45:49 -05:00
Phenom
3276790bf8 Add minimal Size for stackPages in MainWindow for first start. 2016-02-16 23:15:33 +01:00
sehraf
841299d077 discovery: don't remove new added locations too soon 
was: removed after 10 min. or less - when no connection is established
now: removed after 1 day - when no connection is established
 2016-02-16 20:33:38 +01:00
zeners
288e81c486 webui: full chat display 2016-02-14 19:44:00 +01:00
Cyril Soler
efadc7d2c6 Merge pull request #270 from PhenomRetroShare/Fix_GxsChannelFilterWhenLoading 
Fix Channel filter when loading big post.
 2016-02-14 13:38:08 -05:00
Cyril Soler
44882b941c Merge pull request #278 from PhenomRetroShare/Fix_bencode.c_CompilationForC 
Fix compilation of bencode.c for C compilator.
 2016-02-14 13:35:32 -05:00
Cyril Soler
3ab7c89660 Merge pull request #279 from cavebeat/single_dh_op 
added openSSL option SSL_OP_SINGLE_DH_USE regarding CVE-2016-0701
 2016-02-14 13:33:27 -05:00
cave beat
9843c8381b added openSSL option SSL_OP_SINGLE_DH_USE regarding CVE-2016-0701 
tl;dr The OpenSSL 1.0.2 releases suffer from a Key Recovery Attack on DH small subgroups. This issue got assigned CVE-2016-0701 with a severity of High and OpenSSL 1.0.2 users should upgrade to 1.0.2f. If an application is using DH configured with parameters based on primes that are not "safe" or not Lim-Lee (as the one in RFC 5114) and either Static DH ciphersuites are used or DHE ciphersuites with the default OpenSSL configuration (in particular SSL_OP_SINGLE_DH_USE is not set) then is vulnerable to this attack.
 2016-02-14 18:49:37 +01:00
Phenom
7d21666098 Fix compilation of bencode.c for C compilator. 
Remove C++ in this C file.
 2016-02-14 17:40:10 +01:00
electron128
2ab755bb5c libresapi: added chat/receive_status 
usage:
$ curl http://<host:port>/localhost:8080/api/v2/chat/receive_status/<chat_id>
 2016-02-14 14:57:41 +01:00
electron128
fc5f8c3b8c removed unused function declaration ChatId::toGxsId() 2016-02-14 14:55:57 +01:00
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
Phenom
5f0afb3d6e Fix Channel filter when loading big post. 
And fix "Not a GxsChannelPostItem, deleting!" error message

Don't search empty text in very long string.
 2016-02-08 19:42:56 +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