Commit Graph

8868 Commits (5b2929a6fca605ac7b18038aa5498e4064525f7a)

Author SHA1 Message Date
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
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
ansuz d367f71760 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:24:57 +02:00
ansuz c70eb73d52 Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:24:20 +02:00
yflory d83d8dbeda Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:22:51 +02:00
yflory 803bad1421 Move the file upload code in a separate file 2017-06-13 11:21:26 +02:00
ansuz 278125747c only log errors if there is an error 2017-06-13 11:18:14 +02:00
ansuz 12f581bb1c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:14:32 +02:00
ansuz 977faee40b expose more debugging information from rpc errors 2017-06-13 11:14:01 +02:00
Pierre Bondoerffer d344f03778
proper button text 2017-06-12 18:57:07 +02:00
Pierre Bondoerffer 2b5339193c
bring admin back 2017-06-12 18:45:04 +02:00
Pierre Bondoerffer b2eef94232
use numbers, not strings 2017-06-12 18:35:13 +02:00
Pierre Bondoerffer 848010842f
dont sanity check silently 2017-06-12 18:26:27 +02:00
Pierre Bondoerffer 56f2c46c75
document a line 2017-06-12 18:25:06 +02:00
Pierre Bondoerffer cd1c957929
NaN safety 2017-06-12 18:23:17 +02:00
Pierre Bondoerffer 0118fdbd00
use a local variable 2017-06-12 18:16:11 +02:00
XWiki SAS 49370764c1 change whiteboard translation 2017-06-12 18:14:33 +02:00
Pierre Bondoerffer b8e394db67
poll: Implement multiple choices 2017-06-12 18:01:51 +02:00
yflory a58162a617 Make the drive tests work when not logged in 2017-06-12 17:49:33 +02:00
XWiki SAS c702313489 change label texte 2017-06-12 17:34:45 +02:00
yflory 2fb5e3ae35 Merge branch 'staging' into newToolbar 2017-06-12 17:00:07 +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
yflory 376b60c21c New toolbar temp 2017-06-12 15:59:24 +02:00
yflory 9c5bade83e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 14:37:29 +02:00