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

9095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
3000f94999 separated subscribe status from wether we are part of a circle or not. Still needs update of GUI 2016-04-17 00:52:00 -04:00
Cyril Soler
b861aa9fb3 Merge pull request #352 from AsamK/trailing_semicolon 
Add trailing semi-colon to MimeType in .desktop files
 2016-04-16 17:10:36 -04:00
AsamK
e7ec204411 Add trailing semi-colon to MimeType in .desktop files 2016-04-16 20:44:14 +02:00
csoler
fa8a585e20 removed some debug info 2016-04-15 18:25:53 -04:00
csoler
d642934cb5 increased frequency of update for banned PGP nodes 2016-04-15 18:25:41 -04:00
csoler
26574fd93a updated ubuntu changelog 2016-04-15 17:51:54 -04:00
defnax
2552b556eb Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-04-15 20:32:00 +02:00
defnax
85942f43c3 improving the create circle layout 2016-04-15 20:30:32 +02:00
Phenom
4dd0f591f4 Add Clear Button on WebUI for BroadCast. 2016-04-15 19:08:10 +02:00
Cyril Soler
cb6c2c9199 Merge pull request #350 from csoler/v0.6-Circles 
V0.6 circles
 2016-04-14 23:49:55 -04:00
csoler
048192ee9c added mOriginator to CircleCache entry and auto-ask for unknown GXS ids to the friend who supplied the circle group 2016-04-14 23:47:42 -04:00
csoler
ba1a1b2a61 fixed auto-subscribed of circles when some IDs are unknown 2016-04-14 23:09:59 -04:00
csoler
47dd44292a merge upstream/master 2016-04-14 18:26:47 -04:00
csoler
971f8e0c12 fixed potential crash due to not updating mPendingDataIterator after deleting map entry 2016-04-13 18:41:49 -04:00
Cyril Soler
92eb9c5113 Merge pull request #346 from PhenomRetroShare/Move_ChatNotifyButtonToToolBar 
Move Chat notify button from search bar to tool bar.
 2016-04-13 18:15:56 -04:00
defnax
aad295dafb Fixed layout margin 2016-04-13 21:00:07 +02:00
Phenom
45f77def2b Change Lobby Send button tooltip. 2016-04-13 20:42:12 +02:00
Phenom
718d6f9b19 Resize Chat Tool Bar Button for Hight DPI screen. 2016-04-13 20:26:36 +02:00
Phenom
42a2b37abb Move SearchBar to Tool Bar and remove Show/Hide action. 
As asked by Cyril in PR#346
 2016-04-13 19:21:18 +02:00
Phenom
c5873f3216 Move Chat notify button from search bar to tool bar. 
As search bar is hidden by default.
 2016-04-13 18:35:42 +02:00
csoler
d512c4a35a enabled new link type for posted (patch from Fanch) 2016-04-12 22:59:12 -04:00
Cyril Soler
cf746f160c fixed possible crash in GxsIdDetails 2016-04-12 10:06:01 -04:00
csoler
d5ed84ec9d allow one to change the contact author of a circle 2016-04-11 23:43:18 -04:00
csoler
8f9028dc52 fixed bug in GxsIdLabel due to not removign existing jobs for a given widget before setting it to a new ID 2016-04-11 23:30:42 -04:00
csoler
6b2de05e89 added channel admin and distribution method in channel summary page 2016-04-11 22:42:02 -04:00
Cyril Soler
a52bd98d4b fixed potential div by 0 in speed estimations. To be tested. 2016-04-11 10:10:10 -04:00
csoler
b148239e4f always pass data accept test in distant chat when we are on the client side of the tunnel 2016-04-10 21:09:47 -04:00
csoler
c97f197b7e removed depth obfucation of search results and replaced by 0 always, effectively removing any information about search depth (idea by AC) 2016-04-10 20:39:08 -04:00
csoler
123041a684 skip circle vetting when sending message posts with no author 2016-04-10 18:59:36 -04:00
csoler
0d5b9ae0d1 fixed last commit 2016-04-10 18:55:05 -04:00
csoler
b8075d65bd skip circle vetting when sending message posts with no author 2016-04-10 18:53:49 -04:00
csoler
4fe66d67ef removed Edit/New circles buttons, put them in context menu. Added header frame (needs a proper look) 2016-04-10 10:53:27 -04:00
Cyril Soler
c9c15e58f2 Merge pull request #345 from PhenomRetroShare/Update_CircleGraphical 
Fix Graphic Circles update.
 2016-04-10 09:49:31 -04:00
Phenom
d727311dbc Fix Graphic Circles update. 2016-04-10 12:00:23 +02:00
electron128
3eb9a5e5f1 Merge pull request #344 from Phenom: Fix Escaped charaters in WebUI 2016-04-10 11:14:32 +02:00
csoler
33d32589af updated ubuntu changelog 2016-04-09 22:42:57 -04:00
csoler
3b45fd8389 create new item "My own identities" to store own ids in IdDialog 2016-04-09 17:50:46 -04:00
Phenom
a18e05d4fd Fix Escaped characters in WebUI. 2016-04-09 21:05:20 +02:00
csoler
a5044bd71c improved calculation of speed in pqistreamer (was called before only when sending bytes), and prevented situation where no HB is received by the connection is not reset because last HB is 0, causing ghost connected peers in GUI 2016-04-09 14:48:05 -04:00
csoler
993d7d4c8f removed debug info in rsgxsnetservice 2016-04-09 14:46:12 -04:00
csoler
0853773079 merged and removed debug output in rsgxsnetservice.cc 2016-04-09 12:51:15 -04:00
Cyril Soler
10a32d3c4e Merge pull request #343 from csoler/v0.6-Circles 
V0.6 circles
 2016-04-09 11:38:07 -04:00
csoler
ca0f76954e removed warning that would show up too often when a GxsTunnel is down and message cannot be sent 2016-04-08 21:08:22 -04:00
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