yflory
|
5a48cba999
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
684269fdda
|
Userlist in polls
|
8 years ago |
|
ansuz
|
35bfa1dce4
|
test client-side templates in whiteboard app
|
8 years ago |
|
yflory
|
a11befaa0f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
8 years ago |
|
ansuz
|
852c028822
|
don't allow editing if pad type is wrong
|
8 years ago |
|
yflory
|
92b6e60573
|
Small improvements for the new toolbar
|
8 years ago |
|
ansuz
|
eddfb936f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
115813c191
|
Merge branch 'new-templates' into staging
|
8 years ago |
|
ansuz
|
3657e978fd
|
give main2.js a more sensible name
|
8 years ago |
|
ansuz
|
118b83c420
|
make register and login user clientside templates
|
8 years ago |
|
ansuz
|
ab54dcf84d
|
make libs pass jshint
|
8 years ago |
|
yflory
|
8d956c3de6
|
New toolbar
|
8 years ago |
|
ansuz
|
48f9745619
|
clientside templating
|
8 years ago |
|
yflory
|
503e9de07c
|
Lint errors
|
8 years ago |
|
yflory
|
b7a0547b77
|
New toolbar colors
|
8 years ago |
|
yflory
|
3052ec8abb
|
Merge branch 'newCk' into staging
|
8 years ago |
|
yflory
|
c3f636851a
|
Fix path size width in drive
|
8 years ago |
|
yflory
|
c22f610d5c
|
Fix the drive integrity check
|
8 years ago |
|
yflory
|
fb388f2610
|
Fix an issue with invalid drive before migration
|
8 years ago |
|
yflory
|
59fb5bd8be
|
One toolbar color per app
|
8 years ago |
|
yflory
|
5a248db267
|
Merge branch 'staging' into newCk
|
8 years ago |
|
yflory
|
728272d936
|
Fix undefined function
|
8 years ago |
|
yflory
|
f13d23241c
|
Upgrade CkEditor to version 4.7
|
8 years ago |
|
ansuz
|
d822dfe37a
|
add forget button to file app
|
8 years ago |
|
ansuz
|
7fd36a72f3
|
re-add download button for file app
|
8 years ago |
|
ansuz
|
f02a381e32
|
avoid horizontal scrollbars
|
8 years ago |
|
ansuz
|
cc5d5d4f1d
|
make pdfs in file app big
|
8 years ago |
|
yflory
|
dbfad9d227
|
Lint
|
8 years ago |
|
yflory
|
91d46cdee4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
d3b9ac2511
|
Update the preview and present content on Ready in slides
|
8 years ago |
|
ansuz
|
5fd4870b8b
|
Merge pull request #138 from pbondoer/staging
Fix poll auto-focus inputs
|
8 years ago |
|
Pierre Bondoerffer
|
626e54d7b5
|
Fix poll auto-focus inputs
|
8 years ago |
|
yflory
|
54adb680e7
|
Hide the slide number in the title outside of present mode
|
8 years ago |
|
ansuz
|
17838f1d70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
1b66383bac
|
don't create color-picker if readonly
|
8 years ago |
|
yflory
|
a38819f5b9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
1ad1b78c64
|
Fix the history mode with readOnly and old URLs
|
8 years ago |
|
ansuz
|
b2a70f86d3
|
disallow concurrent logins
|
8 years ago |
|
ansuz
|
35e0de463b
|
disallow concurrent scrypt cycles
|
8 years ago |
|
ansuz
|
06ca70d11e
|
lint compliance
|
8 years ago |
|
ansuz
|
f29f430e7c
|
better handling of non-rpc messages
|
8 years ago |
|
yflory
|
f1aef66fc9
|
Fix the drive history
|
8 years ago |
|
yflory
|
008c417111
|
Context menu was not hidden after a click in the drive
|
8 years ago |
|
yflory
|
377a90961b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
e40f43bd20
|
Migrated pads were not displayed instantly in the drive
|
8 years ago |
|
ansuz
|
44b8bc7b7d
|
make context menus unselectable
|
8 years ago |
|
yflory
|
928dadcf77
|
Fix toolbar dropdown menus not visible in slide
|
8 years ago |
|
yflory
|
1df11f2813
|
Update the font-size when entering/leaving present mode
|
8 years ago |
|
yflory
|
66d8c0ed11
|
Add a preview mode to the slide app
|
8 years ago |
|
yflory
|
a5924cb803
|
Make sure the initial title is set in the userDoc when creating a new pad
|
8 years ago |
|
yflory
|
8b5f4dbd47
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
3a36040ba7
|
lint
|
8 years ago |
|
ansuz
|
0e9ebddf11
|
fix the things
|
8 years ago |
|
ansuz
|
c0e2c1060e
|
don't reload when slide hash changes
|
8 years ago |
|
yflory
|
24c14ffbf3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
5bfd8470cb
|
Display the file size before downloading it
|
8 years ago |
|
ansuz
|
3f85471ab3
|
update footer and package.json for upcoming version
|
8 years ago |
|
yflory
|
594405de73
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
cbe21959b4
|
Update UI for the file/media app
|
8 years ago |
|
ansuz
|
06eceed8b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
17146d7af9
|
send feedback for uploads
|
8 years ago |
|
yflory
|
c2c04bd5d8
|
Lint
|
8 years ago |
|
yflory
|
2068a8b85b
|
Embed the mediatag library in the file app
|
8 years ago |
|
yflory
|
cd5705b3f3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
1e9bc89855
|
Fix drive icons when the name contains a long word
|
8 years ago |
|
ansuz
|
5ce453afa0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
e73e32ab3a
|
fix too-tall download button
|
8 years ago |
|
yflory
|
927f6404b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
66b076111e
|
Add an upload button to the slide's file picker
|
8 years ago |
|
ansuz
|
c2e5ef7048
|
better sizing for videos
|
8 years ago |
|
ansuz
|
c717d01714
|
fix pdf height
|
8 years ago |
|
ansuz
|
b480346f5b
|
more efficient media-tag
|
8 years ago |
|
ansuz
|
0d47e68d3e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
0eb50b8b6c
|
drop pdf.js dependency
|
8 years ago |
|
yflory
|
f3f1cf9e6d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a237eec41e
|
Add a file picker in the slide app
|
8 years ago |
|
ansuz
|
20874c76f1
|
prevent code blocks from overflowing slides
|
8 years ago |
|
yflory
|
a4f45caebb
|
Lint
|
8 years ago |
|
yflory
|
0a4e876139
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
8738b42861
|
Update the drive UI to show that Upload and New are linked to a folder
|
8 years ago |
|
ansuz
|
d25a0893cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
3184e5d235
|
don't reload page on hash mode change
|
8 years ago |
|
yflory
|
1077b3b267
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a98353af6c
|
Add a button to upload a file in the drive
|
8 years ago |
|
ansuz
|
295f9c00a6
|
send feedback on buttons
|
8 years ago |
|
ansuz
|
d5c7eb49a4
|
send feedback on toolbar hide and CKE buttons
|
8 years ago |
|
yflory
|
7e0a2abc2c
|
Fix the file name when restoring an element from the trash
|
8 years ago |
|
yflory
|
5b523be171
|
Fix drag&drop for pads in the drive
|
8 years ago |
|
yflory
|
e51f678bb9
|
Don't display the popup whne moving a file to the trash
|
8 years ago |
|
yflory
|
497ddeee6d
|
Upload files with drag&drop in the drive
|
8 years ago |
|
ansuz
|
687b4d8307
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
69c3bd392f
|
update built media tag to latest XWiki version
|
8 years ago |
|
yflory
|
494b44e2b1
|
fix lint errors
|
8 years ago |
|
yflory
|
d8ebe566d8
|
Don't call mediatag for non-image files
|
8 years ago |
|
yflory
|
37d3d04f0e
|
Clean mediatag integration code
|
8 years ago |
|
ansuz
|
802146e2af
|
don't put download buttons in a div
|
8 years ago |
|
yflory
|
19cb920a7c
|
Don't redraw a media-tag everytime the content has changed
|
8 years ago |
|
yflory
|
2032c08066
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
f9c26645cf
|
Upload images using the slide app
|
8 years ago |