Commit graph

2753 commits

Author SHA1 Message Date
yflory
3052ec8abb Merge branch 'newCk' into staging 2017-06-20 14:57:19 +02:00
yflory
c3f636851a Fix path size width in drive 2017-06-20 14:56:15 +02:00
yflory
c22f610d5c Fix the drive integrity check 2017-06-20 12:59:44 +02:00
yflory
fb388f2610 Fix an issue with invalid drive before migration 2017-06-20 12:42:30 +02:00
yflory
59fb5bd8be One toolbar color per app 2017-06-20 12:33:50 +02:00
yflory
5a248db267 Merge branch 'staging' into newCk 2017-06-20 10:57:40 +02:00
yflory
728272d936 Fix undefined function 2017-06-20 10:29:03 +02:00
yflory
f13d23241c Upgrade CkEditor to version 4.7 2017-06-20 10:03:13 +02:00
ansuz
9be23be5eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 18:09:57 +02:00
ansuz
b80d7513aa skip over the terms of service link 2017-06-19 18:03:39 +02:00
yflory
1275f3f3a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 17:59:18 +02:00
yflory
f5da7ae42e Add a new loading tip in french 2017-06-19 17:59:12 +02:00
ansuz
e2ff88e4c4 tooltips for file upload 2017-06-19 17:56:19 +02:00
ansuz
d822dfe37a add forget button to file app 2017-06-19 17:44:30 +02:00
ansuz
7fd36a72f3 re-add download button for file app 2017-06-19 17:36:22 +02:00
ansuz
f02a381e32 avoid horizontal scrollbars 2017-06-19 16:30:03 +02:00
ansuz
cc5d5d4f1d make pdfs in file app big 2017-06-19 16:13:11 +02:00
yflory
dbfad9d227 Lint 2017-06-19 16:02:27 +02:00
yflory
91d46cdee4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 15:58:26 +02:00
yflory
d3b9ac2511 Update the preview and present content on Ready in slides 2017-06-19 15:58:10 +02:00
ansuz
499087fd52 Merge pull request #137 from pbondoer/spanish
Spanish update
2017-06-19 15:37:06 +02:00
ansuz
5fd4870b8b Merge pull request #138 from pbondoer/staging
Fix poll auto-focus inputs
2017-06-19 15:36:35 +02:00
Pierre Bondoerffer
626e54d7b5
Fix poll auto-focus inputs 2017-06-19 15:30:22 +02:00
yflory
54adb680e7 Hide the slide number in the title outside of present mode 2017-06-19 15:26:27 +02:00
Pierre Bondoerffer
726302a9ee
Spanish update 2017-06-19 15:05:17 +02:00
ansuz
17838f1d70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 14:55:45 +02:00
ansuz
1b66383bac don't create color-picker if readonly 2017-06-19 14:55:34 +02:00
yflory
a38819f5b9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 14:41:38 +02:00
yflory
1ad1b78c64 Fix the history mode with readOnly and old URLs 2017-06-19 14:41:31 +02:00
ansuz
b2a70f86d3 disallow concurrent logins 2017-06-19 14:22:21 +02:00
ansuz
35e0de463b disallow concurrent scrypt cycles 2017-06-19 14:18:10 +02:00
ansuz
06ca70d11e lint compliance 2017-06-19 14:05:40 +02:00
ansuz
f29f430e7c better handling of non-rpc messages 2017-06-19 12:38:24 +02:00
yflory
f1aef66fc9 Fix the drive history 2017-06-19 12:35:45 +02:00
yflory
008c417111 Context menu was not hidden after a click in the drive 2017-06-19 12:08:53 +02:00
yflory
377a90961b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 11:53:13 +02:00
yflory
e40f43bd20 Migrated pads were not displayed instantly in the drive 2017-06-19 11:52:57 +02:00
ansuz
44b8bc7b7d make context menus unselectable 2017-06-19 11:43:24 +02:00
ansuz
335db9b4c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 11:30:25 +02:00
ansuz
e4dccd7ea8 cache blobs for a year unless you're in dev mode 2017-06-19 11:29:13 +02:00
yflory
928dadcf77 Fix toolbar dropdown menus not visible in slide 2017-06-19 10:37:01 +02:00
yflory
1df11f2813 Update the font-size when entering/leaving present mode 2017-06-19 10:26:14 +02:00
yflory
66d8c0ed11 Add a preview mode to the slide app 2017-06-16 15:11:32 +02:00
yflory
a5924cb803 Make sure the initial title is set in the userDoc when creating a new pad 2017-06-15 18:50:39 +02:00
yflory
8b5f4dbd47 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 18:36:35 +02:00
yflory
3a36040ba7 lint 2017-06-15 18:36:23 +02:00
ansuz
0e9ebddf11 fix the things 2017-06-15 18:13:24 +02:00
ansuz
c0e2c1060e don't reload when slide hash changes 2017-06-15 17:54:35 +02:00
yflory
24c14ffbf3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 16:31:09 +02:00
yflory
5bfd8470cb Display the file size before downloading it 2017-06-15 16:30:50 +02:00