Commit Graph

8872 Commits

Author SHA1 Message Date
zeners
e9af1794dd webui: need for master 2016-03-12 19:17:37 +01:00
zeners
b1286f06ed webui: route peer location to chat-lobby 2016-03-12 17:44:43 +01:00
csoler
a065dba8f8 cleaned code a little bit 2016-03-12 11:05:03 -05:00
csoler
61c7da7e2d unselect all IDs when no circle is selected 2016-03-12 11:02:32 -05:00
zeners
b1da4ed67e Merge branch 'master' 2016-03-12 16:46:33 +01:00
csoler
456a882343 added highlighting of currently selected circle members 2016-03-12 10:41:35 -05:00
csoler
5d2833fa42 improved one line of debug output in turtle 2016-03-12 09:25:28 -05:00
csoler
670fb3d1eb merged 2016-03-12 09:25:00 -05:00
Cyril Soler
4e2fd4e2c7 Merge pull request #303 from PhenomRetroShare/Fix_CorrectColoredNameContrast
Correct Colored Name Contrast in chat, same way than text.
2016-03-12 09:22:28 -05:00
Phenom
16c59af9f4 Correct Colored Name Contrast in chat, same way than text. 2016-03-12 13:25:10 +01:00
csoler
9e8a4cdac4 fixed auto-subscribe of circles when unsigned identities are locally owned 2016-03-11 22:36:47 -05:00
csoler
b97c5df581 fixed culumn name in GR stats 2016-03-11 17:47:12 -05:00
csoler
692b549f08 fixing compilation problem 2016-03-11 17:27:40 -05:00
csoler
232dba28ea allow non signature checking for GR message recepts at intermediate peers when key is missing. Should fix return receipt being lost in the way keeping messages in outbox 2016-03-11 17:21:27 -05:00
Cyril Soler
ecebaced23 Merge pull request #301 from PhenomRetroShare/Add_NewColumnInRsCollForPath
Add a new column in RsColl Editor to get only name in first one.
2016-03-11 14:26:27 -05:00
Cyril Soler
c0cf05cbb8 Merge pull request #302 from PhenomRetroShare/Fix_RsLinkCopyForExtraFile
Fix Paste RetroShare Link action when copy File link.
2016-03-11 14:25:18 -05:00
Phenom
d62a20547d Fix Paste RetroShare Link action when copy File link. 2016-03-11 20:08:28 +01:00
Phenom
7e76e28af7 Add a new column in RsColl Editor to get only name in first one. 2016-03-11 17:26:18 +01:00
csoler
4136d09156 updated Circles TODO 2016-03-10 23:55:20 -05:00
csoler
4e4980ba0e fixed display of info for non admin circles, and added readonly system to not allow editing them 2016-03-10 22:57:04 -05:00
Cyril Soler
5361c85371 updated circles TODO 2016-03-10 22:02:21 -05:00
csoler
0282c2aeb3 added ban menu entry to chat lobby participant list 2016-03-09 21:49:24 -05:00
csoler
3fc6f6b2db updated TODO(circles), removed useless context menu, added tooltips for circle distribution options 2016-03-09 20:53:49 -05:00
csoler
4eebe24ee2 disabled auto-sync for messages in GXS circles, while keeping Grp auto-sync 2016-03-09 20:23:33 -05:00
Cyril Soler
76e7893550 updated circles TODO 2016-03-09 20:18:19 -05:00
csoler
2017f92130 updated circles todo 2016-03-08 23:12:27 -05:00
csoler
cf759830ca added TODO file specific to circles 2016-03-08 23:01:43 -05:00
csoler
7e31bdafcf fixed removal of peers from circles 2016-03-08 23:00:24 -05:00
csoler
cba4795911 improved circles GUI logic 2016-03-08 00:02:16 -05:00
csoler
9b92f66c61 added edit of existing circles 2016-03-07 22:51:23 -05:00
csoler
49605a33dc fixed variable scope problem in introserver.cc 2016-03-07 22:10:18 -05:00
csoler
ecf4a991c0 updated ubuntu changelog 2016-03-06 20:26:46 -05:00
csoler
53f32f2dc8 added missing collection of some peers in p3gxscircles::recipients() 2016-03-04 13:45:35 -05:00
csoler
3c2c1df245 added test against empty circles 2016-03-03 21:37:36 -05:00
csoler
bb260696ce attempt at fixing negative bw rates in GUI that may pop up when an error is present in the SSL stream (e.g. when a peer disconnects/reconnects) 2016-03-02 19:00:51 -05:00
electron128
20fcf635e4 Merge pull request #285 from PhenomRetroShare/Fix_SSGxsChannelGroupLoadNullError
Fix error "(EE) SSGxsChannelGroup::load() asked to load a null string.
2016-02-26 18:13:20 +01:00
csoler
9ddef9e45b merged with upstream/master 2016-02-25 17:48:59 -05:00
Phenom
1a110e4ada Define empty service string as a valid case. 2016-02-25 13:58:45 +01:00
Phenom
3c3d23bf8a Fix error "(EE) SSGxsChannelGroup::load() asked to load a null string.
Weird." by creating a default serviceString if empty.
2016-02-25 13:58:45 +01:00
csoler
0bcf52c442 added missing update of mRecvTS in database when updating a group metadata 2016-02-24 16:51:56 -05:00
defnax
d1fd5d302d update todo 2016-02-24 21:51:34 +01:00
defnax
7b1460c4c9 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-02-24 21:45:43 +01:00
csoler
f5eb791230 added notification for modified metadata in group. Does not yet work on friends though. 2016-02-23 23:04:22 -05:00
csoler
b8c42a9eb7 added copy of previous subscription flags when group update is received. Avoids unsubscribing friends when publishing an update to grp metadata 2016-02-23 23:04:22 -05:00
csoler
fafe75dca6 added update of mServerUpdateTS up to last mRecvTS of each group, which holds the last time the grp meta data was received/modified 2016-02-23 23:04:22 -05:00
Cyril Soler
a6f0b8dfc1 Merge pull request #290 from sehraf/pr-improved-unused-location-cleanup
impoved cleanup of unused locations
2016-02-22 16:57:13 -05:00
sehraf
dbdfdcd008 removed unused map lookups 2016-02-22 21:09:10 +01:00
sehraf
77166cbf13 impoved cleanup of unused locations 2016-02-22 16:41:31 +01:00
Cyril Soler
cd4d743474 added missing -lpthread 2016-02-22 10:14:29 -05:00
csoler
dcf86e6384 removed compilation warning and added warning about missing vetting for external circles 2016-02-21 12:00:09 -05:00