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 |
|
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 |