408 Commits

Author SHA1 Message Date
yflory
41afc28802 Fix conflicts, clean the code, add migration from old mediatags 2018-04-20 17:49:40 +02:00
yflory
6a4f25bc9f Test widget filters 2018-04-20 17:48:39 +02:00
yflory
fd89811479 Clean mediatag plugin 2018-04-19 18:29:10 +02:00
yflory
5eab39ad75 Tets mediatag plugin using widgets 2018-04-19 17:45:08 +02:00
Paul Libbrecht
5747e1a492 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad 2018-04-10 19:12:30 +02:00
yflory
4288f536f1 Use requireCSS to load FontAwesome 2018-03-21 18:31:53 +01:00
yflory
01dd6953b9 Fix the previous fix... 2018-03-20 15:13:00 +01:00
yflory
c3f7b74baf Fix CkEditor's toolbar initial state 2018-03-20 15:07:20 +01:00
yflory
442f15df98 Add help text in all the apps + french translation 2018-03-08 15:39:46 +01:00
yflory
7a70d69d8e Hide editor toolbars by default when using a small screen 2018-03-07 17:34:55 +01:00
yflory
b0dba481d8 Fix small UI issues and IE issues 2018-03-02 18:33:43 +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
d975bb9cc0 Fix focus after pad creation screen 2018-02-28 13:16:30 +01:00
yflory
60b2384885 Move initial state into a help block 2018-02-27 17:38:29 +01:00
yflory
80df45f257 Get text from ckeditor 2018-02-01 10:09:08 +01:00
yflory
fb192a2c45 Add a configurable background color in the file app in view mode 2018-01-31 14:42:34 +01:00
yflory
c460e2820e Fix a 1px offset for the userlist in Firefox/Windows 2018-01-11 16:09:29 +01:00
yflory
f329d65bc8 Ability to reduce the width of ckeditor 2017-12-22 18:01:15 +01:00
yflory
edc236e17b Disable edition in pad read-only mode 2017-12-20 12:15:43 +01:00
yflory
c269929319 Fix creation page not displayed in pad and slide 2017-12-11 17:17:06 +01:00
Caleb James DeLisle
617c4b6044 CSS refactorings and pad-is-not-pinned work 2017-12-07 19:00:13 +01:00
Caleb James DeLisle
c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
yflory
644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz
812df7de6f Merge branch 'merge-staging' into staging 2017-11-27 12:18:34 +01:00
yflory
b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
ansuz
2e00214783 drop unreachable code 2017-11-23 16:57:01 +01:00
ansuz
ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
yflory
cf26c4c286 Improve the toolbar UI for smaller screens 2017-11-17 18:21:45 +01:00
Caleb James DeLisle
7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window 2017-11-09 17:07:04 +01:00
Caleb James DeLisle
75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 2017-11-09 15:36:49 +01:00
ansuz
e07bb0f7b3 roll back to old transform function, except in pad 2017-11-06 17:18:10 +01:00
yflory
8de9a596f1 Fix cursor in thumbnails 2017-11-02 19:11:27 +01:00
Evilham
5dcfbd07ab Merge branch 'theming-improvement' into staging 2017-10-27 18:32:08 +02:00
Evilham
4933aafbc8 Added default values to avoid breaking existing themes. 2017-10-27 18:31:52 +02:00
Evilham
735f0a7e30 Merge branch 'theming-improvement' into staging 2017-10-26 20:44:56 +02:00
Evilham
83da9cf752 Moved colours to colortheme.less to enable theming 2017-10-26 20:29:14 +02:00
yflory
6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
yflory
c1d05a00ba Improve media-tag export in pad to work with existing CSP 2017-10-23 10:55:40 +02:00
yflory
6d080bcb45 Ability to export mediatag images in pad 2017-10-20 18:10:08 +02:00
Caleb James DeLisle
a6b34491fc freeze the editor when reconnecting 2017-10-13 13:40:51 +03:00
Caleb James DeLisle
c773b5d076 Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed 2017-10-12 15:42:09 +03:00
Caleb James DeLisle
36aee2d174 lets try normalizing the dom before applying a patch 2017-10-09 14:13:11 +03:00
Caleb James DeLisle
9509d538e0 Cursor not being updated at the right times before applying a patch. 2017-10-06 14:49:52 +03:00
Caleb James DeLisle
d6570ad9f2 Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click. 2017-10-03 17:57:57 +03:00
Caleb James DeLisle
7230c780a1 Get rid of last usages of cryptpad-common in pad/inner 2017-10-02 15:06:01 +03:00
Caleb James DeLisle
f95acda758 Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/ 2017-09-27 16:53:16 +02:00
Caleb James DeLisle
6dbc02e81a Merge branch 'staging' into framework 2017-09-27 12:01:18 +02:00
Caleb James DeLisle
1c791b5b51 Fix framework by removing some async and also fix media tags 2017-09-27 11:58:14 +02:00
yflory
b4de31c827 Merge branch 'newdrive' into staging 2017-09-27 10:28:16 +02:00