Commit graph

2797 commits

Author SHA1 Message Date
yflory
50090a3af6 Add placeholders for the comment form in poll 2017-10-12 12:18:32 +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
yflory
620ba4ed5d Fix fouc in drive 2017-10-11 17:15:56 +02:00
yflory
b31bbebf7b Buttons are missing in whiteboard when zoomed in 2017-10-11 17:11:38 +02:00
yflory
a5a08176fb Merge branch 'master' into staging 2017-10-11 16:58:45 +02:00
yflory
54b5a2d654 Fix style issues in poll (Chrome) 2017-10-11 16:01:26 +02:00
yflory
86767184da Fix style issues in poll for Edge 2017-10-11 15:38:23 +02:00
yflory
00e8d32d60 Fix column position in poll for Chrome 2017-10-11 15:37:47 +02:00
yflory
b110e1b8da Fix style issues in poll for Edge 2017-10-11 15:37:11 +02:00
yflory
ecb537ac7f Move code to render.js in poll 2017-10-10 18:19:49 +02:00
yflory
75b3ff9c60 CSS issue in polls 2017-10-10 11:35:24 +02:00
yflory
c46280d032 Fix style issues for Edge 2017-10-10 11:32:52 +02:00
ansuz
128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin 2017-10-09 17:20: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
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
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
yflory
aa744567ed Fix thumbnails in sframe apps 2017-10-09 11:52:34 +02: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
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
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
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
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
ansuz
f90742603e style fixes 2017-10-03 17:53:28 +02:00
yflory
707d3b3e94 Ability to export polls as csv 2017-10-03 16:50:59 +02: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