Commit Graph

3781 Commits (5f0383ae990a102ec5251e9861cd454b88891744)

Author SHA1 Message Date
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
yflory d1f4617419 Fix a race condition causing the preview part to be empty 2017-06-12 14:37:12 +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
Pierre Bondoerffer 685b352db8
poll: Add show help button 2017-06-12 14:25:10 +02:00
yflory 30bdb9881c Fix undefined element in select dropdown menus 2017-06-12 14:23:06 +02:00
yflory 298e34a9de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 12:47:47 +02:00
yflory 8471dab6b1 Provide hints in theme and language dropdowns 2017-06-12 12:47:25 +02:00
Pierre Bondoerffer 5d565660a9
tiny fixes 2017-06-12 12:41:03 +02:00
Pierre Bondoerffer 6bc191725f
poll: support disconnect and fix trash button 2017-06-12 12:37:07 +02:00
ansuz b3221c0fb4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 12:32:48 +02:00
ansuz 0c957989d2 add link to upload table when complete 2017-06-12 12:31:52 +02:00
yflory 5d6a0dcc1b Fix width transition when dragging preview 2017-06-12 12:27:24 +02:00
Pierre Bondoerffer 6dd80c26b1
Make editing more visible 2017-06-12 12:00:39 +02:00
yflory 3ff3eac283 Fix a race condition causing the drive to be empty 2017-06-12 11:54:20 +02:00
yflory a5cb5f2ceb Merge branch 'staging' into newDrive 2017-06-12 10:51:38 +02:00
yflory 1b671edce9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 10:50:30 +02:00
yflory 9a4a6e9b40 Always display the upgrade button in the drive 2017-06-12 10:17:52 +02:00
ansuz 70fea0467a Merge pull request #133 from pbondoer/spanish
Update spanish
2017-06-09 17:56:29 +02:00
Pierre Bondoerffer 621376b0fa
small fixes 2017-06-09 17:44:13 +02:00
Pierre Bondoerffer cce665a18b
spanish updates 2017-06-09 17:42:25 +02:00
yflory 9cc25d4c9f Merge branch 'staging' into newDrive 2017-06-09 17:03:01 +02:00
yflory 7134b00544 Add a button to display the context menu for the trash on mobiles 2017-06-09 17:02:50 +02:00
yflory d24458e4b0 Fix the tests to work with the async migration 2017-06-09 16:41:51 +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
yflory c1402fbb0a Lint error 2017-06-09 15:56:18 +02:00
yflory b36484931d Lint 2017-06-09 15:55:46 +02:00
yflory 1fb638f519 clean the code 2017-06-09 15:50:13 +02:00
yflory 9d758a040b Fix an issue with the search field not displayed properly 2017-06-09 15:45:46 +02:00
ansuz 08902c0910 drop extraneous argument 2017-06-09 15:33:28 +02:00
ansuz 23318357a6 make fewer RPC calls for usageBar 2017-06-09 15:33:03 +02:00
ansuz df586a223c update limits, usage, plan, and note whenever they are checked 2017-06-09 15:31:43 +02:00
ansuz 8bad0c556e change log to error 2017-06-09 15:29:55 +02:00
ansuz b0e00d337e more careful validation 2017-06-09 15:28:53 +02:00
yflory fd88162624 Merge branch 'staging' into newDrive 2017-06-09 14:47:37 +02:00