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 |
|
yflory
|
a58162a617
|
Make the drive tests work when not logged in
|
2017-06-12 17:49:33 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |