Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-16 19:34:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,115 Commits 63 Branches 22 Tags 195 MiB
6d67da5ff3
Commit Graph

10115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
electron128
5783c59463 Merge pull request #318 from realityfabric/remove_empty_file 
Delete empty BUGS file
 2016-03-29 20:16:44 +02:00
electron128
475cb409c4 Merge pull request #328 from PhenomRetroShare/Fix_WebUI_MakeSrcBuild 
Fix WebUI Make Source build script for LMDE and other using /bin/sh.
 2016-03-29 20:13:24 +02:00
electron128
5b5504cf83 Merge pull request #330 from zeners/webui 
fixed missing webui files in make install
 2016-03-29 19:42:07 +02:00
zeners
be328e223e webui: include files in install 2016-03-29 18:57:18 +02:00
zeners
f5f27edd43 Merge branch 'master' 2016-03-29 18:56:00 +02:00
thunder2
a53fbad1e4 Fixed Windows compile. 2016-03-29 08:13:28 +02:00
csoler
7c288fcb1f added xenial as build target 2016-03-28 23:24:50 -04:00
csoler
2366566414 updated ubuntu changelog 2016-03-28 23:24:22 -04:00
Phenom
d6723c1412 Fix WebUI Make Source build script for LMDE and other using /bin/sh. 2016-03-28 20:54:18 +02:00
electron128
3701366078 Merge pull request #327 from zeners/webui 
Webui
 2016-03-28 14:07:19 +02:00
zeners
dfa2cba045 webui: menu in gui mode fixed 2016-03-28 13:03:49 +02:00
zeners
a11cd25517 Merge branch 'master' 2016-03-28 11:35:44 +02:00
zeners
bf374b3fa4 webui 4 windows build prepare 
should be testet by someone
 2016-03-28 11:34:33 +02:00
electron128
68b4cd860e Merge pull request #323 from zeners/webui 
New webui frontend based on Mithril.js. Thx to Zener.
 2016-03-28 10:19:10 +02:00
mr-alice
0c474f9283 pulled/merged 2016-03-27 16:46:37 -04:00
zeners
0482655647 webui: removed searchresult debug output 2016-03-27 20:29:48 +02:00
zeners
bbdb04fd78 webui: searchresult cross-checking with downloads 2016-03-27 20:13:47 +02:00
zeners
3bbd370242 webui: windows creating batch-files 2016-03-27 18:28:32 +02:00
zeners
d96a8efb66 Merge branch 'master' 2016-03-26 23:38:18 +01:00
csoler
0c138d70ad moved discarding of banned identities from lobbies before signature checking, so as to avoid to time stamp their GXSId keys 2016-03-26 18:36:52 -04:00
zeners
215402b50f webui: add downloads: focus fixed 2016-03-26 23:36:02 +01:00
zeners
922644f03e Merge branch 'master' 2016-03-26 23:24:29 +01:00
Cyril Soler
502b137ccd Merge pull request #325 from csoler/v0.6-Circles 
V0.6 circles
 2016-03-26 17:51:51 -04:00
csoler
ebf54d1340 fixed unit tests 2016-03-26 17:25:15 -04:00
zeners
a67c1d7514 webui: paste RS-links for download 2016-03-26 18:19:33 +01:00
csoler
1b8b9d4e56 turned PeopleDialog to unix ff 2016-03-25 21:10:01 -04:00
csoler
6c8737c84a merged with upstream/master 2016-03-25 21:09:37 -04:00
csoler
4831465137 fixed tiny bits in circles/people GUI 2016-03-25 21:03:09 -04:00
csoler
9efc29fff3 improved display of circle creator ID 2016-03-25 20:58:10 -04:00
csoler
d1b09b93b9 removed some debug info 2016-03-25 18:54:13 -04:00
csoler
083dc626da small code cleaning bits 2016-03-25 18:27:20 -04:00
csoler
3d45947e5b fixed small bug in debug output; cleanup debug output 2016-03-25 18:21:37 -04:00
csoler
44cadc22b2 cleaned debug info and disabled local circles before merge 2016-03-24 19:46:08 -04:00
csoler
7d8001b60d fixed display of warning in posting into forums without proper credentials 2016-03-24 19:23:34 -04:00
csoler
9dc7328dc7 fixed async-ed circle loading in IdDialog 2016-03-24 18:41:15 -04:00
zeners
30193fe79a webui: switch from react to mithril 2016-03-24 18:07:21 +01:00
csoler
d33a1e8555 added disabling of combo elements in GxsIdChooser for creating forums posts with unautorised GXS ids. Still needs a bit of work 2016-03-24 00:05:54 -04:00
csoler
40d23509a1 removed deadlock 2016-03-23 21:50:41 -04:00
csoler
981f81deae added anon ids to offline vetting 2016-03-23 20:54:45 -04:00
zeners
cef07fff91 webui: integrate new webui in unix build process 2016-03-24 00:33:22 +01:00
csoler
57f4463864 fixed potential crash due to using deleted data (found by dimqua) 2016-03-23 18:23:10 -04:00
zeners
a19a068339 webui: options>settings, playing with colors 2016-03-23 13:11:14 +01:00
zeners
585c43bb25 webui: RS-reboot / RS-reboot-detection improved 
paths without token, are now pulled
 2016-03-22 23:19:36 +01:00
zeners
60e9f0f35d undo gitignore 2016-03-22 21:09:33 +01:00
zeners
a069db5ee5 webui: chat: display peer location 2016-03-22 16:37:48 +01:00
zeners
4733523b0c webui: view / change rights per user 2016-03-22 16:33:05 +01:00
zeners
83ff00e77d webui: updated mithril to v0.2.3 
no idea what it was before
 2016-03-22 12:08:23 +01:00
csoler
1fb1f3ebaf update of groups up to the latest attached circle server update TS. Should re-send groups that depend on a circle when the circle change 2016-03-21 23:21:26 -04:00
zeners
51e0d83c47 webui: options / rights (only defaults) 2016-03-21 17:04:21 +01:00
zeners
1c94ff743b Merge branch 'master' 2016-03-21 16:41:21 +01:00