Commit graph

3961 commits

Author SHA1 Message Date
yflory
2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
yflory
7b6432f134 Lint 2017-10-12 18:20:33 +02:00
yflory
6926d42292 Autoload template picker to make it faster to appear when used 2017-10-12 18:18:01 +02:00
yflory
1c8e1a36e8 Add file type in the pad attributes for existing files 2017-10-12 17:43:49 +02:00
yflory
b86f8e3f26 Fix uloaded files not moved to the correct folder in drive 2017-10-12 17:33:22 +02:00
yflory
88d0a2b8a6 Merge branch 'master' into staging 2017-10-12 17:08:34 +02:00
yflory
5ed60a0ad7 Fix image ratio in slides 2017-10-12 16:45:51 +02:00
yflory
62bc72847f Add an error message when trying to tag a deleted pad 2017-10-12 15:06:29 +02: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
ansuz
e317265594 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-10-12 14:09:55 +02:00
ansuz
0d912402e5 patch for bug in Firefox ESR 2017-10-12 14:09:48 +02:00
yflory
91381ca77d Fix lint errors 2017-10-12 12:20:27 +02:00
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
00d88dd421 Merge branch 'soon' 2017-10-11 16:38:13 +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
ansuz
253e92fe33 Merge pull request #184 from sssemil/patch-1
Add dots
2017-10-11 11:01:18 +02:00
Emil Suleymanov
fe3bea877d Add dots
Yep, just dots.
2017-10-11 00:47:03 +02:00
yflory
ecb537ac7f Move code to render.js in poll 2017-10-10 18:19:49 +02:00
ansuz
d4cd67f7a7 update current version of readme 2017-10-10 13:26:31 +02:00
ansuz
4242f35b51 Merge pull request #181 from genma/master
Cryptad version in Readme.md added
2017-10-10 13:27:38 +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
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
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
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
yflory
888028c542 Lint 2017-10-05 18:13:28 +02:00