Commit graph

862 commits

Author SHA1 Message Date
yflory
1ad1b78c64 Fix the history mode with readOnly and old URLs 2017-06-19 14:41:31 +02:00
yflory
e40f43bd20 Migrated pads were not displayed instantly in the drive 2017-06-19 11:52:57 +02:00
yflory
a5924cb803 Make sure the initial title is set in the userDoc when creating a new pad 2017-06-15 18:50:39 +02:00
ansuz
0e9ebddf11 fix the things 2017-06-15 18:13:24 +02:00
ansuz
c0e2c1060e don't reload when slide hash changes 2017-06-15 17:54:35 +02:00
yflory
594405de73 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 15:36:23 +02:00
yflory
cbe21959b4 Update UI for the file/media app 2017-06-15 15:35:52 +02:00
ansuz
17146d7af9 send feedback for uploads 2017-06-15 15:34:13 +02:00
yflory
2068a8b85b Embed the mediatag library in the file app 2017-06-15 14:58:18 +02:00
yflory
66b076111e Add an upload button to the slide's file picker 2017-06-15 12:32:44 +02:00
ansuz
b480346f5b more efficient media-tag 2017-06-15 12:05:25 +02:00
ansuz
0d47e68d3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 11:19:24 +02:00
ansuz
0eb50b8b6c drop pdf.js dependency 2017-06-15 11:19:06 +02:00
yflory
a237eec41e Add a file picker in the slide app 2017-06-15 11:04:58 +02:00
ansuz
d25a0893cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 17:24:49 +02:00
ansuz
3184e5d235 don't reload page on hash mode change 2017-06-14 17:24:44 +02:00
yflory
1077b3b267 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 15:55:10 +02:00
yflory
a98353af6c Add a button to upload a file in the drive 2017-06-14 15:55:03 +02:00
ansuz
295f9c00a6 send feedback on buttons 2017-06-14 15:36:46 +02:00
yflory
497ddeee6d Upload files with drag&drop in the drive 2017-06-14 12:47:37 +02:00
ansuz
687b4d8307 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 11:10:26 +02:00
ansuz
69c3bd392f update built media tag to latest XWiki version 2017-06-14 11:09:51 +02:00
yflory
d8ebe566d8 Don't call mediatag for non-image files 2017-06-13 18:38:53 +02:00
yflory
37d3d04f0e Clean mediatag integration code 2017-06-13 17:57:27 +02:00
ansuz
802146e2af don't put download buttons in a div 2017-06-13 17:54:15 +02:00
yflory
19cb920a7c Don't redraw a media-tag everytime the content has changed 2017-06-13 17:21:22 +02:00
yflory
2032c08066 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 16:15:11 +02:00
yflory
f9c26645cf Upload images using the slide app 2017-06-13 16:15:04 +02:00
ansuz
17e4e9be27 download anything that isn't an image in media-tag 2017-06-13 16:12:13 +02:00
ansuz
1b574da053 fix typo 2017-06-13 12:24:32 +02:00
ansuz
7ad89bd9af don't interrupt boot because of localStorage failure 2017-06-13 12:02:36 +02:00
ansuz
3337e2133a more thorough tests for localStorage presence 2017-06-13 11:57:21 +02:00
yflory
4eeea93265 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:38:16 +02:00
yflory
11e2226f1a Fix lint errors 2017-06-13 11:38:04 +02:00
ansuz
c779e328e8 warn users if their browser does not support localStorage 2017-06-13 11:33:25 +02:00
yflory
d7292e69c6 Fix undefined variable 2017-06-13 11:25:12 +02:00
yflory
803bad1421 Move the file upload code in a separate file 2017-06-13 11:21:26 +02:00
yflory
a58162a617 Make the drive tests work when not logged in 2017-06-12 17:49:33 +02:00
yflory
969cec5d60 Make sure everything is synced before migrating the drive 2017-06-12 16:19:45 +02:00
yflory
7dd9ed543a Merge branch 'newDrive' into staging 2017-06-12 16:08:09 +02:00
ansuz
c9725af508 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 14:34:01 +02:00
ansuz
db9b9547d9 don't complain about missing callbacks for messages which are not our responsibility 2017-06-12 14:33:50 +02:00
yflory
30bdb9881c Fix undefined element in select dropdown menus 2017-06-12 14:23:06 +02:00
yflory
8471dab6b1 Provide hints in theme and language dropdowns 2017-06-12 12:47:25 +02:00
yflory
a5cb5f2ceb Merge branch 'staging' into newDrive 2017-06-12 10:51:38 +02:00
yflory
9cc25d4c9f Merge branch 'staging' into newDrive 2017-06-09 17:03:01 +02:00
yflory
a57f7c6ce7 Fix lint errors 2017-06-09 16:39:44 +02:00
ansuz
4bcad3e154 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-09 16:26:36 +02:00
ansuz
47857ec382 use cached pinned usage data 2017-06-09 16:17:20 +02:00
yflory
75c3c10b20 Merge branch 'soon' into staging 2017-06-09 15:56:45 +02:00