1541 Commits

Author SHA1 Message Date
yflory
b86f8e3f26 Fix uloaded files not moved to the correct folder in drive 2017-10-12 17:33:22 +02:00
Caleb James DeLisle
753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
yflory
62bc72847f Add an error message when trying to tag a deleted pad 2017-10-12 15:06:29 +02: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
yflory
69dd3a60ab Hide template and fileupload buttons for anonymous users 2017-10-12 14:32:12 +02:00
yflory
8e1f15e88d Get title suggestion based on poll's description 2017-10-12 14:12:26 +02:00
yflory
95ad25973e Ability to delete a stronger pad from readonly mode 2017-10-12 11:41:53 +02:00
yflory
b28c1537e8 Fix history in readonly mode 2017-10-12 10:59:23 +02:00
ansuz
f0bdc3b26f second try 2017-10-09 16:57:30 +02:00
ansuz
d50a692986 add note about tags to prompt 2017-10-09 16:51:57 +02:00
Caleb James DeLisle
c8928a0811 Switch the transform function and also stop calling textPatcher without the metadata 2017-10-09 17:07:26 +03:00
yflory
035150614d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 15:38:08 +02:00
yflory
484e216054 Fix hashtag button in the toolbar 2017-10-09 15:37:37 +02:00
ansuz
a12239405b fix toolbar 'home link' to visit home page from drive 2017-10-09 15:10:38 +02:00
Caleb James DeLisle
828a685ba8 Fix broken browser fight logging 2017-10-09 14:12:55 +03:00
yflory
aa744567ed Fix thumbnails in sframe apps 2017-10-09 11:52:34 +02:00
yflory
5e7bf0cfb8 Embed an image in whiteboard 2017-10-09 10:32:24 +02:00
Caleb James DeLisle
f0eb58ee95 Merge branch 'staging' into framework 2017-10-06 14:50:35 +03:00
yflory
1c7c37c121 Add the file class to pads in 'template' and 'recent' categories in the drive 2017-10-05 18:07:05 +02:00
yflory
ab3648a30a Merge branch 'newpoll' into staging 2017-10-05 17:56:17 +02:00
ansuz
503111d26a use recompiled media-tag 2017-10-05 17:00:47 +02:00
ansuz
427afc3954 override modified file name in pdfjs 2017-10-05 16:59:55 +02:00
ansuz
d85db64939 add tags from drive 2017-10-05 16:58:34 +02:00
Caleb James DeLisle
0aecfad854 Occasionally the language selector only says "Mode" rather than the language 2017-10-05 16:12:49 +03:00
ansuz
1f35798194 stop event propagation from tag prompt 2017-10-05 15:08:34 +02:00
Caleb James DeLisle
d9e97b86e6 Merge branch 'staging' into framework 2017-10-05 12:14:37 +03:00
Caleb James DeLisle
383c2f54cb 1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation. 2017-10-05 12:14:03 +03:00
yflory
26dfc65c25 Comments in polls 2017-10-04 19:06:16 +02:00
yflory
68bda92291 Use codemirror for description in poll 2017-10-03 19:04:29 +02:00
ansuz
b8ce149db6 add hint about tag usage 2017-10-03 18:36:34 +02: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
yflory
5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
ansuz
09c0a473e2 fix function signatures 2017-10-03 14:08:40 +02:00
yflory
3337689630 Wrong translation key in toolbar 2017-10-03 14:04:07 +02:00
yflory
126742a1c3 Fix bugs in sframe poll and update UI 2017-10-02 19:02:31 +02:00
ansuz
351b95d6a9 resolve merge conflicts 2017-10-02 18:59:47 +02:00
ansuz
6c7b135f91 lint compliance 2017-10-02 18:58:18 +02:00
ansuz
94c392b79f secure messaging 2017-10-02 18:57:17 +02:00
Caleb James DeLisle
53f65f6a87 Merge branch 'staging' into framework 2017-10-02 17:46:27 +03:00
Caleb James DeLisle
fa6938baa8 1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
2017-10-02 17:34:37 +03:00
Caleb James DeLisle
1e5bc5da14 onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer 2017-10-02 15:09:25 +03:00
Caleb James DeLisle
12e82e80ec When changing the title of a presentation, the title in the bottom of the slide should also change 2017-10-02 15:04:44 +03:00
ansuz
48c49e5a75 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-28 10:23:59 +02:00
ansuz
19e58cec94 prevent typeError 2017-09-28 10:23:48 +02: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
Caleb James DeLisle
90d00c10b1 Make metadata-manager a bit more robust 2017-09-27 11:56:25 +02:00
yflory
8de1852ab9 Lint compliance 2017-09-27 10:36:16 +02:00
yflory
b4de31c827 Merge branch 'newdrive' into staging 2017-09-27 10:28:16 +02:00