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
|
7439bbaba2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-28 10:58:24 +02:00 |
|
ansuz
|
ed45814020
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-28 10:57:49 +02:00 |
|
ansuz
|
cfc5907237
|
remove unnecessary style rules
|
2017-06-28 10:41:08 +02:00 |
|
yflory
|
85d8eda847
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-27 18:58:26 +02:00 |
|
yflory
|
176e47f394
|
Add the profile app
|
2017-06-27 18:58:20 +02:00 |
|
ansuz
|
1c1869a22c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-27 18:26:10 +02:00 |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
2017-06-27 18:17:52 +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
|
bdca6b10c2
|
use templates in poll.js
|
2017-06-27 15:38:12 +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
|
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 |
|
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 |
|
yflory
|
298e34a9de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 12:47:47 +02:00 |
|
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
2017-06-12 12:47:25 +02:00 |
|
Pierre Bondoerffer
|
5d565660a9
|
tiny fixes
|
2017-06-12 12:41:03 +02:00 |
|
Pierre Bondoerffer
|
6bc191725f
|
poll: support disconnect and fix trash button
|
2017-06-12 12:37:07 +02:00 |
|
ansuz
|
b3221c0fb4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 12:32:48 +02:00 |
|
ansuz
|
0c957989d2
|
add link to upload table when complete
|
2017-06-12 12:31:52 +02:00 |
|
yflory
|
5d6a0dcc1b
|
Fix width transition when dragging preview
|
2017-06-12 12:27:24 +02:00 |
|
Pierre Bondoerffer
|
6dd80c26b1
|
Make editing more visible
|
2017-06-12 12:00:39 +02:00 |
|
yflory
|
3ff3eac283
|
Fix a race condition causing the drive to be empty
|
2017-06-12 11:54:20 +02:00 |
|
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
2017-06-12 10:51:38 +02:00 |
|
yflory
|
1b671edce9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 10:50:30 +02:00 |
|
yflory
|
9a4a6e9b40
|
Always display the upgrade button in the drive
|
2017-06-12 10:17:52 +02:00 |
|
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
2017-06-09 17:03:01 +02:00 |
|
yflory
|
7134b00544
|
Add a button to display the context menu for the trash on mobiles
|
2017-06-09 17:02:50 +02:00 |
|
yflory
|
d24458e4b0
|
Fix the tests to work with the async migration
|
2017-06-09 16:41:51 +02:00 |
|
yflory
|
a57f7c6ce7
|
Fix lint errors
|
2017-06-09 16:39:44 +02:00 |
|
ansuz
|
4bcad3e154
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-09 16:26:36 +02:00 |
|
ansuz
|
47857ec382
|
use cached pinned usage data
|
2017-06-09 16:17:20 +02:00 |
|
yflory
|
75c3c10b20
|
Merge branch 'soon' into staging
|
2017-06-09 15:56:45 +02:00 |
|
yflory
|
c1402fbb0a
|
Lint error
|
2017-06-09 15:56:18 +02:00 |
|
yflory
|
b36484931d
|
Lint
|
2017-06-09 15:55:46 +02:00 |
|
yflory
|
1fb638f519
|
clean the code
|
2017-06-09 15:50:13 +02:00 |
|
yflory
|
9d758a040b
|
Fix an issue with the search field not displayed properly
|
2017-06-09 15:45:46 +02:00 |
|
ansuz
|
08902c0910
|
drop extraneous argument
|
2017-06-09 15:33:28 +02:00 |
|
ansuz
|
23318357a6
|
make fewer RPC calls for usageBar
|
2017-06-09 15:33:03 +02:00 |
|
ansuz
|
df586a223c
|
update limits, usage, plan, and note whenever they are checked
|
2017-06-09 15:31:43 +02:00 |
|
ansuz
|
8bad0c556e
|
change log to error
|
2017-06-09 15:29:55 +02:00 |
|
ansuz
|
b0e00d337e
|
more careful validation
|
2017-06-09 15:28:53 +02:00 |
|
yflory
|
fd88162624
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:47:37 +02:00 |
|
yflory
|
7c9e86e351
|
Merge branch 'soon' into staging
|
2017-06-09 14:47:15 +02:00 |
|
yflory
|
9694272083
|
Fix html code not parsed
|
2017-06-09 14:42:55 +02:00 |
|
yflory
|
9ca10ba524
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:40:26 +02:00 |
|
yflory
|
7f120c8fc1
|
Merge branch 'soon' into staging
|
2017-06-09 14:38:36 +02:00 |
|
yflory
|
78e6118153
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:38:21 +02:00 |
|
yflory
|
444c41974e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-09 14:37:54 +02:00 |
|
yflory
|
df5cbfb53e
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2017-06-09 14:36:38 +02:00 |
|
yflory
|
6a96aa6819
|
Disconnect the network when migrating the drive in another tab
|
2017-06-09 14:36:35 +02:00 |
|
yflory
|
2a94bdaf05
|
test
|
2017-06-09 13:41:11 +02:00 |
|
yflory
|
ca95b5c42b
|
Remove unused console.log
|
2017-06-09 12:31:07 +02:00 |
|
yflory
|
f8c69573fd
|
Disconnect other tabs when migrating the drive
|
2017-06-09 12:23:28 +02:00 |
|
ansuz
|
c4e5741ae0
|
update upgrade button logic
|
2017-06-09 12:12:39 +02:00 |
|
ansuz
|
f1a9002417
|
use upgradeURL with usage bar
|
2017-06-09 10:46:11 +02:00 |
|
yflory
|
51e0d40572
|
Make sure the old storage key is removed after migration
|
2017-06-08 18:35:20 +02:00 |
|
yflory
|
b0fe04381d
|
Merge branch 'staging' into newDrive
|
2017-06-08 18:14:31 +02:00 |
|
ansuz
|
fe2fef5e4c
|
support dragging and dropping multiple files
|
2017-06-08 18:12:17 +02:00 |
|
yflory
|
1c2ea04f11
|
Drive refactoring
|
2017-06-08 17:52:00 +02:00 |
|
ansuz
|
fe42f5e88c
|
ask for new cookies and resend commands on NO_COOKIE errors
|
2017-06-08 14:19:14 +02:00 |
|
ansuz
|
e723228060
|
always show upgrade button in drive
|
2017-06-08 14:03:01 +02:00 |
|
ansuz
|
da533b106a
|
improve type checking in getFileSize
|
2017-06-08 11:24:20 +02:00 |
|
ansuz
|
2f851ab97e
|
fix lint errors
|
2017-06-07 10:13:51 +02:00 |
|
ansuz
|
d25477e8c6
|
don't let tooltips interfere with DOM interaction
|
2017-06-06 18:08:23 +02:00 |
|
yflory
|
811d031ffd
|
Fix the 'File' entry in the drive 'New' menu
|
2017-06-06 12:09:55 +02:00 |
|
yflory
|
5641a4a839
|
Add the file app in the 'new' dropdown menus
|
2017-06-06 11:52:47 +02:00 |
|
yflory
|
ac91d2f413
|
Fix the upgrade and donate buttons in the home page
|
2017-06-06 11:37:54 +02:00 |
|
yflory
|
ee57458158
|
Remove the pin limit alert
|
2017-06-06 10:49:32 +02:00 |
|
ansuz
|
f43132a63b
|
bump version in footer and package.json
|
2017-06-06 10:01:07 +02:00 |
|
ansuz
|
ec9a4dec5e
|
Merge branch 'soon' into staging
|
2017-06-05 11:43:26 +02:00 |
|
ansuz
|
77d4ffba86
|
animate preview mode sidebar
|
2017-06-02 17:39:45 +02:00 |
|
ansuz
|
65233c2464
|
remove unused variable
|
2017-06-02 16:16:17 +02:00 |
|
ansuz
|
767793b5ca
|
fix stuck loading tip
|
2017-06-02 12:13:11 +02:00 |
|
ansuz
|
8f7aaecc1c
|
cache some selectors and decrease memory demands
|
2017-06-02 11:45:54 +02:00 |
|
ansuz
|
f631973f1f
|
optimize file upload
|
2017-06-01 18:16:02 +02:00 |
|
ansuz
|
55af84cc90
|
lower spinner timeout interval
|
2017-06-01 14:27:06 +02:00 |
|
ansuz
|
c65ca5cfc6
|
restore deleted line and add missing semicolon
|
2017-06-01 10:35:42 +02:00 |
|
ansuz
|
8bd9ad8847
|
add automated registration test
|
2017-06-01 10:23:50 +02:00 |
|
ansuz
|
07279c8dc7
|
export boolean Test.testing
|
2017-06-01 10:23:24 +02:00 |
|
Caleb James DeLisle
|
c8bd1bb2ac
|
Trying to improve the tests which fail always when running remotely
|
2017-06-01 00:29:17 +02:00 |
|
Caleb James DeLisle
|
71bd808e4f
|
Send everything through the test global function
|
2017-06-01 00:09:39 +02:00 |
|
Caleb James DeLisle
|
244bd7b378
|
;;;
|
2017-05-31 23:32:47 +02:00 |
|
Caleb James DeLisle
|
7d557df74b
|
a new and more horrible way of sniffing the logs out of the instance
|
2017-05-31 23:29:58 +02:00 |
|
Caleb James DeLisle
|
0d4b74cfba
|
;;;;;; keep these ;;; for later ;;;;;
|
2017-05-31 19:46:23 +02:00 |
|
Caleb James DeLisle
|
24f37ea414
|
Delicious testing
|
2017-05-31 19:40:17 +02:00 |
|
ansuz
|
5e57578fa9
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-31 18:44:55 +02:00 |