Commit graph

2726 commits

Author SHA1 Message Date
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
ansuz
3f85471ab3 update footer and package.json for upcoming version 2017-06-15 16:13:33 +02:00
yflory
594405de73 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 15:36:23 +02:00
yflory
cbe21959b4 Update UI for the file/media app 2017-06-15 15:35:52 +02:00
ansuz
06eceed8b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 15:34:22 +02:00
ansuz
17146d7af9 send feedback for uploads 2017-06-15 15:34:13 +02:00
yflory
c2c04bd5d8 Lint 2017-06-15 15:02:31 +02:00
yflory
7f25c9a8e1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 14:58:24 +02:00
yflory
2068a8b85b Embed the mediatag library in the file app 2017-06-15 14:58:18 +02:00
Caleb James DeLisle
7bee2ba27d Add a semicolon at the end of the CSP if none exists. 2017-06-15 14:45:01 +02:00
ansuz
2a262555ed add suggested CSP types for media tags 2017-06-15 14:42:27 +02:00
yflory
cd5705b3f3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 13:54:09 +02:00
yflory
1e9bc89855 Fix drive icons when the name contains a long word 2017-06-15 13:54:02 +02:00
ansuz
5ce453afa0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 13:51:11 +02:00
ansuz
e73e32ab3a fix too-tall download button 2017-06-15 13:43:32 +02:00
yflory
927f6404b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 13:35:07 +02:00
yflory
66b076111e Add an upload button to the slide's file picker 2017-06-15 12:32:44 +02:00
ansuz
c2e5ef7048 better sizing for videos 2017-06-15 12:11:39 +02:00
ansuz
c717d01714 fix pdf height 2017-06-15 12:06:53 +02:00
ansuz
b480346f5b more efficient media-tag 2017-06-15 12:05:25 +02:00
ansuz
0d47e68d3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 11:19:24 +02:00
ansuz
0eb50b8b6c drop pdf.js dependency 2017-06-15 11:19:06 +02:00
yflory
f3f1cf9e6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 11:05:07 +02:00
yflory
a237eec41e Add a file picker in the slide app 2017-06-15 11:04:58 +02:00
ansuz
20874c76f1 prevent code blocks from overflowing slides 2017-06-14 18:56:44 +02:00
yflory
a4f45caebb Lint 2017-06-14 18:25:54 +02:00