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

8949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zeners
ecf8e7f127 Merge remote branch 'origin/master' 2016-03-19 17:39:34 +01:00
csoler
24ba909f41 fixed mixup between in/out bandwidth traffic info 2016-03-19 11:39:58 -04:00
csoler
526a83a303 fixed update of circle name in the GUI 2016-03-18 22:11:07 -04:00
csoler
4e0ee29d6a fixed creation/distribution of self-restricted circles 2016-03-17 20:18:54 -04:00
csoler
b6388d7a7a fixed update of GUI when circles change 2016-03-17 18:17:58 -04:00
csoler
36edde6d25 fixed bug causing GUI to not auto-unsubscribe in circles 2016-03-16 23:30:23 -04:00
csoler
a2a9079380 fixed qt4 compilation 2016-03-16 23:03:46 -04:00
csoler
31356bab96 added reload of grp meta on update 2016-03-16 21:27:46 -04:00
csoler
b2192957ef added update of GUI, instead of re-creating everything when a circle change 2016-03-16 21:27:46 -04:00
Cyril Soler
5b00c03a5b Merge pull request #4 from PhenomRetroShare/Fix_PictureFlowDeletion 
Fix delete in PictureFlow
 2016-03-16 14:17:16 -04:00
Phenom
76fddb29af Fix delete in PictureFlow 2016-03-16 19:05:39 +01:00
Cyril Soler
b6e51b2d8c Merge pull request #308 from dartraiden/master 
Сorrect path to Hidden Service configuration panel
 2016-03-16 09:56:36 -04:00
dartraiden
5ba4f42cb9 correct path to Hidden Service configuration panel 2016-03-16 16:24:06 +03:00
csoler
384131a231 added force reload of cache for circles that are modified 2016-03-15 22:41:59 -04:00
csoler
6466209553 added test to only subscribe/unsubscribe circles when needed, hence avoiding an unnecessary TS update 2016-03-15 22:11:36 -04:00
csoler
80aaf30a01 fixed potential crash due to bad usage of updates 2016-03-15 00:00:39 -04:00
csoler
bdb326a989 attempt at fixing circle cache loop. Renamed a few variables and fixed logic. Not yet fully working 2016-03-14 23:19:37 -04:00
realityfabric
546bfe69b0 Changed the logic back to setting err in the conditional statement while more explicitly a logical one 2016-03-14 02:46:58 -07:00
csoler
83e39d8ae5 fixed effect of selecting known/signed IDs in circle creation dialog 2016-03-13 17:29:38 -04:00
csoler
4cf57d64d8 set default value for circle distribution type 2016-03-13 17:19:14 -04:00
csoler
9c649aa58c improved debugDump(), showing the subscription status of each grp 2016-03-13 12:08:03 -04:00
csoler
5fe390d485 changed titles of tree root nodes in circles 2016-03-13 11:41:33 -04:00
csoler
051806227f fixed circle auto-subscribe 2016-03-13 11:29:21 -04:00
realityfabric
1e90194c86 Changed a while loop from 'while(err=ERR_get_error())' to 'while(err==ERR_get_error())' 2016-03-13 07:24:14 -07:00
zeners
1b72d2cec3 webui: unsubscribe chat-lobby 2016-03-12 23:38:39 +01:00
zeners
41a8e53abf webui: chat-layout fixed 2016-03-12 23:28:27 +01:00
zeners
0afa2e3726 webui: unread chat message counter in menu 2016-03-12 20:20:56 +01:00
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