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 |
|
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
|
2068a8b85b
|
Embed the mediatag library in the file app
|
2017-06-15 14:58:18 +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 |
|
yflory
|
0a4e876139
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 17:52:23 +02:00 |
|
yflory
|
8738b42861
|
Update the drive UI to show that Upload and New are linked to a folder
|
2017-06-14 17:51:48 +02:00 |
|
ansuz
|
d25a0893cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 17:24:49 +02:00 |
|
ansuz
|
3184e5d235
|
don't reload page on hash mode change
|
2017-06-14 17:24:44 +02:00 |
|
yflory
|
1077b3b267
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 15:55:10 +02:00 |
|
yflory
|
a98353af6c
|
Add a button to upload a file in the drive
|
2017-06-14 15:55:03 +02:00 |
|
ansuz
|
295f9c00a6
|
send feedback on buttons
|
2017-06-14 15:36:46 +02:00 |
|
ansuz
|
d5c7eb49a4
|
send feedback on toolbar hide and CKE buttons
|
2017-06-14 15:33:12 +02:00 |
|
yflory
|
7e0a2abc2c
|
Fix the file name when restoring an element from the trash
|
2017-06-14 13:03:10 +02:00 |
|
yflory
|
5b523be171
|
Fix drag&drop for pads in the drive
|
2017-06-14 12:55:46 +02:00 |
|
yflory
|
e51f678bb9
|
Don't display the popup whne moving a file to the trash
|
2017-06-14 12:50:44 +02:00 |
|
yflory
|
497ddeee6d
|
Upload files with drag&drop in the drive
|
2017-06-14 12:47:37 +02:00 |
|
ansuz
|
687b4d8307
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 11:10:26 +02:00 |
|
ansuz
|
69c3bd392f
|
update built media tag to latest XWiki version
|
2017-06-14 11:09:51 +02:00 |
|
yflory
|
494b44e2b1
|
fix lint errors
|
2017-06-14 10:04:54 +02:00 |
|
yflory
|
d8ebe566d8
|
Don't call mediatag for non-image files
|
2017-06-13 18:38:53 +02:00 |
|
yflory
|
37d3d04f0e
|
Clean mediatag integration code
|
2017-06-13 17:57:27 +02:00 |
|
ansuz
|
802146e2af
|
don't put download buttons in a div
|
2017-06-13 17:54:15 +02:00 |
|
yflory
|
19cb920a7c
|
Don't redraw a media-tag everytime the content has changed
|
2017-06-13 17:21:22 +02:00 |
|
yflory
|
2032c08066
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-13 16:15:11 +02:00 |
|
yflory
|
f9c26645cf
|
Upload images using the slide app
|
2017-06-13 16:15:04 +02:00 |
|
ansuz
|
17e4e9be27
|
download anything that isn't an image in media-tag
|
2017-06-13 16:12:13 +02:00 |
|
ansuz
|
8a599eb9b1
|
Merge pull request #136 from blumeva/staging
change minimum opacity
|
2017-06-13 15:27:45 +02:00 |
|
XWiki SAS
|
fc9ecb0f7c
|
change minimum opacity
|
2017-06-13 15:20:16 +02:00 |
|
ansuz
|
ea79294494
|
Merge pull request #134 from pbondoer/newpoll
More poll improvements
|
2017-06-13 14:32:46 +02:00 |
|
ansuz
|
88c2c0afde
|
Merge pull request #135 from blumeva/staging
Staging
|
2017-06-13 14:23:41 +02:00 |
|
XWiki SAS
|
74c9b663dd
|
changing whiteboard
|
2017-06-13 14:14:36 +02:00 |
|
XWiki SAS
|
40cf7ea107
|
change whiteboard
|
2017-06-13 14:11:22 +02:00 |
|
ansuz
|
1b574da053
|
fix typo
|
2017-06-13 12:24:32 +02:00 |
|
ansuz
|
7ad89bd9af
|
don't interrupt boot because of localStorage failure
|
2017-06-13 12:02:36 +02:00 |
|
ansuz
|
3337e2133a
|
more thorough tests for localStorage presence
|
2017-06-13 11:57:21 +02:00 |
|
yflory
|
a57f8679c5
|
Fix a race condition in the file app
|
2017-06-13 11:45:37 +02:00 |
|
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
|
803bad1421
|
Move the file upload code in a separate file
|
2017-06-13 11:21:26 +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 |