yflory
|
8f2db44793
|
Remove getTitle from the file app
|
2017-06-26 16:38:59 +02:00 |
|
yflory
|
33ea8cb183
|
Make sure we don't call both the yes and no handlers in prompts
|
2017-06-26 16:23:55 +02:00 |
|
yflory
|
3076ade23a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-26 15:16:45 +02:00 |
|
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
2017-06-26 15:16:17 +02:00 |
|
ansuz
|
51e06e68a7
|
don't change slides when navigating through history
|
2017-06-26 14:40:48 +02:00 |
|
ansuz
|
ffcbde4325
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-26 14:32:42 +02:00 |
|
ansuz
|
48ece55ed5
|
style fixes, and dynamic less compilation
|
2017-06-26 14:32:37 +02:00 |
|
yflory
|
38f568635d
|
Fix duplicate media-tag in slides when adding or removing a slide
|
2017-06-26 14:08:14 +02:00 |
|
yflory
|
ce44a8d351
|
Fix the backup button in anonymous drive
|
2017-06-23 18:02:36 +02:00 |
|
yflory
|
06a0590f73
|
New folder icons
|
2017-06-23 17:58:41 +02:00 |
|
yflory
|
cc341ca6d4
|
Lint error
|
2017-06-23 17:57:29 +02:00 |
|
yflory
|
0d4d104e08
|
Mobile support for the new toolbar
|
2017-06-23 17:56:14 +02:00 |
|
ansuz
|
b4b851959f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 17:42:32 +02:00 |
|
ansuz
|
61a891267f
|
more feedback
|
2017-06-22 17:42:24 +02:00 |
|
yflory
|
c1d2fa6b52
|
Unhack validateKey for the history mode
|
2017-06-22 17:35:54 +02:00 |
|
yflory
|
90cc3e6a5e
|
New userlist in the whiteboard app
|
2017-06-22 17:16:42 +02:00 |
|
yflory
|
2710279904
|
Use the new share button in the file app
|
2017-06-22 17:03:51 +02:00 |
|
yflory
|
5a48cba999
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 16:15:08 +02:00 |
|
yflory
|
684269fdda
|
Userlist in polls
|
2017-06-22 16:14:54 +02:00 |
|
ansuz
|
35bfa1dce4
|
test client-side templates in whiteboard app
|
2017-06-22 16:01:33 +02:00 |
|
yflory
|
a11befaa0f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 15:52:31 +02:00 |
|
yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
2017-06-22 15:52:25 +02:00 |
|
ansuz
|
852c028822
|
don't allow editing if pad type is wrong
|
2017-06-22 14:31:55 +02:00 |
|
yflory
|
92b6e60573
|
Small improvements for the new toolbar
|
2017-06-22 11:13:53 +02:00 |
|
ansuz
|
eddfb936f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-22 11:12:51 +02:00 |
|
ansuz
|
115813c191
|
Merge branch 'new-templates' into staging
|
2017-06-22 11:11:32 +02:00 |
|
ansuz
|
3657e978fd
|
give main2.js a more sensible name
|
2017-06-22 11:06:11 +02:00 |
|
ansuz
|
118b83c420
|
make register and login user clientside templates
|
2017-06-22 10:04:46 +02:00 |
|
ansuz
|
ab54dcf84d
|
make libs pass jshint
|
2017-06-22 10:03:58 +02:00 |
|
yflory
|
8d956c3de6
|
New toolbar
|
2017-06-21 18:04:35 +02:00 |
|
ansuz
|
48f9745619
|
clientside templating
|
2017-06-21 18:02:38 +02:00 |
|
yflory
|
503e9de07c
|
Lint errors
|
2017-06-20 18:00:57 +02:00 |
|
yflory
|
b7a0547b77
|
New toolbar colors
|
2017-06-20 17:59:11 +02:00 |
|
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
|
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
|
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 |
|
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 |
|
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 |