Commit graph

4009 commits

Author SHA1 Message Date
yflory
c46280d032 Fix style issues for Edge 2017-10-10 11:32:52 +02:00
yflory
c985aa60aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 17:30:14 +02:00
yflory
f4189f883e Add missing french translation keys 2017-10-09 17:28:56 +02:00
ansuz
128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin 2017-10-09 17:20:23 +02:00
ansuz
d046b9ce33 add missing French key 2017-10-09 17:16:48 +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
CatalinScr
21f1a48380 changed the login in button 2017-10-09 17:17:33 +03: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
d3d6940b69 Update french translation for tags 2017-10-09 15:47:28 +02:00
ansuz
3f181fa370 update loading screen tip for tags 2017-10-09 15:38:33 +02:00
ansuz
c0bf34fd02 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 15:36:29 +02: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
f751554f82 update footer and package.json for upcoming version 2017-10-09 15:15:04 +02:00
yflory
4c19375f4d Avoid missing characters in poll's inputs 2017-10-09 15:11:02 +02:00
ansuz
a12239405b fix toolbar 'home link' to visit home page from drive 2017-10-09 15:10:38 +02:00
yflory
dd141b5c9f Disable comments when a poll is not published 2017-10-09 14:08:54 +02: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
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
Caleb James DeLisle
9509d538e0 Cursor not being updated at the right times before applying a patch. 2017-10-06 14:49:52 +03:00
yflory
888028c542 Lint 2017-10-05 18:13:28 +02:00
yflory
e5a54b5978 Fix folder highlighting with drag&drop in the drive 2017-10-05 18:12:23 +02: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
yflory
1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
ansuz
7559bc062e lint compliance 2017-10-05 17:06:02 +02:00
ansuz
080511efcd add missing translation for hashtags 2017-10-05 17:01:39 +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
Caleb James DeLisle
ae87320408 Preview pane cannot be resized after it has been hidden and then shown again 2017-10-05 16:12:24 +03:00
ansuz
1f35798194 stop event propagation from tag prompt 2017-10-05 15:08:34 +02:00
ansuz
c936e5ae73 make context menu open correct app on correct port 2017-10-05 11:14:47 +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
ansuz
deed04108b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-05 10:22:07 +02:00
ansuz
a90c078e84 correct reference to undefined 2017-10-05 10:21:59 +02:00
yflory
26dfc65c25 Comments in polls 2017-10-04 19:06:16 +02:00
yflory
5304dc319f Enable redirection to the previous page after registration 2017-10-04 15:55:57 +02:00
yflory
ceb8ff18bd Fix ghost icon in drive 2017-10-04 15:52:09 +02:00
yflory
846b1a9fb3 Improve description UI in poll. Enable tags and mediatag 2017-10-04 15:39:18 +02:00
yflory
68bda92291 Use codemirror for description in poll 2017-10-03 19:04:29 +02:00
ansuz
e2f53eaddb add loading screen tip about hashtags 2017-10-03 18:39:03 +02:00
ansuz
b8ce149db6 add hint about tag usage 2017-10-03 18:36:34 +02:00
ansuz
f15ec4efe9 add tagging to whiteboard and file apps 2017-10-03 18:05:28 +02:00