Commit graph

2587 commits

Author SHA1 Message Date
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
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
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
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
ansuz
fe2fef5e4c support dragging and dropping multiple files 2017-06-08 18:12:17 +02:00
yflory
1c2ea04f11 Drive refactoring 2017-06-08 17:52:00 +02:00
ansuz
8bee45d0f4 don't try to replace undefined 2017-06-08 15:27:28 +02:00
ansuz
52975a2f09 allow users to pin the first time, even if they are over their limit 2017-06-08 15:26:51 +02:00
ansuz
fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors 2017-06-08 14:19:14 +02:00
ansuz
e723228060 always show upgrade button in drive 2017-06-08 14:03:01 +02:00
ansuz
192a517e64 handle nonexistent files in getUploadSize 2017-06-08 14:02:26 +02:00
ansuz
5bd7e19ddd guard against invalid channels, make session expiration time configurable 2017-06-08 14:02:06 +02:00
ansuz
aa296eadff pass correct argument into getFileSize 2017-06-08 14:00:48 +02:00
ansuz
da533b106a improve type checking in getFileSize 2017-06-08 11:24:20 +02:00
ansuz
5cbfc1a23c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-07 10:14:51 +02:00
ansuz
2f851ab97e fix lint errors 2017-06-07 10:13:51 +02:00
Caleb James DeLisle
aa9aaefdea Add frame-ancestors to allow remote auth 2017-06-07 09:51:10 +02:00
ansuz
d25477e8c6 don't let tooltips interfere with DOM interaction 2017-06-06 18:08:23 +02:00
yflory
811d031ffd Fix the 'File' entry in the drive 'New' menu 2017-06-06 12:09:55 +02:00
yflory
f1271bfd03 Missing file 2017-06-06 11:56:22 +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
yflory
85f1fb86d0 Add missing french translation keys 2017-06-06 10:28:00 +02:00
ansuz
f43132a63b bump version in footer and package.json 2017-06-06 10:01:07 +02:00
ansuz
ec9a4dec5e Merge branch 'soon' into staging 2017-06-05 11:43:26 +02:00
ansuz
cc85e674f1 Merge branch 'master' into soon 2017-06-05 11:43:02 +02:00
ansuz
8d4017b79e fix parse error 2017-06-05 11:35:05 +02:00
jxtsai
b9b8352633 Traditional Chinese 2017-06-05 15:10:13 +08:00
ansuz
77d4ffba86 animate preview mode sidebar 2017-06-02 17:39:45 +02:00