yflory
|
555d0a09f8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 12:36:34 +02:00 |
|
yflory
|
568ce70afd
|
Add a spinner for the history and update history buttons
|
2017-06-30 12:36:21 +02:00 |
|
Caleb James DeLisle
|
2144587919
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 12:11:55 +02:00 |
|
Caleb James DeLisle
|
c25f2df721
|
Added caching versions to some of the images which are loaded by js
|
2017-06-30 12:11:44 +02:00 |
|
yflory
|
7e69d051c4
|
Lint errors
|
2017-06-30 11:46:20 +02:00 |
|
yflory
|
26193aeaa7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-30 11:42:59 +02:00 |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
2017-06-30 11:42:54 +02:00 |
|
ansuz
|
75c2a1fd73
|
jshint compliance
|
2017-06-30 11:20:56 +02:00 |
|
ansuz
|
b8934c0b97
|
smarter redraws of drive/settings usage bar
|
2017-06-30 11:20:40 +02:00 |
|
yflory
|
cc5b7615ad
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 18:05:49 +02:00 |
|
yflory
|
ed0121d172
|
Lint errors
|
2017-06-29 18:05:34 +02:00 |
|
ansuz
|
b7cb1a8d5f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 17:54:29 +02:00 |
|
yflory
|
8279ef3130
|
Fix conflict between ckeditor toolbar and userlist on small screens
|
2017-06-29 17:51:30 +02:00 |
|
ansuz
|
b037cfbfdb
|
set usage tips relative to bottom of screen, not top
|
2017-06-29 17:25:06 +02:00 |
|
ansuz
|
1763cf72d1
|
tell anonymous users they can't upload
|
2017-06-29 16:28:58 +02:00 |
|
yflory
|
7a87775372
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 15:21:09 +02:00 |
|
ansuz
|
45f180955b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-29 15:20:46 +02:00 |
|
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
2017-06-29 15:15:40 +02:00 |
|
ansuz
|
1179992a90
|
update feedback key name
|
2017-06-29 14:48:33 +02:00 |
|
ansuz
|
39149a052b
|
add new feedback keys
|
2017-06-29 14:16:20 +02:00 |
|
ansuz
|
9b8866ed72
|
handle RPC_NOT_READY error for logged out users
|
2017-06-29 11:13:48 +02:00 |
|
ansuz
|
a9f8f42e3c
|
use minified less compiler
|
2017-06-29 10:50:21 +02:00 |
|
yflory
|
877c5a8d0e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-28 17:15:42 +02:00 |
|
yflory
|
19ff8a345d
|
Avatar upload in the profile app
|
2017-06-28 16:59:35 +02:00 |
|
ansuz
|
5e56ad912e
|
remove the last bit of compiled css
|
2017-06-28 14:51:49 +02:00 |
|
ansuz
|
7a7307d560
|
fix logging when resetting
|
2017-06-28 12:08:16 +02:00 |
|
yflory
|
6c94605b9b
|
File upload in the profile
|
2017-06-28 10:59:29 +02:00 |
|
ansuz
|
1c1869a22c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-27 18:26:10 +02:00 |
|
ansuz
|
f232675cc9
|
create a favicon if it does not already exist
|
2017-06-27 18:07:03 +02:00 |
|
ansuz
|
3be6433fdf
|
send feedback on name changes
|
2017-06-27 18:06:32 +02:00 |
|
ansuz
|
bb74935b08
|
allow pin limit caching to occur at api level
|
2017-06-27 15:37:42 +02:00 |
|
yflory
|
00a554ca0d
|
Fix the donate button style with the new toolbar
|
2017-06-27 14:36:49 +02:00 |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
2017-06-27 14:25:02 +02:00 |
|
ansuz
|
67a096a8a4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-27 09:57:32 +02:00 |
|
ansuz
|
7b37146034
|
don't let spacebar keyups propagate outside of the title
|
2017-06-26 18:32:29 +02:00 |
|
ansuz
|
9195c0cd12
|
is isOverPinLimit in toolbar
|
2017-06-26 18:13:06 +02:00 |
|
ansuz
|
fce0a37f50
|
cache pin data once retrieved from the server
|
2017-06-26 17:32:31 +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 |
|
ansuz
|
51e06e68a7
|
don't change slides when navigating through history
|
2017-06-26 14:40:48 +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
|
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
|
2710279904
|
Use the new share button in the file app
|
2017-06-22 17:03:51 +02:00 |
|
yflory
|
684269fdda
|
Userlist in polls
|
2017-06-22 16:14:54 +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
|
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
|
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
|
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
|
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
|
f29f430e7c
|
better handling of non-rpc messages
|
2017-06-19 12:38:24 +02:00 |
|
yflory
|
e40f43bd20
|
Migrated pads were not displayed instantly in the drive
|
2017-06-19 11:52:57 +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 |
|
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
|
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
|
17146d7af9
|
send feedback for uploads
|
2017-06-15 15:34:13 +02:00 |
|
yflory
|
2068a8b85b
|
Embed the mediatag library in the file app
|
2017-06-15 14:58:18 +02:00 |
|
yflory
|
66b076111e
|
Add an upload button to the slide's file picker
|
2017-06-15 12:32:44 +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
|
a237eec41e
|
Add a file picker in the slide app
|
2017-06-15 11:04:58 +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 |
|
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
|
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
|
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
|
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 |