ansuz
|
be7e7fec43
|
don't bypass warnings when registering
|
8 years ago |
|
yflory
|
cab595f959
|
Fix duplicate folders in the drive
|
8 years ago |
|
ansuz
|
42375190e6
|
style buttons for long titles
|
8 years ago |
|
ansuz
|
c27c140130
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
ac8da0d52d
|
load codemirror in the correct context. fix selection events
|
8 years ago |
|
yflory
|
789274fd4f
|
Fix font-size in slides
|
8 years ago |
|
ansuz
|
7377d39b39
|
hide print button
|
8 years ago |
|
ansuz
|
43b877ad27
|
fix styling on media tag download button
|
8 years ago |
|
ansuz
|
1fd0ba488a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
04a28433ae
|
replace inner content of media tag download buttons
|
8 years ago |
|
ansuz
|
f85af7ef4c
|
hide useless messages
|
8 years ago |
|
ansuz
|
a59853f9c2
|
use new media tag
|
8 years ago |
|
yflory
|
8cf694bea6
|
Lint
|
8 years ago |
|
yflory
|
47c6c64b8a
|
Allow emojis in default avatars
|
8 years ago |
|
yflory
|
ffd184d50e
|
Fix overflowing names in the new userlist
|
8 years ago |
|
ansuz
|
92d88d1644
|
don't change allowed media types until we have media-tag scoping
|
8 years ago |
|
ansuz
|
678986dac4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
fa2d857d70
|
Fix css issues with Safari
|
8 years ago |
|
ansuz
|
efedfe0667
|
show preview pane by default in /slide/
|
8 years ago |
|
yflory
|
81c8949aee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
1df5e6e855
|
Fix toolbar buttons for Safari
|
8 years ago |
|
ansuz
|
8b0210baf1
|
hide useless error
|
8 years ago |
|
yflory
|
991cb896bd
|
Fix avatar in /pad
|
8 years ago |
|
yflory
|
70c9f3df75
|
Fix avatar size
|
8 years ago |
|
ansuz
|
f09ae9b19c
|
jshint compliance
|
8 years ago |
|
ansuz
|
4a9a564913
|
don't try to handle error thta never happens anymore
|
8 years ago |
|
ansuz
|
b15aa3360a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
6ac056e314
|
make explicit file size RPCs unauthenticated
|
8 years ago |
|
yflory
|
9b131dc49c
|
Fix CSS in the slide app
|
8 years ago |
|
yflory
|
5694505719
|
Fix syntax highlighting
|
8 years ago |
|
yflory
|
335898a4c7
|
Hack the drawer to close it when clicking outside
|
8 years ago |
|
yflory
|
472a62730b
|
Fix profile creation and add a link to the profile app
|
8 years ago |
|
yflory
|
f357ec32c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
b153dda6ff
|
Add avatars in the user list
|
8 years ago |
|
ansuz
|
c2e153e8ed
|
more fouc fixes
|
8 years ago |
|
yflory
|
555d0a09f8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
568ce70afd
|
Add a spinner for the history and update history buttons
|
8 years ago |
|
Caleb James DeLisle
|
2144587919
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
Caleb James DeLisle
|
c25f2df721
|
Added caching versions to some of the images which are loaded by js
|
8 years ago |
|
yflory
|
4ab82710ab
|
Remove the background color from the text-color button in the slide app
|
8 years ago |
|
yflory
|
7e69d051c4
|
Lint errors
|
8 years ago |
|
yflory
|
26193aeaa7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
8 years ago |
|
ansuz
|
9e91739044
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
ecff05425f
|
feedback for slide printing
|
8 years ago |
|
ansuz
|
75c2a1fd73
|
jshint compliance
|
8 years ago |
|
ansuz
|
b8934c0b97
|
smarter redraws of drive/settings usage bar
|
8 years ago |
|
yflory
|
5a3e9c785c
|
Fix ckeditor toolbar
|
8 years ago |
|
yflory
|
cc5b7615ad
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
ed0121d172
|
Lint errors
|
8 years ago |
|
yflory
|
8abc94d37b
|
Replace folder images in the drive
|
8 years ago |
|
ansuz
|
b7cb1a8d5f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
8279ef3130
|
Fix conflict between ckeditor toolbar and userlist on small screens
|
8 years ago |
|
ansuz
|
b037cfbfdb
|
set usage tips relative to bottom of screen, not top
|
8 years ago |
|
ansuz
|
1763cf72d1
|
tell anonymous users they can't upload
|
8 years ago |
|
yflory
|
7a87775372
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
45f180955b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
8 years ago |
|
ansuz
|
1179992a90
|
update feedback key name
|
8 years ago |
|
ansuz
|
4a5f5de78c
|
restore missing stylesheet for poll
|
8 years ago |
|
ansuz
|
bbf9916a91
|
fixes for file app
|
8 years ago |
|
ansuz
|
39149a052b
|
add new feedback keys
|
8 years ago |
|
ansuz
|
7a5c5ce0a3
|
load scripts asynchronously
|
8 years ago |
|
ansuz
|
9b8866ed72
|
handle RPC_NOT_READY error for logged out users
|
8 years ago |
|
ansuz
|
a9f8f42e3c
|
use minified less compiler
|
8 years ago |
|
ansuz
|
fca1ef4d36
|
hide unstyled content until the loading screen is displayed
|
8 years ago |
|
yflory
|
877c5a8d0e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
19ff8a345d
|
Avatar upload in the profile app
|
8 years ago |
|
ansuz
|
5e56ad912e
|
remove the last bit of compiled css
|
8 years ago |
|
ansuz
|
7a7307d560
|
fix logging when resetting
|
8 years ago |
|
yflory
|
6c94605b9b
|
File upload in the profile
|
8 years ago |
|
ansuz
|
7439bbaba2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
ed45814020
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
cfc5907237
|
remove unnecessary style rules
|
8 years ago |
|
yflory
|
85d8eda847
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
176e47f394
|
Add the profile app
|
8 years ago |
|
ansuz
|
1c1869a22c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
8 years ago |
|
ansuz
|
f232675cc9
|
create a favicon if it does not already exist
|
8 years ago |
|
ansuz
|
3be6433fdf
|
send feedback on name changes
|
8 years ago |
|
ansuz
|
bdca6b10c2
|
use templates in poll.js
|
8 years ago |
|
ansuz
|
bb74935b08
|
allow pin limit caching to occur at api level
|
8 years ago |
|
yflory
|
00a554ca0d
|
Fix the donate button style with the new toolbar
|
8 years ago |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
8 years ago |
|
ansuz
|
67a096a8a4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
7b37146034
|
don't let spacebar keyups propagate outside of the title
|
8 years ago |
|
ansuz
|
9195c0cd12
|
is isOverPinLimit in toolbar
|
8 years ago |
|
ansuz
|
fce0a37f50
|
cache pin data once retrieved from the server
|
8 years ago |
|
yflory
|
8f2db44793
|
Remove getTitle from the file app
|
8 years ago |
|
yflory
|
33ea8cb183
|
Make sure we don't call both the yes and no handlers in prompts
|
8 years ago |
|
yflory
|
3076ade23a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
8 years ago |
|
ansuz
|
51e06e68a7
|
don't change slides when navigating through history
|
8 years ago |
|
ansuz
|
ffcbde4325
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
48ece55ed5
|
style fixes, and dynamic less compilation
|
8 years ago |
|
yflory
|
38f568635d
|
Fix duplicate media-tag in slides when adding or removing a slide
|
8 years ago |
|
yflory
|
ce44a8d351
|
Fix the backup button in anonymous drive
|
8 years ago |
|
yflory
|
06a0590f73
|
New folder icons
|
8 years ago |
|
yflory
|
cc341ca6d4
|
Lint error
|
8 years ago |
|
yflory
|
0d4d104e08
|
Mobile support for the new toolbar
|
8 years ago |
|
ansuz
|
b4b851959f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
61a891267f
|
more feedback
|
8 years ago |
|
yflory
|
c1d2fa6b52
|
Unhack validateKey for the history mode
|
8 years ago |
|
yflory
|
90cc3e6a5e
|
New userlist in the whiteboard app
|
8 years ago |
|
yflory
|
2710279904
|
Use the new share button in the file app
|
8 years ago |
|
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 |
|
ansuz
|
17e4e9be27
|
download anything that isn't an image in media-tag
|
8 years ago |
|
ansuz
|
8a599eb9b1
|
Merge pull request #136 from blumeva/staging
change minimum opacity
|
8 years ago |
|
XWiki SAS
|
fc9ecb0f7c
|
change minimum opacity
|
8 years ago |
|
ansuz
|
ea79294494
|
Merge pull request #134 from pbondoer/newpoll
More poll improvements
|
8 years ago |
|
ansuz
|
88c2c0afde
|
Merge pull request #135 from blumeva/staging
Staging
|
8 years ago |
|
XWiki SAS
|
74c9b663dd
|
changing whiteboard
|
8 years ago |
|
XWiki SAS
|
40cf7ea107
|
change whiteboard
|
8 years ago |
|
ansuz
|
1b574da053
|
fix typo
|
8 years ago |
|
ansuz
|
7ad89bd9af
|
don't interrupt boot because of localStorage failure
|
8 years ago |
|
ansuz
|
3337e2133a
|
more thorough tests for localStorage presence
|
8 years ago |
|
yflory
|
a57f8679c5
|
Fix a race condition in the file app
|
8 years ago |
|
yflory
|
4eeea93265
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
11e2226f1a
|
Fix lint errors
|
8 years ago |
|
ansuz
|
c779e328e8
|
warn users if their browser does not support localStorage
|
8 years ago |
|
yflory
|
d7292e69c6
|
Fix undefined variable
|
8 years ago |
|
ansuz
|
d367f71760
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
c70eb73d52
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
803bad1421
|
Move the file upload code in a separate file
|
8 years ago |
|
Pierre Bondoerffer
|
d344f03778
|
proper button text
|
8 years ago |
|
Pierre Bondoerffer
|
2b5339193c
|
bring admin back
|
8 years ago |
|
Pierre Bondoerffer
|
b2eef94232
|
use numbers, not strings
|
8 years ago |
|
Pierre Bondoerffer
|
848010842f
|
dont sanity check silently
|
8 years ago |
|
Pierre Bondoerffer
|
56f2c46c75
|
document a line
|
8 years ago |
|
Pierre Bondoerffer
|
cd1c957929
|
NaN safety
|
8 years ago |
|
Pierre Bondoerffer
|
0118fdbd00
|
use a local variable
|
8 years ago |
|
XWiki SAS
|
49370764c1
|
change whiteboard translation
|
8 years ago |
|
Pierre Bondoerffer
|
b8e394db67
|
poll: Implement multiple choices
|
8 years ago |
|
yflory
|
a58162a617
|
Make the drive tests work when not logged in
|
8 years ago |
|
XWiki SAS
|
c702313489
|
change label texte
|
8 years ago |
|
yflory
|
2fb5e3ae35
|
Merge branch 'staging' into newToolbar
|
8 years ago |
|
yflory
|
969cec5d60
|
Make sure everything is synced before migrating the drive
|
8 years ago |
|
yflory
|
7dd9ed543a
|
Merge branch 'newDrive' into staging
|
8 years ago |
|
yflory
|
376b60c21c
|
New toolbar temp
|
8 years ago |
|
yflory
|
9c5bade83e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
d1f4617419
|
Fix a race condition causing the preview part to be empty
|
8 years ago |
|
ansuz
|
c9725af508
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
db9b9547d9
|
don't complain about missing callbacks for messages which are not our responsibility
|
8 years ago |
|
Pierre Bondoerffer
|
685b352db8
|
poll: Add show help button
|
8 years ago |
|
yflory
|
30bdb9881c
|
Fix undefined element in select dropdown menus
|
8 years ago |
|
yflory
|
298e34a9de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
8 years ago |
|
Pierre Bondoerffer
|
5d565660a9
|
tiny fixes
|
8 years ago |
|
Pierre Bondoerffer
|
6bc191725f
|
poll: support disconnect and fix trash button
|
8 years ago |
|
ansuz
|
b3221c0fb4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
0c957989d2
|
add link to upload table when complete
|
8 years ago |
|
yflory
|
5d6a0dcc1b
|
Fix width transition when dragging preview
|
8 years ago |
|
Pierre Bondoerffer
|
6dd80c26b1
|
Make editing more visible
|
8 years ago |
|
yflory
|
3ff3eac283
|
Fix a race condition causing the drive to be empty
|
8 years ago |
|
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
1b671edce9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
9a4a6e9b40
|
Always display the upgrade button in the drive
|
8 years ago |
|
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
7134b00544
|
Add a button to display the context menu for the trash on mobiles
|
8 years ago |
|
yflory
|
d24458e4b0
|
Fix the tests to work with the async migration
|
8 years ago |
|
yflory
|
a57f7c6ce7
|
Fix lint errors
|
8 years ago |
|
ansuz
|
4bcad3e154
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
47857ec382
|
use cached pinned usage data
|
8 years ago |
|
yflory
|
75c3c10b20
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
c1402fbb0a
|
Lint error
|
8 years ago |
|
yflory
|
b36484931d
|
Lint
|
8 years ago |
|
yflory
|
1fb638f519
|
clean the code
|
8 years ago |
|
yflory
|
9d758a040b
|
Fix an issue with the search field not displayed properly
|
8 years ago |
|
ansuz
|
08902c0910
|
drop extraneous argument
|
8 years ago |
|
ansuz
|
23318357a6
|
make fewer RPC calls for usageBar
|
8 years ago |
|
ansuz
|
df586a223c
|
update limits, usage, plan, and note whenever they are checked
|
8 years ago |
|
ansuz
|
8bad0c556e
|
change log to error
|
8 years ago |
|
ansuz
|
b0e00d337e
|
more careful validation
|
8 years ago |
|
yflory
|
fd88162624
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
7c9e86e351
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
9694272083
|
Fix html code not parsed
|
8 years ago |
|
yflory
|
9ca10ba524
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
7f120c8fc1
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
78e6118153
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
444c41974e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
df5cbfb53e
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
8 years ago |
|
yflory
|
6a96aa6819
|
Disconnect the network when migrating the drive in another tab
|
8 years ago |
|
yflory
|
2a94bdaf05
|
test
|
8 years ago |
|
yflory
|
ca95b5c42b
|
Remove unused console.log
|
8 years ago |
|
yflory
|
f8c69573fd
|
Disconnect other tabs when migrating the drive
|
8 years ago |
|
ansuz
|
c4e5741ae0
|
update upgrade button logic
|
8 years ago |
|
ansuz
|
f1a9002417
|
use upgradeURL with usage bar
|
8 years ago |
|
yflory
|
51e0d40572
|
Make sure the old storage key is removed after migration
|
8 years ago |
|
yflory
|
b0fe04381d
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
ansuz
|
fe2fef5e4c
|
support dragging and dropping multiple files
|
8 years ago |
|
yflory
|
1c2ea04f11
|
Drive refactoring
|
8 years ago |
|
ansuz
|
fe42f5e88c
|
ask for new cookies and resend commands on NO_COOKIE errors
|
8 years ago |
|
ansuz
|
e723228060
|
always show upgrade button in drive
|
8 years ago |
|
ansuz
|
da533b106a
|
improve type checking in getFileSize
|
8 years ago |
|
ansuz
|
2f851ab97e
|
fix lint errors
|
8 years ago |
|
ansuz
|
d25477e8c6
|
don't let tooltips interfere with DOM interaction
|
8 years ago |
|
yflory
|
811d031ffd
|
Fix the 'File' entry in the drive 'New' menu
|
8 years ago |
|
yflory
|
5641a4a839
|
Add the file app in the 'new' dropdown menus
|
8 years ago |
|
yflory
|
ac91d2f413
|
Fix the upgrade and donate buttons in the home page
|
8 years ago |
|
yflory
|
ee57458158
|
Remove the pin limit alert
|
8 years ago |
|
ansuz
|
f43132a63b
|
bump version in footer and package.json
|
8 years ago |
|
ansuz
|
ec9a4dec5e
|
Merge branch 'soon' into staging
|
8 years ago |
|
ansuz
|
77d4ffba86
|
animate preview mode sidebar
|
8 years ago |
|
ansuz
|
65233c2464
|
remove unused variable
|
8 years ago |
|
ansuz
|
767793b5ca
|
fix stuck loading tip
|
8 years ago |
|
ansuz
|
8f7aaecc1c
|
cache some selectors and decrease memory demands
|
8 years ago |
|
ansuz
|
f631973f1f
|
optimize file upload
|
8 years ago |
|
ansuz
|
55af84cc90
|
lower spinner timeout interval
|
8 years ago |
|
ansuz
|
c65ca5cfc6
|
restore deleted line and add missing semicolon
|
8 years ago |
|
ansuz
|
8bd9ad8847
|
add automated registration test
|
8 years ago |
|
ansuz
|
07279c8dc7
|
export boolean Test.testing
|
8 years ago |
|
Caleb James DeLisle
|
c8bd1bb2ac
|
Trying to improve the tests which fail always when running remotely
|
8 years ago |
|
Caleb James DeLisle
|
71bd808e4f
|
Send everything through the test global function
|
8 years ago |
|
Caleb James DeLisle
|
244bd7b378
|
;;;
|
8 years ago |
|
Caleb James DeLisle
|
7d557df74b
|
a new and more horrible way of sniffing the logs out of the instance
|
8 years ago |
|
Caleb James DeLisle
|
0d4b74cfba
|
;;;;;; keep these ;;; for later ;;;;;
|
8 years ago |
|
Caleb James DeLisle
|
24f37ea414
|
Delicious testing
|
8 years ago |
|
ansuz
|
5e57578fa9
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
|
ansuz
|
30f66ab7ba
|
hotfix 'undefined/' bug
|
8 years ago |
|
ansuz
|
7b94106bac
|
fix inverted conditional :/
|
8 years ago |
|
ansuz
|
2e03485db4
|
remove known bad entries from localStorage.userHash...
|
8 years ago |
|
ansuz
|
936bf8df9d
|
return falsey if userHash is junk
|
8 years ago |
|
ansuz
|
105e5cdac9
|
fix 'undefined/' userHash
|
8 years ago |
|
ansuz
|
401e908963
|
use media-tag with xhr error handling
|
8 years ago |
|
ansuz
|
3465710237
|
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
|
8 years ago |
|
Daniel RADEAU
|
8ab9248a78
|
Fix ES6
|
8 years ago |
|
Daniel RADEAU
|
21c39572be
|
Update media-tag and fix bower dependencies
|
8 years ago |
|
ansuz
|
daf112a5b5
|
take api settings into account for upgrade button
|
8 years ago |
|
ansuz
|
ebfa228bc0
|
add upgrade button to all static pages
|
8 years ago |
|
ansuz
|
149568689a
|
color donate button green
|
8 years ago |
|
ansuz
|
ec6ad6772b
|
send feedback on donation
|
8 years ago |
|
Daniel RADEAU
|
cb2efe138b
|
Media Tag integration, image, audio, video, pdf
|
8 years ago |
|
ansuz
|
76c530037b
|
enable donate button in all apps
|
8 years ago |
|
ansuz
|
9ca5bc507e
|
add support for donate button
|
8 years ago |
|
ansuz
|
a70014dd11
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
99a44f119f
|
don't send referrer headers on pads which may link outward
|
8 years ago |
|
ansuz
|
92a7970eb8
|
fix merge conflicts
|
8 years ago |
|
ansuz
|
1240b864ef
|
fix misconfigured history
|
8 years ago |
|
Pierre Bondoerffer
|
f434f002c4
|
poll: make locks clickable
|
8 years ago |
|
ansuz
|
3915b30055
|
provide a register button on login
also direct users from file to login
|
8 years ago |
|
Pierre Bondoerffer
|
b6bb576a34
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
|
8 years ago |
|
Caleb James DeLisle
|
66520b6041
|
cleaned up the accounts, limits and revenue sharing and unified the config in one place
|
8 years ago |
|
Pierre Bondoerffer
|
1092285a68
|
merge master
|
8 years ago |
|
Caleb James DeLisle
|
6c1861dbc6
|
Merge branch 'soon' into staging
|
8 years ago |
|
Caleb James DeLisle
|
2ecf257fcd
|
Sync localStorage with sessionStorage in auth because safari...
|
8 years ago |
|
ansuz
|
3f3d64992d
|
resolve merge conflicts
|
8 years ago |
|
ansuz
|
57017c68fa
|
hacks for cross-domain safari
|
8 years ago |
|
ansuz
|
cf658c1b3a
|
backport live changes
|
8 years ago |
|
ansuz
|
a04f179d8b
|
hide preview mode on phones
|
8 years ago |
|
yflory
|
df2b00122a
|
New drive structure without file names
|
8 years ago |
|
ansuz
|
dc2b0ae6b4
|
jshint compliance
|
8 years ago |