Commit Graph

3594 Commits (2ef4ebc6ef46d354303fad77261797506939bbb2)

Author SHA1 Message Date
ansuz 5ce453afa0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 13:51:11 +02:00
ansuz e73e32ab3a fix too-tall download button 2017-06-15 13:43:32 +02:00
yflory 927f6404b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 13:35:07 +02:00
yflory 66b076111e Add an upload button to the slide's file picker 2017-06-15 12:32:44 +02:00
ansuz c2e5ef7048 better sizing for videos 2017-06-15 12:11:39 +02:00
ansuz c717d01714 fix pdf height 2017-06-15 12:06:53 +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 f3f1cf9e6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 11:05:07 +02:00
yflory a237eec41e Add a file picker in the slide app 2017-06-15 11:04:58 +02:00
ansuz 20874c76f1 prevent code blocks from overflowing slides 2017-06-14 18:56:44 +02:00
yflory a4f45caebb Lint 2017-06-14 18:25:54 +02:00
yflory 0a4e876139 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 17:52:23 +02:00
yflory 8738b42861 Update the drive UI to show that Upload and New are linked to a folder 2017-06-14 17:51:48 +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 9870169e03 remove a few elements from CKEditor config 2017-06-14 15:39:33 +02:00
ansuz 295f9c00a6 send feedback on buttons 2017-06-14 15:36:46 +02:00
ansuz d5c7eb49a4 send feedback on toolbar hide and CKE buttons 2017-06-14 15:33:12 +02:00
yflory 7e0a2abc2c Fix the file name when restoring an element from the trash 2017-06-14 13:03:10 +02:00
yflory 5b523be171 Fix drag&drop for pads in the drive 2017-06-14 12:55:46 +02:00
yflory e51f678bb9 Don't display the popup whne moving a file to the trash 2017-06-14 12:50:44 +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
ansuz e631818268 format probable server URL when printing to the console at launch 2017-06-14 10:27:29 +02:00
yflory 494b44e2b1 fix lint errors 2017-06-14 10:04:54 +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 8a599eb9b1 Merge pull request #136 from blumeva/staging
change minimum opacity
2017-06-13 15:27:45 +02:00
XWiki SAS fc9ecb0f7c change minimum opacity 2017-06-13 15:20:16 +02:00
ansuz ea79294494 Merge pull request #134 from pbondoer/newpoll
More poll improvements
2017-06-13 14:32:46 +02:00
ansuz 88c2c0afde Merge pull request #135 from blumeva/staging
Staging
2017-06-13 14:23:41 +02:00
XWiki SAS 0004be521c change translation 2017-06-13 14:21:22 +02:00
XWiki SAS 74c9b663dd changing whiteboard 2017-06-13 14:14:36 +02:00
XWiki SAS 40cf7ea107 change whiteboard 2017-06-13 14:11:22 +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
ansuz 100cc1792a non-existent files have size 0 2017-06-13 11:47:22 +02:00
yflory a57f8679c5 Fix a race condition in the file app 2017-06-13 11:45:37 +02:00
yflory 4eeea93265 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:38:16 +02:00