Commit graph

4714 commits

Author SHA1 Message Date
yflory
ab8306f5d4 Merge branch 'soon' into staging 2018-03-14 17:17:00 +01:00
yflory
b3429c2d24 Merge branch 'creation' into soon 2018-03-14 17:08:54 +01:00
yflory
1dabc76bb9 Fix sframe-boot version 2018-03-14 17:03:50 +01:00
yflory
de97c5a3ff Fix mobile detection when hiding the userlist 2018-03-14 17:02:41 +01:00
yflory
d6228a39bd Fix userlist notifications missing for join events 2018-03-14 16:34:44 +01:00
yflory
ebef99e5cf Owned drive 2018-03-14 16:32:17 +01:00
yflory
03bcd2f00d Lint compliance 2018-03-14 12:12:24 +01:00
yflory
3eec812aff Merge branch 'staging' into creation 2018-03-14 12:07:04 +01:00
yflory
e977b14c1b Update French translation 2018-03-14 11:50:17 +01:00
yflory
b1d5beca6f Translations + UI for pad creation screen v2 2018-03-14 11:37:49 +01:00
yflory
645e47bd72 Catch chainpad errors in polls 2018-03-13 15:10:33 +01:00
yflory
e56d762409 Catch chainpad errors and display it in the UI 2018-03-13 14:38:56 +01:00
yflory
c9ed6d6bf8 New pad creation screen 2018-03-13 11:31:08 +01:00
ansuz
b2df2ba341 prototype owned file upload 2018-03-12 17:50:47 +01:00
ansuz
7dc7d5d950 lint compliance 2018-03-09 12:12:47 +01:00
ansuz
64afcb7c0b comment out busyloop workaround for tippyjs 2018-03-09 10:12:12 +01:00
ansuz
ca65e6e54a Merge branch 'soon' 2018-03-09 10:07:38 +01:00
yflory
7c99397e60 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-09 10:05:39 +01:00
ansuz
03ae9d5714 Merge branch 'soon' 2018-03-08 16:38:16 +01:00
ansuz
5f08ad2ea1 fix mangled 404 translation 2018-03-08 16:27:41 +01:00
yflory
643fcc4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 16:15:39 +01:00
yflory
2f262b12c6 Fix help box issues 2018-03-08 16:15:26 +01:00
ansuz
34d5c04eb4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 16:08:33 +01:00
ansuz
7091dfb669 standardize naming for the drawer, and reorder poll description 2018-03-08 16:05:47 +01:00
yflory
442f15df98 Add help text in all the apps + french translation 2018-03-08 15:39:46 +01:00
ansuz
82329dbe70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 15:06:30 +01:00
ansuz
ec19b82609 add new help text 2018-03-08 15:06:22 +01:00
yflory
b1b9683141 Add links to FAQ and Privacy in static pages 2018-03-08 12:17:19 +01:00
yflory
cbd29794b8 Improve keyboard shortcuts in the pad creation screen 2018-03-08 12:16:40 +01:00
yflory
2bcf28bb34 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 18:24:09 +01:00
yflory
eac10321ba Reduce toolbar height on mobiles 2018-03-07 18:24:01 +01:00
ansuz
71f519f982 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 17:49:57 +01:00
ansuz
4262c8e6e4 correct french grammar 2018-03-07 17:49:38 +01:00
ansuz
c7e4db7f38 transcribe english faq 2018-03-07 17:48:44 +01:00
yflory
7a70d69d8e Hide editor toolbars by default when using a small screen 2018-03-07 17:34:55 +01:00
yflory
f45023ed1f Remove connection lost popup when websocket connection is lost 2018-03-07 16:48:49 +01:00
yflory
6a7c86aee7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 15:08:17 +01:00
yflory
8cdad27ec4 French FAQ 2018-03-07 15:07:39 +01:00
ansuz
1452d65bd4 fix missing section in privacy policy 2018-03-07 12:08:02 +01:00
yflory
689368cdd7 Fix feedback for markdown toolbar and cke toolbar 2018-03-07 10:57:29 +01:00
yflory
3fcdbcdbc5 Faq questions 2018-03-06 16:49:13 +01:00
ansuz
0af90ef88d resolve merge conflict 2018-03-05 15:00:57 +01:00
ansuz
3d66822473 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-05 14:52:24 +01:00
ansuz
fdf2899e88 @kpcyrd said I should update this 2018-03-05 14:51:22 +01:00
yflory
62186bd4bd Remove tooltip when the element is removed from DOM 2018-03-05 11:19:05 +01:00
yflory
b0dba481d8 Fix small UI issues and IE issues 2018-03-02 18:33:43 +01:00
yflory
b7b560fcb8 Enable Cmd key support in shortcuts 2018-03-01 14:48:36 +01:00
yflory
12bfcbe701 Add fixed order for rightside icons in the toolbar 2018-03-01 14:32:14 +01:00
yflory
95bbc3d130 Add the mediatag button back in the code app 2018-03-01 11:23:16 +01:00
yflory
ee3b926e84 Get rid of ckeditor's reset_all class... 2018-03-01 10:33:28 +01:00