Commit graph

4748 commits

Author SHA1 Message Date
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
yflory
2c90cb5907 Move help button in drawer and fix drawer style 2018-02-28 17:59:27 +01:00
yflory
753b7550ca Save button in the pad creation screen 2018-02-28 17:02:35 +01:00
yflory
a4a6385e86 Add keyboard shortcuts for the Ctrl+E or Cmd+E modal 2018-02-28 16:38:28 +01:00
yflory
dbe8ab014d Select all in drive 2018-02-28 16:34:55 +01:00
yflory
d975bb9cc0 Fix focus after pad creation screen 2018-02-28 13:16:30 +01:00
yflory
f0bc1cfe99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-27 17:39:27 +01:00
yflory
60b2384885 Move initial state into a help block 2018-02-27 17:38:29 +01:00
ansuz
66d83dc045 update version 2018-02-27 15:13:39 +01:00
yflory
5c53868c3b Delete pads after 3 months of inactivity 2018-02-26 18:34:05 +01:00
ansuz
50adcc791c
Merge pull request #231 from sairim/patch-1
Update readme.md
2018-02-26 13:56:51 +01:00
yflory
329fd61bb1 Remove lag when creating a pad from the pad creation screen 2018-02-26 10:49:35 +01:00
yflory
22f130d948 Remove lag when displaying loading screen in login and register 2018-02-26 10:41:37 +01:00
sairim
9b94c9b762
Update readme.md
include a link to Docker wiki page under the 'Setup using Docker' section
2018-02-25 16:54:49 +02:00
yflory
a697ad9762 Merge branch 'soon' 2018-02-22 17:05:58 +01:00
yflory
599afa4fc5 Merge branch 'soon' into staging 2018-02-22 15:57:08 +01:00
yflory
61dbf94f2d Fix pad attributes not working for readonly pads if you know the edit hash 2018-02-22 15:56:23 +01:00