Commit Graph

826 Commits (f13d23241c7e5d86914e6c83e60f4f06e0598e79)

Author SHA1 Message Date
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
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
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
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
yflory 7c9e86e351 Merge branch 'soon' into staging 2017-06-09 14:47:15 +02:00
yflory 9694272083 Fix html code not parsed 2017-06-09 14:42:55 +02:00
yflory 9ca10ba524 Merge branch 'staging' into newDrive 2017-06-09 14:40:26 +02:00
yflory 7f120c8fc1 Merge branch 'soon' into staging 2017-06-09 14:38:36 +02:00
yflory 78e6118153 Merge branch 'staging' into newDrive 2017-06-09 14:38:21 +02:00
yflory 444c41974e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-09 14:37:54 +02:00
yflory df5cbfb53e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2017-06-09 14:36:38 +02:00
yflory 6a96aa6819 Disconnect the network when migrating the drive in another tab 2017-06-09 14:36:35 +02:00
yflory 2a94bdaf05 test 2017-06-09 13:41:11 +02:00
yflory ca95b5c42b Remove unused console.log 2017-06-09 12:31:07 +02:00
yflory f8c69573fd Disconnect other tabs when migrating the drive 2017-06-09 12:23:28 +02:00
ansuz c4e5741ae0 update upgrade button logic 2017-06-09 12:12:39 +02:00
ansuz f1a9002417 use upgradeURL with usage bar 2017-06-09 10:46:11 +02:00
yflory 51e0d40572 Make sure the old storage key is removed after migration 2017-06-08 18:35:20 +02:00
yflory b0fe04381d Merge branch 'staging' into newDrive 2017-06-08 18:14:31 +02:00
yflory 1c2ea04f11 Drive refactoring 2017-06-08 17:52:00 +02:00
ansuz fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors 2017-06-08 14:19:14 +02:00
ansuz da533b106a improve type checking in getFileSize 2017-06-08 11:24:20 +02:00
ansuz d25477e8c6 don't let tooltips interfere with DOM interaction 2017-06-06 18:08:23 +02:00
yflory 5641a4a839 Add the file app in the 'new' dropdown menus 2017-06-06 11:52:47 +02:00
yflory ac91d2f413 Fix the upgrade and donate buttons in the home page 2017-06-06 11:37:54 +02:00
yflory ee57458158 Remove the pin limit alert 2017-06-06 10:49:32 +02:00
ansuz 767793b5ca fix stuck loading tip 2017-06-02 12:13:11 +02:00
ansuz f631973f1f optimize file upload 2017-06-01 18:16:02 +02:00
ansuz 55af84cc90 lower spinner timeout interval 2017-06-01 14:27:06 +02:00
ansuz 07279c8dc7 export boolean Test.testing 2017-06-01 10:23:24 +02:00
Caleb James DeLisle 71bd808e4f Send everything through the test global function 2017-06-01 00:09:39 +02:00
Caleb James DeLisle 244bd7b378 ;;; 2017-05-31 23:32:47 +02:00