ansuz
|
df53166b37
|
implement and use prototype curve encryptors
|
7 years ago |
|
ansuz
|
d293ba4d44
|
add support for invite hashes
|
7 years ago |
|
yflory
|
37d5b0afb9
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
8 years ago |
|
yflory
|
95e2efab89
|
Add to friend list
|
8 years ago |
|
ansuz
|
e353627204
|
log users out if they do not have curve keys. add curve keys to object on registration and login.
|
8 years ago |
|
ansuz
|
4016a95540
|
prototype invite app
|
8 years ago |
|
yflory
|
465ef74f2b
|
Fix rpc
|
8 years ago |
|
yflory
|
bf17ad3f1e
|
Friend button in the userlist
|
8 years ago |
|
yflory
|
8dc8aa27ab
|
Lint
|
8 years ago |
|
yflory
|
35e8c1a63b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
43ac71603c
|
Move pad attributes in pad data
|
8 years ago |
|
ansuz
|
9f6ecea5d9
|
fix nacl reference error in media tag
|
8 years ago |
|
yflory
|
3e802c2443
|
Fix overflowing content in profile
|
8 years ago |
|
ansuz
|
dfad622b76
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
69f4ce2abd
|
Fix middle click on the drive button
|
8 years ago |
|
ansuz
|
cbd9fc4076
|
Merge branch 'staging'
|
8 years ago |
|
ansuz
|
3fe0baa956
|
disable pin limit caching
|
8 years ago |
|
ansuz
|
9c1eaf9c1a
|
lint compliance
|
8 years ago |
|
ansuz
|
fa06f9d413
|
fix minor bugs in poll
|
8 years ago |
|
ansuz
|
90bcadd87b
|
Merge branch 'soon' into staging
|
8 years ago |
|
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 |
|
ansuz
|
b32c329269
|
remember whether you were using preview mode for a pad
|
8 years ago |
|
ansuz
|
d9f7470f06
|
copy user details into sessionStorage for safari
|
8 years ago |
|
ansuz
|
a5ffd278a7
|
write styles for code in .less
|
8 years ago |
|
ansuz
|
3803f6a20f
|
only render preview if preview container is visible
|
8 years ago |
|
ansuz
|
617e027f12
|
catch markdown preview errors
|
8 years ago |
|
ansuz
|
c5bb830757
|
don't preview if hightlight mode is not markdown
|
8 years ago |
|
ansuz
|
fd83ae3e61
|
implement createRandomInteger
|
8 years ago |
|
ansuz
|
4d9060f49e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
378bf2aa94
|
yflory's word wrap fix
|
8 years ago |
|
ansuz
|
dc80b6b11f
|
throttle markdown preview
|
8 years ago |
|
yflory
|
f5f8e148ca
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
90f5713d4a
|
Fix an issue with the search bar redirecting to incorrect location
|
8 years ago |
|
ansuz
|
97cc4a6d54
|
add styling for tables in markdown preview
|
8 years ago |
|
ansuz
|
e6c04ccb49
|
bump server after paying for an account
|
8 years ago |
|
ansuz
|
6faca87e73
|
set preview content in read only mode
|
8 years ago |
|
ansuz
|
6324d9bbb0
|
feedback on template feature usage
|
8 years ago |
|
yflory
|
c3437382fb
|
Fix the release version in the what's new popup
|
8 years ago |
|
ansuz
|
4fae1b16c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
70cae0d2c3
|
safely access pin reset response
|
8 years ago |
|
yflory
|
a50805545d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
8 years ago |
|
ansuz
|
dac9d0647d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
259d34b7c8
|
jshint compliance
|
8 years ago |
|
yflory
|
40b99e7bbf
|
Get the file name before downloading the entire file
|
8 years ago |
|
ansuz
|
6dc3c62ba4
|
check for src before trying to ajax
|
8 years ago |
|
ansuz
|
a6cf761172
|
don't store media tag pages in the drive
|
8 years ago |
|
yflory
|
90a9764fa4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
346c289204
|
Fix lint errors
|
8 years ago |
|
ansuz
|
71dc0af6c7
|
better test for success error codes
|
8 years ago |
|
ansuz
|
0b6c587e2b
|
fetch and decrypt metadata with range requests
|
8 years ago |
|
yflory
|
eb31d0323c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a99080fb74
|
push the rest of the code
|
8 years ago |
|
yflory
|
408a4dad94
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
3964f4feee
|
Display the progress when downloading a file
|
8 years ago |
|
ansuz
|
dd73ad2dd5
|
add decryptMetadata function
|
8 years ago |
|
ansuz
|
5179252d3b
|
fix merge conflicts
|
8 years ago |
|
ansuz
|
4ee42b87d4
|
make file crypto great again
|
8 years ago |
|
yflory
|
c45f08f147
|
Use a download button instead of downloading a file automatically
|
8 years ago |
|
yflory
|
0c2f84058b
|
Improve css for the file app
|
8 years ago |
|
yflory
|
9c00a730f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
538aec6ef5
|
Display a message when pinPads returns an error
|
8 years ago |
|
ansuz
|
03da870a7a
|
jshint compliance
|
8 years ago |
|
ansuz
|
af4fd3c6d3
|
resolve merge conflicts
|
8 years ago |
|
yflory
|
67a04a16ec
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
1ab6eb3c5d
|
Add a queue for multiple uploads in the file app
|
8 years ago |
|
ansuz
|
ba5ef5157e
|
show pretty representations of storage usage
|
8 years ago |
|
ansuz
|
0a54f0cf2d
|
better alignment of preview and code entry
|
8 years ago |
|
ansuz
|
e78299aed6
|
use async file decryption, listen for progress events.
|
8 years ago |
|
ansuz
|
bcd0303821
|
style /file/ with .less
|
8 years ago |
|
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
310909dc9e
|
handle new error codes
|
8 years ago |
|
yflory
|
d014fccfce
|
Fix lint error
|
8 years ago |
|
yflory
|
2082b328b4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
814c81fb13
|
Display an alert when CryptPad has a new version
|
8 years ago |
|
ansuz
|
34606ea8ba
|
use newest xwiki media-tag
|
8 years ago |
|
ansuz
|
5a83259233
|
listen for decryption errors
|
8 years ago |
|
ansuz
|
2cee9534c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
d324a054f2
|
add progress bar to file upload
|
8 years ago |
|
yflory
|
21f9e31e75
|
Add a placeholder for the user app
|
8 years ago |
|
ansuz
|
164342920e
|
fix inverted condition
|
8 years ago |
|
yflory
|
620f4dc512
|
Add translations for the markdown preview button title
|
8 years ago |
|
yflory
|
51bd41d4e8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
0bd4caeb7e
|
Add the task list code to the markdown renderer
|
8 years ago |
|
ansuz
|
d187945e94
|
jshint compliance
|
8 years ago |
|
ansuz
|
3ba94a1ba2
|
correctly set release version number
|
8 years ago |
|
yflory
|
2b60b81a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
8 years ago |
|
ansuz
|
4debec39bb
|
update footer with next release codename and corrected matrix link
|
8 years ago |
|
ansuz
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
80479fdc90
|
use rpc calls from cryptpad common
|
8 years ago |
|
ansuz
|
7befaccd88
|
move more rpc calls into pinpad
|
8 years ago |
|
yflory
|
56bcdff890
|
Add a preview of the markdown content in the code editor
|
8 years ago |
|
yflory
|
b72415b56b
|
Fix old hashes not working with the new parser
|
8 years ago |
|
yflory
|
6b7aeb9121
|
Fix the text example
|
8 years ago |
|
yflory
|
fe0f21594a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
953e7155f0
|
Send only the hostname to the accounts server
|
8 years ago |
|
ansuz
|
afef456b18
|
fix undefined reference
|
8 years ago |
|
ansuz
|
8fe0282b7b
|
jshint compliance
|
8 years ago |
|
ansuz
|
827233dcba
|
new translation keys for file upload
|
8 years ago |
|
yflory
|
834830fc4f
|
Fix the Ctrl key + click to select multiple files
|
8 years ago |
|
yflory
|
1a7c4d5ebe
|
Store the FS_hash in the user object after the merge
|
8 years ago |
|
yflory
|
87fa28180a
|
Display an upgrade button in the settings page
|
8 years ago |
|
yflory
|
c1b43db363
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
7ee6864ea4
|
Add the user menu in the login and register pages
|
8 years ago |
|
ansuz
|
1542aa96bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
dc2cdb7c08
|
Add the usage bar in the settings page
|
8 years ago |
|
ansuz
|
cc893723de
|
add some TODOs, log uploaded content so we know it's working
|
8 years ago |
|
ansuz
|
2dd04f7631
|
get limits from the server
|
8 years ago |
|
yflory
|
716245f864
|
Make all the buttons look the same
|
8 years ago |
|
yflory
|
0f37d9def7
|
Change the button font size in the toolbar
|
8 years ago |
|
yflory
|
48496416e7
|
Use the same font-size for all the toolbar buttons
|
8 years ago |
|
yflory
|
8172f117a7
|
Fix Hash.alert not a function
|
8 years ago |
|
yflory
|
0e58859393
|
Fix lint error
|
8 years ago |
|
yflory
|
771348720b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
03274c3776
|
Display an info message in the anonymous drive
|
8 years ago |
|
yflory
|
57979f6314
|
Display the public key using a href in the settings page
|
8 years ago |
|
ansuz
|
a9b670fdf5
|
don't parse trailing slash as part of encryption key in old hashes
|
8 years ago |
|
ansuz
|
9bbd3161ca
|
update tests for new API changes
|
8 years ago |
|
ansuz
|
06f3d0eefe
|
shim isArray if not exists. correctly report how often this occurs
|
8 years ago |
|
yflory
|
50d9f72b3a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
601226115b
|
New anonymous drive
|
8 years ago |
|
ansuz
|
30f6ef3f85
|
handle more response codes, use metadata
|
8 years ago |
|
ansuz
|
18d959ef16
|
handle non-200 status codes
|
8 years ago |
|
yflory
|
ed95bbb08f
|
Fix lint errors
|
8 years ago |
|
yflory
|
89a993be3c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
0f13198119
|
Move the parseHash code into parsePadUrl
|
8 years ago |
|
ansuz
|
4c4c21342d
|
don't try to decrypt nothing
|
8 years ago |
|
ansuz
|
69e933dd17
|
better error handling in file download
|
8 years ago |
|
ansuz
|
42f3a62cac
|
handle errors with XHR
|
8 years ago |
|
ansuz
|
213708d8dc
|
center media tags
|
8 years ago |
|
ansuz
|
6c68b5e6ca
|
use new media-tag, listen for decryption events
|
8 years ago |
|
ansuz
|
7dd5907ff0
|
Merge branch 'limit' into staging
|
8 years ago |
|
ansuz
|
22efde87d5
|
correctly estimate upload size
|
8 years ago |
|
ansuz
|
a993ab6616
|
use new encrypted file encoding in media-tag
|
8 years ago |
|
ansuz
|
8c49150725
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
e0293a1162
|
Merge branch 'master' into staging
|
8 years ago |
|
yflory
|
57ee7de7d4
|
Update and return the storage limit
|
8 years ago |
|
yflory
|
d3854b9774
|
Fix selection issues in the drive with Chrome
|
8 years ago |
|
yflory
|
371edff943
|
Fix an error when moving unsorted files to root in the drive
|
8 years ago |
|
yflory
|
b76dcba1d6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
733c3abefa
|
Update the upgrade button in the drive
|
8 years ago |
|
yflory
|
becba33b05
|
Scroll to the selected element in the drive
|
8 years ago |
|
yflory
|
419fb15425
|
Remember the scroll position in the drive tree
|
8 years ago |
|
yflory
|
5d0535966c
|
Center vertically slides in present mode and checkbox to disable transitions
|
8 years ago |
|
ansuz
|
5d37a50a87
|
try to estimate upload size
|
8 years ago |
|
ansuz
|
6d30d7f89f
|
strip junk bytes from base64 more safely
|
8 years ago |
|
ansuz
|
1525712deb
|
new encrypted file format
|
8 years ago |
|
ansuz
|
8f5989b6b0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
cf81b02096
|
Make sure the spinner is always centered in the loading screen
|
8 years ago |
|
yflory
|
5a21be8112
|
Improve UI on mobile
|
8 years ago |
|
ansuz
|
5aba2d4640
|
remove unused variable
|
8 years ago |
|
yflory
|
5c8586f8a3
|
Fix typo in file upload
|
8 years ago |
|
yflory
|
1e4fc5a979
|
lint
|
8 years ago |
|
yflory
|
3c4b6a89d2
|
Fix a conflict with the arrow keys and renaming a folder in the tree
|
8 years ago |
|
yflory
|
96ccb94397
|
Add the share button when a file upload is complete
|
8 years ago |
|
yflory
|
c00158d23a
|
Move code to common-history
|
8 years ago |
|
ansuz
|
97a28d3938
|
test file encryption/decryption
|
8 years ago |
|
ansuz
|
6a1c799a6e
|
support async tests
|
8 years ago |
|
ansuz
|
922e7803e9
|
remove extraneous slashes from hashes when parsing
|
8 years ago |
|
yflory
|
0f8ef2f516
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
6a8153aca3
|
Fix selection issues in the drive with Chrome
|
8 years ago |
|
yflory
|
a6c49cd65c
|
Fix undefined title in slides present mode
|
8 years ago |
|
ansuz
|
299a53ded7
|
prefer to use functions from common
|
8 years ago |
|
ansuz
|
a338b23f40
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
df47b913e3
|
fetch array buffers in cryptpad-common
|
8 years ago |
|
yflory
|
ff16084719
|
Fix lint errors
|
8 years ago |
|
yflory
|
50c8a859e6
|
Move the CodeMirror cursor code to common-codemirror
|
8 years ago |
|
yflory
|
9eb8e55cf6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
8 years ago |
|
ansuz
|
56a871cb67
|
Merge branch 'soon' into staging
|
8 years ago |
|
ansuz
|
521f99a3d6
|
support drag and drop for file upload
|
8 years ago |
|
ansuz
|
b4973b7610
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
|
ansuz
|
ae7d65c3fa
|
fix drag to select in chrome
|
8 years ago |
|
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
8 years ago |
|
yflory
|
48898c97e5
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
|
yflory
|
ce5cdce917
|
Fix an issue where the username was lost on websocket reconnect
|
8 years ago |
|
ansuz
|
1d4d4cffdb
|
correct some copypasted code
|
8 years ago |
|
ansuz
|
2b4f503aff
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
|
ansuz
|
4a104052b4
|
handle errors in file
|
8 years ago |
|
yflory
|
b818fd8a37
|
Fix 'undefined' error with the context menu
|
8 years ago |
|
yflory
|
c34c1cb07c
|
Press enter to open a folder
|
8 years ago |
|
ansuz
|
7da01d0862
|
unlist removed examples
|
8 years ago |
|
ansuz
|
ea3dc8a852
|
remove file upload test
|
8 years ago |
|
ansuz
|
42dcfb9661
|
unceremoniously kick web clients when you 'log out everywhere'
|
8 years ago |
|
yflory
|
1547063b7f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a20a319a7a
|
Fix focus issues in the CryptDrive search bar
|
8 years ago |
|
ansuz
|
36ab38f3ac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
9206d89531
|
Fix lint errors
|
8 years ago |
|
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
8 years ago |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
8 years ago |
|
ansuz
|
6471b572eb
|
correct off-by-one
|
8 years ago |
|
ansuz
|
3a338e0890
|
fix undefined reference
|
8 years ago |
|
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
8 years ago |
|
yflory
|
5a5b02b82b
|
Don't store in the drive pads without a hash
|
8 years ago |
|
ansuz
|
c07d3e6162
|
update version strings for upcoming release
|
8 years ago |
|
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
8 years ago |
|
ansuz
|
6a00d11a15
|
fix undefined reference
|
8 years ago |
|
ansuz
|
c3d1554e8c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
660cda6573
|
set title when uploading
|
8 years ago |
|
yflory
|
706120ae5b
|
Display images uploaded in the File app with the Media app
|
8 years ago |
|
yflory
|
28cb40d7ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
1b6fae4dd2
|
Update mediatag
|
8 years ago |
|
ansuz
|
a0c420af8e
|
jshint compliance
|
8 years ago |
|
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
78b11584f8
|
remove unused variables
|
8 years ago |
|
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
8 years ago |
|
ansuz
|
5739c3d973
|
blow up if you ever run out of nonce-space
|
8 years ago |
|
ansuz
|
2232518c64
|
set title after uploading
|
8 years ago |
|
ansuz
|
f644dc6c0b
|
WIP support encrypted file upload via base64 chunks
|
8 years ago |
|
ansuz
|
7573b86946
|
call back with error if an RPC is made while disconnected
|
8 years ago |
|
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
8 years ago |
|
yflory
|
cd98fc6eab
|
Increase the z-index of the select area in the drive
|
8 years ago |
|
yflory
|
80115d0071
|
Fix an 'undefined' variable error in the drive
|
8 years ago |
|
yflory
|
c9d89debba
|
Fix lint errors
|
8 years ago |
|
yflory
|
79365a7a82
|
Use the shift key to select multiple files in CryptDrive
|
8 years ago |
|
yflory
|
3262787244
|
Update the icon mode in CryptDrive
|
8 years ago |
|
yflory
|
d52e9fba43
|
Use the arrow keys to change the selection in the drive
|
8 years ago |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
8 years ago |
|
yflory
|
1d3b8188b3
|
Add mobile support in the slide app
|
8 years ago |
|
yflory
|
d2e46d1378
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
092b98d235
|
Fix the offset of the drag&select feature in the drive
|
8 years ago |
|
ansuz
|
f2672d587a
|
fix variable redefinition
|
8 years ago |
|
ansuz
|
0e7eeb285c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
8 years ago |
|
ansuz
|
cf4dee28f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
28e4ef1b13
|
WIP RPC code
|
8 years ago |
|
yflory
|
afb0061d7b
|
Fix an issue with anonymous user unable to store new pads
|
8 years ago |
|
yflory
|
56aaeea003
|
Fix the drive toolbar not displaying the displayName
|
8 years ago |
|
yflory
|
538e85c080
|
Fix the context menu in the drive flowing off the screen if too long
|
8 years ago |
|
ansuz
|
841c9ee9de
|
don't close popup dialog when hitting enter if textarea has focus
|
8 years ago |
|
ansuz
|
3fa0a73025
|
prevent using string methods on undefined variable
|
8 years ago |
|
ansuz
|
1b3ce5aa96
|
fix typo
|
8 years ago |
|
yflory
|
a51a35da70
|
Fix an issue with hashes ending with a slash
|
8 years ago |
|
yflory
|
d9b5eb8a97
|
Fix an issue with the right click triggering the select area
|
8 years ago |
|
yflory
|
ef58120819
|
Prevent multiple concurrent clicks to get the history
|
8 years ago |
|
ansuz
|
38a115d8f8
|
feedback on anonymous drive
|
8 years ago |
|
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
8 years ago |
|
yflory
|
0ee228666b
|
Replace the IRC link by the Matrix one
|
8 years ago |
|
yflory
|
c820b3485c
|
Fix function undefined when loading a template
|
8 years ago |
|
yflory
|
0ef1c14d7f
|
Fix lint errors
|
8 years ago |
|
yflory
|
fc760b4820
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
8 years ago |
|
ansuz
|
e51c7f9cf0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
e132ccf94a
|
prepare for upload
|
8 years ago |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
8 years ago |
|
yflory
|
197b366712
|
Ability to drag&select in the drive
|
8 years ago |
|
ansuz
|
e2942f959b
|
add crypto for decrypting a chunked file
|
8 years ago |
|
ansuz
|
aedc46bdaf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
8 years ago |
|
yflory
|
520dabe094
|
Remove the unsorted files category
|
8 years ago |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
8 years ago |
|
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
8 years ago |
|
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
74bcec8b31
|
programming is hard okay
|
8 years ago |
|
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
8 years ago |
|
ansuz
|
3309087277
|
send feedback if isArray is not supported
|
8 years ago |
|
ansuz
|
f196b836db
|
fix undefined reference
|
8 years ago |
|
ansuz
|
48973bccd6
|
add tests to assert for hash parsing
|
8 years ago |
|
ansuz
|
5194677443
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
c9c7d61ad1
|
Media tag viewer
|
8 years ago |
|
ansuz
|
729d1460b9
|
Merge branch 'master' into staging
|
8 years ago |
|
ansuz
|
a840fb9e85
|
add example hashes and start working on hash v2
|
8 years ago |
|
ansuz
|
d1fa68e30d
|
build UCF Media Tag
|
8 years ago |
|
ansuz
|
cc33c4abe9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a5ca461a73
|
update footer for new version
|
8 years ago |
|
yflory
|
fdd51ec18d
|
Don't remove a folder moved into unsorted or into itself
|
8 years ago |
|
ansuz
|
4b95a1da48
|
unbreak assert/translations
|
8 years ago |
|
ansuz
|
4fdc5f897e
|
only feedback migration if user had legacy store
|
8 years ago |
|
ansuz
|
218f2ff76c
|
feedback when logging in or registering
|
8 years ago |
|
yflory
|
4c3e842664
|
Fix focus issues with the history input in ckeditor
|
8 years ago |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
8 years ago |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
8 years ago |
|
ansuz
|
18e2e66b06
|
jshint compliance
|
8 years ago |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
8 years ago |
|
ansuz
|
4c0d7bf8e8
|
support multiple calls to cryptpad.ready
|
8 years ago |
|
ansuz
|
ec041c88e2
|
console.log when providing feedback
also notify server if a users browser does not support proxies
|
8 years ago |
|
ansuz
|
c51073f211
|
support batch getFileSize calls
|
8 years ago |
|
ansuz
|
1af621bfe5
|
Merge remote-tracking branch 'origin/auth' into staging
|
8 years ago |
|
ansuz
|
3afaf029cb
|
feedback about how often we migrate an old drive
|
8 years ago |
|
Caleb James DeLisle
|
0e8b55edc0
|
Added an authentication page to allow getting the user pubkey
|
8 years ago |
|
ansuz
|
df9c312b7d
|
make new text translateable
|
8 years ago |
|
ansuz
|
e8b053e48b
|
use bootloader in feedback.html
|
8 years ago |
|
ansuz
|
a6dbfcecf3
|
remove old/unused assertions
|
8 years ago |
|
ansuz
|
b658bda421
|
use bootloader to fix paths to jquery and json.sortify
|
8 years ago |
|
ansuz
|
347459781c
|
show the size of your files, if you're logged in
|
8 years ago |
|
ansuz
|
2b8579e8b7
|
add pretty-printers for byte-counts
|
8 years ago |
|
ansuz
|
2a25afae5f
|
Merge branch 'soon' into staging
|
8 years ago |
|
ansuz
|
e0ecf651e2
|
add a note about showing pinned file usage
|
8 years ago |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
8 years ago |
|
ansuz
|
da69c1822c
|
ask users to sign back if signing keys are missing
|
8 years ago |
|
Pierre Bondoerffer
|
7a05462eb3
|
Some more poll changes <3
|
8 years ago |
|
ansuz
|
107e75b287
|
remove invalid semicolon
|
8 years ago |
|
ansuz
|
821c1a3ec6
|
annotate code which we hope to be able to deprecate in the future
|
8 years ago |
|
yflory
|
43c045721c
|
Get the channel history
|
8 years ago |
|
ansuz
|
f6d6f81d55
|
send feedback when a user registers
|
8 years ago |
|
ansuz
|
deeb47c40b
|
reportAppUsage for settings
|
8 years ago |
|
Pierre Bondoerffer
|
05785e96ea
|
small color change
|
8 years ago |
|
ansuz
|
5a83759ee2
|
add usage button to settings page
|
8 years ago |
|
ansuz
|
a27cc76fc0
|
uppercase LOL
|
8 years ago |
|
ansuz
|
402ce2db93
|
better validation of inputs
|
8 years ago |
|
ansuz
|
c7eae9675b
|
keep exporting isArray for backwards compatibility
but prevent internal use
|
8 years ago |
|
ansuz
|
fbebbf0dca
|
minor clean up
|
8 years ago |
|
ansuz
|
525d35c9ec
|
redefine alert
|
8 years ago |
|
Pierre Bondoerffer
|
20c252e5c6
|
fix placeholder styling in safari
|
8 years ago |
|
ansuz
|
f694a81a5c
|
move more interface code out of cryptpad-common
|
8 years ago |
|
ansuz
|
a4157b9908
|
remove more unused functions
|
8 years ago |
|
ansuz
|
e10901edb2
|
begin to move interface code out of cryptpad-common
|
8 years ago |
|
ansuz
|
95789d3cbe
|
expose rpc for pinned usage
|
8 years ago |
|
ansuz
|
8f4dbcf4c6
|
remove getPadTitle
|
8 years ago |
|
ansuz
|
f42da4ecd8
|
move hashChannelList into common-hash.js
|
8 years ago |
|
ansuz
|
63960bd38c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
520ae822fc
|
correct undefined reference
|
8 years ago |
|
ansuz
|
50277cb0ae
|
don't rely on 'info' in onRemote so we can call it anywhere
|
8 years ago |
|
ansuz
|
bf047fcf65
|
Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
|
8 years ago |
|
Pierre Bondoerffer
|
96ff487271
|
fix flash of content
|
8 years ago |
|
ansuz
|
5a7eea08c8
|
Merge pull request #108 from pbondoer/newpoll
Poll fixes
|
8 years ago |
|
Pierre Bondoerffer
|
248f88034b
|
important fixes
|
8 years ago |
|
yflory
|
633d60ccd0
|
Remove a TODO
|
8 years ago |
|
Pierre Bondoerffer
|
6b57bb2bbb
|
poll: press enter to validate input
|
8 years ago |
|
Pierre Bondoerffer
|
d483e10e77
|
poll fixes
|
8 years ago |
|
yflory
|
81d83897ec
|
Rename hash.js
|
8 years ago |
|
yflory
|
2ad0a65b71
|
Remove shortcuts that override browser actions
|
8 years ago |
|
Pierre Bondoerffer
|
ea5301be13
|
poll improved(tm)
|
8 years ago |
|
Pierre Bondoerffer
|
7434dbcb0f
|
what i have
|
8 years ago |
|
yflory
|
07705cd5c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
eb2a3c1bbf
|
Fix lint errors
|
8 years ago |
|
ansuz
|
607d9652f5
|
jshint compliance
|
8 years ago |
|
yflory
|
3ba90332bb
|
Merge branch 'refactor' into staging
|
8 years ago |
|
Pierre Bondoerffer
|
f11cf8e6ac
|
move poll styles to separate file
|
8 years ago |
|
yflory
|
daabb0b3ad
|
Integrate and fix the new fileObject (userObject)
|
8 years ago |
|
ansuz
|
df4a250359
|
use feedback api instead of app=
|
8 years ago |
|
ansuz
|
86c37bfa37
|
fix find+replace error
|
8 years ago |
|
ansuz
|
e618483395
|
extract all code for encoding and decoding hashes
|
8 years ago |
|
ansuz
|
fdd2716ad5
|
move constants to the top of cryptpad-common.js
|
8 years ago |
|
yflory
|
c1e0316d43
|
Refactor fileObject
|
8 years ago |
|
ansuz
|
5212539a16
|
move standalone functions from common into their own file
|
8 years ago |
|
ansuz
|
7437d6b902
|
remove unused function
|
8 years ago |
|
ansuz
|
4e590a9dd1
|
remove even more dead code
|
8 years ago |
|
ansuz
|
85fcaa9bbc
|
remove more dead code
|
8 years ago |
|
ansuz
|
401936a91e
|
move singly-used css file out of /common/
|
8 years ago |
|
ansuz
|
9a46b58c85
|
deprecate this 90 days after f-release
|
8 years ago |
|
ansuz
|
7a59183bb1
|
pinpad.create should always be async
|
8 years ago |
|
ansuz
|
8de3610532
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
9aa0548b1f
|
remove dead cursor code
|
8 years ago |
|
yflory
|
4e61b79f9a
|
Clean fileObject
|
8 years ago |
|
yflory
|
cde724399c
|
Pin the pads
|
8 years ago |
|
yflory
|
74ea2fce5a
|
Fix lint error...
|
8 years ago |
|
yflory
|
aa49c97d6e
|
Fix lint error
|
8 years ago |
|
ansuz
|
2c8d1b8183
|
jshint compliance
|
8 years ago |
|
yflory
|
f0836f745e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
528deb11da
|
Add missing file for whiteboard
|
8 years ago |
|
ansuz
|
cde9ea9887
|
update footer version
|
8 years ago |
|
ansuz
|
05a50b1f4c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a14bb1480a
|
progress for implicit pinning
|
8 years ago |
|
ansuz
|
f82278a25c
|
handle return of undefined hash
|
8 years ago |
|
yflory
|
d5e69653c0
|
Select opacity in draw mode in the canvas app
|
8 years ago |
|
ansuz
|
1d933be5a6
|
make reset return the hash, not an array with containing it
|
8 years ago |
|
yflory
|
f34492be94
|
Remove duplicates uid in the user list
|
8 years ago |
|
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
8 years ago |
|
yflory
|
bd16e0f0e7
|
Templates in polls and canvas, and ability to disable templates
|
8 years ago |
|
yflory
|
63a130c678
|
Add a button to delete the selection in canvas
|
8 years ago |
|
yflory
|
33e19d5918
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
126498585e
|
Add a context menu on the ROOT folder in the drive
|
8 years ago |
|
yflory
|
be1db2a1ec
|
Ability to remove an object when draw mode is off
|
8 years ago |
|
ansuz
|
108ab7e9de
|
comment out a style assignment that doesn't seem necessary
|
8 years ago |
|
ansuz
|
8c629185e1
|
cleaner less file
|
8 years ago |
|
ansuz
|
0db141e48d
|
rename style files 'whiteboard' instead of main
|
8 years ago |
|
ansuz
|
395d8625a8
|
draw the palette on pad creation
|
8 years ago |
|
ansuz
|
3b99c42e22
|
no more inline styles
|
8 years ago |
|
ansuz
|
ef821c3e7e
|
integrate @lukevers improvements and clean up js a bit
|
8 years ago |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
8 years ago |
|
ansuz
|
bd2034c47b
|
prepare rpc before 'ready' if pinning is enabled
|
8 years ago |
|
ansuz
|
a70388284d
|
disable unnecessary messages
|
8 years ago |
|
ansuz
|
abd87e1322
|
jshint compliance
|
8 years ago |
|
ansuz
|
e4b15bc616
|
implement 'getCanonicalChannelList'
|
8 years ago |
|
ansuz
|
09f8e139fe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a2f692b9a3
|
clean up serverside and clientside pinning logic
|
8 years ago |
|
yflory
|
a13261abaa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
dedf2b3c69
|
Display selected color and button to turn off draw mode in canvas
|
8 years ago |
|
ansuz
|
fdede0d1fd
|
remove some dead code
|
8 years ago |
|
ansuz
|
e87992c7ec
|
implement atomic pin reset rpc
|
8 years ago |
|
ansuz
|
166e70f628
|
test new rpc apis
|
8 years ago |
|
ansuz
|
2a566671f2
|
remove outdated rpc example
|
8 years ago |
|
ansuz
|
3380cf0348
|
implement getTotalSize rpc
|
8 years ago |
|
ansuz
|
6e1ffcc18d
|
define better color palette
|
8 years ago |
|
yflory
|
84029ac2d7
|
Fix the color picker in Chromium 53 and improve the cursor
|
8 years ago |
|
ansuz
|
5c292fb1fa
|
jshint compliance
|
8 years ago |
|
yflory
|
b14d89360d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
8e29e30a35
|
Realtime palette + cursor corresponding to the brush
|
8 years ago |
|
ansuz
|
8bbbf8e252
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
64089c5f6b
|
implement pad pinning
|
8 years ago |
|
yflory
|
d07acc5364
|
Don't redraw the drive if filesData changes while in unsorted
|
8 years ago |
|
yflory
|
13514dff63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
8 years ago |
|
ansuz
|
6c7cdc90a9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
212baeb3a6
|
better cookie schema. expire old sessions
|
8 years ago |
|
yflory
|
54d271c4e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a9777ce560
|
Fix input losing focus in polls with Chrome 57
|
8 years ago |
|
ansuz
|
3484515283
|
enable more tests
|
8 years ago |
|
ansuz
|
3e47b8a38d
|
remove dead code
|
8 years ago |
|
ansuz
|
31b178a306
|
use pinpad api
|
8 years ago |
|
ansuz
|
182dbfc874
|
implement pinning logic in pinpad.js
|
8 years ago |
|
ansuz
|
a5e5ddae08
|
rpc all the things
|
8 years ago |
|
ansuz
|
4f7e25eeb9
|
show labels for brush width
|
8 years ago |
|
ansuz
|
2a6de5163b
|
jshint compliance
|
8 years ago |
|
ansuz
|
04069cc7f4
|
fix font size
|
8 years ago |
|
ansuz
|
1e51f89096
|
wipe the userdoc when the canvas is cleared
|
8 years ago |
|
ansuz
|
e2981c0223
|
try to make the color picker show the current color
|
8 years ago |
|
ansuz
|
96dac80bd5
|
better color picker in whiteboard
|
8 years ago |
|
ansuz
|
bd07b3a80f
|
less cramped styling on text inputs on /settings/
|
8 years ago |
|
ansuz
|
6e9968f989
|
add 'lol' code theme
|
8 years ago |
|
ansuz
|
b85324a29e
|
jshint compliance
|
8 years ago |
|
ansuz
|
73d4fd1700
|
handle reconnection attempts
|
8 years ago |
|
ansuz
|
b07248ad42
|
prompt with setName if name is unset
|
8 years ago |
|
ansuz
|
9b4b642d4a
|
protect against subtly corrupted user objects
|
8 years ago |
|
ansuz
|
18469edf18
|
extend list item rendering to support gfm task lists
|
8 years ago |
|
ansuz
|
055bc03092
|
strip carriage return
|
8 years ago |
|
ansuz
|
bca13ad5a5
|
add notifications to whiteboard
|
8 years ago |
|
ansuz
|
233bb7a14f
|
reorganize some html tags for smaller diffs
|
8 years ago |
|
ansuz
|
76471f7b90
|
add forget button to whiteboard and handle disconnection better
|
8 years ago |
|
ansuz
|
d4ce3dc6b9
|
don't rewrite css rules. FOUC is too long
|
8 years ago |
|
ansuz
|
3cfd0a4326
|
commit some garbage
|
8 years ago |
|
ansuz
|
364dae2882
|
update templated html
|
8 years ago |
|
ansuz
|
ed89a13fe6
|
progress on adding version string to some css
|
8 years ago |
|
ansuz
|
4d5baa717d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
76990ac1b2
|
version toolbar.css for cache-busting
|
8 years ago |
|
ansuz
|
9d3f859657
|
add a contextMenu entry for the whiteboard app
|
8 years ago |
|
yflory
|
7ede430db3
|
Fix 'search.oldLocation is undefined' error
|
8 years ago |
|
ansuz
|
df7363f416
|
regenerate templated files for new footer
|
8 years ago |
|
yflory
|
72fecb9549
|
Fix lint errors
|
8 years ago |
|
yflory
|
af68e41fb6
|
Always set the focus to the search bar in the drive
|
8 years ago |
|
yflory
|
67f4096396
|
Fix cursor in the drive search bar
|
8 years ago |
|
yflory
|
12cc49b575
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
72c60ec676
|
Add background to the whiteboard app
|
8 years ago |
|
yflory
|
2732b7aa82
|
Fix module.onLocal not defined
|
8 years ago |
|
ansuz
|
a0c17d7c9b
|
latest rpc code
|
8 years ago |
|
yflory
|
4ddf9b4e04
|
Improve whiteboard UI
|
8 years ago |
|
yflory
|
89877baa69
|
Fix read-only mode in canvas app
|
8 years ago |
|
yflory
|
c2cb24c072
|
Add toolbar to the whiteboard app
|
8 years ago |
|
ansuz
|
973aeba0da
|
remove bundled fabric.js
|
8 years ago |
|
ansuz
|
6eab52c33d
|
use secure fabric.js
|
8 years ago |
|
ansuz
|
59a80d5fde
|
remove silly TODO
|
8 years ago |
|
ansuz
|
ce5dbaeafd
|
use alertify instead of browser prompt
|
8 years ago |
|
yflory
|
71c59d7ae2
|
Remove unnecessary TODOs
|
8 years ago |
|
yflory
|
d92a875ce5
|
Translate the 'wrong application' error message
|
8 years ago |
|
yflory
|
a8ffac5dcd
|
Remove old code
|
8 years ago |
|
yflory
|
5322eff607
|
Use the current values for the checkboxes in the print options dialog
|
8 years ago |
|
yflory
|
53c60a31f6
|
Set the properties and backup inputs to read-only in the drive
|
8 years ago |
|
yflory
|
0c5a930cb9
|
Fix an issue with the 'Properties' entry not always displayed in context menu
|
8 years ago |
|
ansuz
|
3e9eb03e5a
|
display a user's public signing key in settings if it exists
|
8 years ago |
|
ansuz
|
912215185f
|
add uid to userdata for better notifications
|
8 years ago |
|
ansuz
|
fa9249ef29
|
don't notify for userlist changes if a user joins twice
|
8 years ago |
|
ansuz
|
40f5e1706f
|
add a unique id to user objects, define a getter
|
8 years ago |
|
ansuz
|
e2ee80d4e7
|
set icon for whiteboard app
|
8 years ago |
|
ansuz
|
dbca94437e
|
rename canvas app to 'whiteboard'
|
8 years ago |
|
yflory
|
994d640f8b
|
Fix an issue causing the lag icon to lose its color
|
8 years ago |
|
yflory
|
819c7e3bae
|
Fix style issue with drag&drop in the active folder
|
8 years ago |
|
yflory
|
6fbd1f0028
|
Store the dates as number and not strings to avoid ot issues
|
8 years ago |
|
yflory
|
8556ce9d17
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
8ce8401107
|
Fix issues with middle click in context menus
|
8 years ago |
|
yflory
|
5f4990cc80
|
Display or hide the context menu in a more intuitive way with multiselect
|
8 years ago |
|
yflory
|
51033ab70a
|
Remove useless links in the context menu and properties for readonly pads in the drive
|
8 years ago |
|
ansuz
|
2b2e581779
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
2e8484ad4c
|
notes about what to improve. transform json on OT instead of just validating
|
8 years ago |
|
yflory
|
7afde2309d
|
Add properties to the files not in the trash
|
8 years ago |
|
yflory
|
61d33f2dd6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop
|
8 years ago |
|
yflory
|
66a80ea50c
|
Add properties for pads in the drive
|
8 years ago |
|
ansuz
|
b542245086
|
fix lint error
|
8 years ago |
|
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
98027dad27
|
jshint compliance
|
8 years ago |
|
ansuz
|
eeecb1baab
|
Make Canvas Work Again
|
8 years ago |
|
ansuz
|
4a173e30dc
|
set user's cursor to either the beginning or end of the document
|
8 years ago |
|
yflory
|
29174b2922
|
Update the lag icon
|
8 years ago |
|
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
8 years ago |
|
yflory
|
85105a1382
|
Active folder in drive is not underlined anymore
|
8 years ago |
|
yflory
|
cd77f50717
|
Fix transitions in slides, add swipe event handlers, and fix print in firefox
|
8 years ago |
|
yflory
|
e139295d7e
|
Add transitions in present mode
|
8 years ago |
|
yflory
|
45ac3e40a2
|
Copy print options to present mode
|
8 years ago |
|
yflory
|
a5f11d0d0d
|
Uniform the slides rendering in present and print mode
|
8 years ago |
|
ansuz
|
d422c7e165
|
support old hashes in getUserChannelList
|
8 years ago |
|
ansuz
|
7d5ff27900
|
better rpc tests, sum up your channel usage
|
8 years ago |
|
ansuz
|
5ed6223313
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
7f2f1f7191
|
correctly initialize RPC object
|
8 years ago |
|
ansuz
|
c9c9dd0999
|
use userChannelList if a list is not supplied to pinpad
|
8 years ago |
|
ansuz
|
e8c3cf6aa5
|
implement rpc message signing
|
8 years ago |
|
ansuz
|
d85a42c776
|
include User_hash in user channel list
|
8 years ago |
|
yflory
|
f98c825dc3
|
Fix keyboard shortcuts not working in CryptDrive
|
8 years ago |
|
yflory
|
7b27f1dc2c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
7761aaa89f
|
Add search UI
|
8 years ago |
|
ansuz
|
b578803136
|
clean up registration code a little bit
|
8 years ago |
|
ansuz
|
c3c866fa2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
d19bbcb001
|
Add support for search in the drive
|
8 years ago |
|
ansuz
|
5eb32b33ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
298725b3c2
|
don't show usage tips on error screens
|
8 years ago |
|
ansuz
|
0a6373852e
|
add signing keys to user object at login and register time
|
8 years ago |
|
yflory
|
9a32fb1999
|
Fix sub-folders changing position in the tree when renaming them
|
8 years ago |
|
yflory
|
931f7619c0
|
Keep the scroll position on redraw in drive
|
8 years ago |
|
yflory
|
0607c3bbf3
|
Add a title to the 'new' button in drive
|
8 years ago |
|
yflory
|
b9c64a526a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
8 years ago |
|
ansuz
|
8129b8cdc1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
15a67afc75
|
jshint compliance
|
8 years ago |
|
yflory
|
13d7b3cadc
|
Merge branch 'd' into staging
|
8 years ago |
|
yflory
|
a286599f93
|
Fix fast reconnect, and add support for reconnecting ws in polls
|
8 years ago |
|
ansuz
|
bd9efd7c04
|
provide examples of valid and invalid rpc calls
|
8 years ago |
|
ansuz
|
7187d3c550
|
implement getUserChannelList
|
8 years ago |
|
ansuz
|
306f6ce806
|
resolve merge-conflict with accounting branch
|
8 years ago |
|
yflory
|
fe5e33a0ee
|
Fix loss of presentation position when updating slides
|
8 years ago |
|
ansuz
|
805e26bc07
|
add a version footer to main pages
|
8 years ago |
|
yflory
|
f10149db1c
|
Make sure the tip is always visible when the loading screen is removed
|
8 years ago |
|
ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
09afba80db
|
add support for logging in from register page
|
8 years ago |
|
yflory
|
16e5788011
|
Call the callback if we can't parse the local Drive to import it
|
8 years ago |
|
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
8 years ago |
|
ansuz
|
5d88c3a436
|
newer registration code
|
8 years ago |
|
ansuz
|
10bb11bff6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
8 years ago |
|
yflory
|
ceaf757680
|
Allow right click on the CryptPad logo/link in the top left corner
|
8 years ago |
|
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
8 years ago |
|
ansuz
|
df6298eeb6
|
apply styles to confirm buttons if provided
|
8 years ago |
|
yflory
|
84c16c00ad
|
Fix click events not working on inputs in the drive tree
|
8 years ago |
|
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
8 years ago |
|
yflory
|
ca9faa0056
|
Fix wrong translation keys
|
8 years ago |
|
yflory
|
b7986ff6b1
|
Replace the spinner code with a font awesome spinner
|
8 years ago |
|
ansuz
|
6e733b1329
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
d9996cc874
|
current work for pinning
|
8 years ago |
|
ansuz
|
a7d61aa562
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
8 years ago |
|
ansuz
|
b3cc8da315
|
implement basic clientside RPC infrastructure
and provide a basic example for testing it
|
8 years ago |
|
yflory
|
f94db93897
|
Improve the slides layout in print mode
|
8 years ago |
|
ansuz
|
81027b4200
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
8 years ago |
|
yflory
|
2392167996
|
Export slides as PDF
|
8 years ago |
|
yflory
|
4bac8ea0c7
|
Draw all the slides at once to allow reference links (fix #77)
|
8 years ago |
|
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
8 years ago |
|
yflory
|
404fa378e6
|
Move the store to the 'common' folder, it is not customizable anymore
|
8 years ago |
|
yflory
|
a8d200ef2e
|
Don't redirect until realtime is synced when logging in
|
8 years ago |
|
yflory
|
0c1efd361b
|
Make sure the href is updated everywhere when importing a stronger link
|
8 years ago |
|
yflory
|
b701e3cc85
|
Fix lint errors
|
8 years ago |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
8 years ago |
|
yflory
|
f62267f8a1
|
Ability to import local pads in the user object
|
8 years ago |
|
ansuz
|
e2418a6be2
|
sketch of how pinning rpc will look
|
8 years ago |
|
ansuz
|
dc567fa7f3
|
signing keys are stored in hex so encode and decode them
|
8 years ago |
|
yflory
|
ce6cd1211e
|
Fix lint errors
|
8 years ago |
|
ansuz
|
aa762e7d63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
8a48612de2
|
add some notes for later
|
8 years ago |
|
yflory
|
9ad33574e9
|
Fix the function returning the pads list in the drive
|
8 years ago |
|
yflory
|
14938089ac
|
Keep the focus on the iframe window after canceling a deletion
|
8 years ago |
|
yflory
|
3f7dea8f7e
|
Context menu support for multi-select options in drive
|
8 years ago |
|
yflory
|
e1c02fd8a4
|
Drive rename: save pads and folders name on click, cancel with Esc.
|
8 years ago |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
8 years ago |
|
yflory
|
77d09f64e1
|
Display anonymous users in the user list
|
8 years ago |
|
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
8 years ago |
|
ansuz
|
c04819538b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
fcb9848b3a
|
hide toolbar when in read-only mode
|
8 years ago |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
8 years ago |
|
yflory
|
27241488a5
|
Merge pull request #96 from pbondoer/css
(CSS) Some improvements to drive
|
8 years ago |
|
Pierre Bondoerffer
|
6c9da646e0
|
(CSS) Some improvements to drive
|
8 years ago |
|
ansuz
|
08c862b271
|
add FIXME notes to poll
|
8 years ago |
|
yflory
|
ed9bcca96f
|
Close the websocket network when CryptGet/CryptPut is done
|
8 years ago |
|
yflory
|
a68acac13b
|
Only ask for a display name once in /poll
|
8 years ago |
|
yflory
|
a978b51656
|
If display name is empty, use anonymous in the drive
|
8 years ago |
|
yflory
|
153386a6e0
|
CSS improvements in the drive tree
|
8 years ago |
|
yflory
|
6098f28260
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a852112808
|
Fix open folder from the tree context menu
|
8 years ago |
|
ansuz
|
2c9deed381
|
Merge pull request #94 from pbondoer/staging
Some CSS fixes
|
8 years ago |
|
ansuz
|
868161a8a8
|
fix undefined reference in code
|
8 years ago |
|
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
Pierre Bondoerffer
|
800db07077
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
8 years ago |
|
yflory
|
52793385ea
|
Fix lint errors
|
8 years ago |
|
Pierre Bondoerffer
|
e39fe1c0b7
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
8 years ago |
|
ansuz
|
c884782d57
|
here are some changes
|
8 years ago |
|
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
8 years ago |
|
yflory
|
9a7c2dd5e2
|
Add a 'settings' link to the user menu in static pages
|
8 years ago |
|
yflory
|
370ae81106
|
Use the display name in the backup file name if not logged in
|
8 years ago |
|
Pierre Bondoerffer
|
e0d972674f
|
Fix context menu in drive and rename textbox styling
|
8 years ago |
|
yflory
|
c5f983ecd7
|
Convert read-only link to editing link in the drive
|
8 years ago |
|
Pierre Bondoerffer
|
d26d8f53d9
|
(CSS) Fixed textarea being too large
|
8 years ago |
|
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
8 years ago |
|
yflory
|
6b8d0c8bc7
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
8 years ago |
|
yflory
|
b32d698291
|
Fix issue with present mode in slide (readonly)
|
8 years ago |
|
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
8 years ago |
|
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
8 years ago |
|
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
8 years ago |
|
yflory
|
53f4f8826e
|
Merge branch 'staging' into staging
|
8 years ago |
|
yflory
|
55210f17eb
|
Clean the code to be less dependant on 'li'
|
8 years ago |
|
Pierre Bondoerffer
|
3e9c4d0901
|
Add hover to file manager tree
|
8 years ago |
|
Pierre Bondoerffer
|
cbdfae09a6
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
c6c3e1bbb5
|
Don't select subfolders in the tree when drag&drop
|
8 years ago |
|
Pierre Bondoerffer
|
d605fc757b
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a26b9d3240
|
Don't select subfolders in the tree when right-click on drag&drop
|
8 years ago |
|
ansuz
|
cb5e01815c
|
validate all alertify strings by default. require 'force' argument to bypass
|
8 years ago |
|
Pierre Bondoerffer
|
b0323f6fd9
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a2b5200381
|
Add a container for the folders in the tree in the drive
|
8 years ago |
|
yflory
|
412815b042
|
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
|
8 years ago |
|
yflory
|
11d54256da
|
Make sure the display name is displayed in the same way everywhere
|
8 years ago |
|
yflory
|
2c5c6da0d9
|
Fix XSS in alertify logs
|
8 years ago |
|
yflory
|
5797aab3f2
|
Fix XSS with display names in the user list
|
8 years ago |
|
yflory
|
26e3971482
|
Fix XSS in the user dropdown menu
|
8 years ago |
|
ansuz
|
639376f1cb
|
don't use hyperjson.toString
|
8 years ago |
|
Pierre Bondoerffer
|
eb9a39eb68
|
Add hover on elements in drive and make grid slightly prettier
|
8 years ago |
|
yflory
|
f130fd0598
|
Fix horizontal scrollbar in edge
|
8 years ago |
|
yflory
|
345d2faab2
|
Fix horizontal scrollbar in Edge #3
|
8 years ago |
|
yflory
|
d683dc499a
|
Fix horizontal scrollbar in Edge #2
|
8 years ago |
|
yflory
|
7a0a87bf6c
|
Fix horizontal scrollbar in Edge
|
8 years ago |
|
yflory
|
f06196c261
|
Remove the context menu buttons when removing selection
|
8 years ago |
|
yflory
|
c0278ba77f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
efb7380a12
|
Fix default pad not created after registration
|
8 years ago |
|
ansuz
|
5d39125004
|
Make onSettle Async Again
|
8 years ago |
|
yflory
|
4f4075ed6e
|
Make the settings app available to anonymous users
|
8 years ago |
|
yflory
|
0224d6489b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
12aec60a12
|
hack around onSettle not doing its job
|
8 years ago |
|
yflory
|
0ae7f94184
|
Remove the pointer and text underline on icon:hover in drive
|
8 years ago |
|
ansuz
|
69b6f80e4b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
86adfbf27d
|
update cache-busting directive in all supported apps
|
8 years ago |
|
ansuz
|
cfc9f2e622
|
remove code for 'user' app, now that we have login and register
|
8 years ago |
|
yflory
|
ec7761eeb8
|
Make sure we don't use a wrong title for a new pad
|
8 years ago |
|
yflory
|
8e7e1d336e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
96f6b5755d
|
Add the blog link in the header and footer
|
8 years ago |
|
ansuz
|
d49a7d7ec4
|
fix undefined reference
|
8 years ago |
|
ansuz
|
9a2ed5741a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a4913f2f4b
|
provide UI for disabling the user feedback api
|
8 years ago |
|
ansuz
|
1a259bb3aa
|
check if user has disallowed feedback api
|
8 years ago |
|
yflory
|
4f7a05ead2
|
Fix issue with the path for the trash in the drive's topbar
|
8 years ago |
|
yflory
|
8741b50f5b
|
Set the file name as default title if a pad is created from the drive
|
8 years ago |
|
yflory
|
e8c73f35ce
|
In the tree, display the rename input only once
|
8 years ago |
|
yflory
|
e38df7ce47
|
Fix creation of new pads in /pad
|
8 years ago |
|
yflory
|
20518a3e88
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
f8d653406a
|
Add the new content for the default pad and add french translation
|
8 years ago |
|
ansuz
|
d15a08830e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
06f0891d21
|
add allowUserFeedback toggle to settigs page
|
8 years ago |
|
yflory
|
498f4065cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
95853debf9
|
Update the default pad #1
|
8 years ago |
|
yflory
|
d4bf7cf9aa
|
Send the initial state only if it is a new pad in /pad
|
8 years ago |
|
yflory
|
66dc166936
|
Make sure the realtime is synced with onSettle when using cryptget
|
8 years ago |
|
yflory
|
fadddb297c
|
Readonly mode in /pad had contenteditable set to true
|
8 years ago |
|
ansuz
|
de5a21fe57
|
add a simple feedback api and text explaining what it is
|
8 years ago |
|
yflory
|
2ad9debe58
|
Remove the placeholders in /code and /slide
|
8 years ago |
|
yflory
|
38893fb8e5
|
Remove the 'Bootstart tooltips require Tether' error
|
8 years ago |
|
yflory
|
88b29e8bdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
5303e76ece
|
Make sure the content is correctly applied in onReady
|
8 years ago |
|
ansuz
|
cc829d51f8
|
jshint compliance
|
8 years ago |
|
yflory
|
42b6cca18d
|
Fix new pad not working
|
8 years ago |
|
yflory
|
3fd5669647
|
Hide the trash icon for read-only pads if we have the edit link in drive
|
8 years ago |
|
yflory
|
02cc9c8344
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
e040c00557
|
Fix blocker issue when creating an account without migrating
|
8 years ago |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
8 years ago |
|
ansuz
|
89bee8cf6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
ba3e24b595
|
media tag experiments
|
8 years ago |
|
yflory
|
54b0a86c2e
|
Make sure we redirect to the drive if we access the login page from the homepage
|
8 years ago |
|
yflory
|
55fb0f03ae
|
Fix the path in the drive overriding the content area
|
8 years ago |
|
yflory
|
d7d7165dc4
|
Login page was using a wrong translation key
|
8 years ago |
|
yflory
|
ba0b314f5e
|
Fix the 'new' button in drive which was broken in non root categories
|
8 years ago |
|
yflory
|
d8cc2903cc
|
Display context menu actions in the toolbar when an element is selected
|
8 years ago |
|
yflory
|
a0340f1419
|
Open link in a new tab in /pad
|
8 years ago |
|
yflory
|
2d30393243
|
Add support for updated translation key
|
8 years ago |
|
yflory
|
cc174f3bee
|
Fix typo
|
8 years ago |
|
yflory
|
bdc00a2413
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
8 years ago |
|
yflory
|
e73b4a1131
|
Don't display 'All files' in the menu
|
8 years ago |
|
ansuz
|
89f3577058
|
remove old poll
|
8 years ago |
|
ansuz
|
7e77c6828a
|
more correct pluralization
|
8 years ago |
|
ansuz
|
3d0e7cb9a7
|
pull ckeditor config out of main.js
|
8 years ago |
|
yflory
|
328e5c6f03
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
c72bbd4c37
|
Use the file name as initial title
|
8 years ago |
|
Pierre Bondoerffer
|
4cbb3b2ed2
|
Ensure we use English for reference
|
8 years ago |
|
Pierre Bondoerffer
|
ffe17a6bc9
|
Use JSON.stringify instead and fix linter
|
8 years ago |
|
Pierre Bondoerffer
|
a84f8e2808
|
Assert translation now outputs JavaScript which is easier to edit for translators
|
8 years ago |
|
yflory
|
47b8fefd9e
|
Load messages.js only once, in cryptpad-common
|
8 years ago |
|
yflory
|
11d9c9e813
|
Merge branch 'master' into staging
|
8 years ago |
|
yflory
|
2103f0afa8
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
|
yflory
|
0bdf59c1dd
|
Fix broken link in the 'New' button on cryptpad.fr
|
8 years ago |
|
yflory
|
454d1c2052
|
Do not load all the translations anymore, only the needed one
|
8 years ago |
|
yflory
|
434c3a220c
|
Remove old translation keys #2
|
8 years ago |
|
yflory
|
d81d17b86c
|
Remove old translations keys no longer used
|
8 years ago |
|
yflory
|
9702305abc
|
Use better translation keys in settings
|
8 years ago |
|
yflory
|
a6497f7a52
|
Add a way to show the drive tips again
|
8 years ago |
|
yflory
|
c17f28e5fe
|
Fix race condition #2
|
8 years ago |
|
yflory
|
239e2bcc1f
|
Fix issue with null entries in Cryptpad_RECENTPADS
|
8 years ago |
|
yflory
|
1540ae3f6f
|
Fix issue with null entries in Cryptpad_RECENTPADS
|
8 years ago |
|
yflory
|
dd014f6ef2
|
Fix race conditon
|
8 years ago |
|
ansuz
|
94417d9a8b
|
jshint compliance
|
8 years ago |
|
ansuz
|
8167ed9048
|
implement cache-busting everywhere
|
8 years ago |
|
ansuz
|
34b6507fa3
|
implement cache-busting everywhere
|
8 years ago |
|
ansuz
|
c9b8889380
|
add cache-busting to chainpad-crypto
|
8 years ago |
|
ansuz
|
09fade6127
|
add cache-busting to chainpad-crypto
|
8 years ago |
|
yflory
|
2daa9f8658
|
Link to main page was opened in the inner iframe
|
8 years ago |
|
yflory
|
deda40375a
|
Use the new onSettle from chainpad to determine if the realtime is synced
|
8 years ago |
|
yflory
|
550c65aae0
|
Add a default pad in CryptDrive after signing up
|
8 years ago |
|
yflory
|
92d50ded64
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
97762f9f9a
|
Make sure all the elements in RECENTPADS are non-null objects
|
8 years ago |
|
yflory
|
e4dbe97d71
|
Update display name in realtime across tabs and remember 'anonymous' name
|
8 years ago |
|
yflory
|
7762ffcbff
|
Ability to use Ctrl+click on the cryptpad logo in apps
|
8 years ago |
|
yflory
|
7497e0d1c5
|
Add a dropdown user menu to the top bar in static pages
|
8 years ago |
|
yflory
|
0e76b18278
|
Hide the links in the html topbar on small screens
|
8 years ago |
|
yflory
|
7758d056fa
|
Ability to import/export a user realtime object
|
8 years ago |
|
yflory
|
0a43570990
|
Add the new files for the settings app
|
8 years ago |
|
yflory
|
cd9cea8fa4
|
Create a settings app to manage user objects
|
8 years ago |
|
yflory
|
71b84afdb2
|
Redirect to the pad when logging in or signing up from a pad
|
8 years ago |
|
yflory
|
92050eb04f
|
Fix the trash button in toolbar not always working
|
8 years ago |
|
yflory
|
aae3fba284
|
Fix the storage when the hash is invalid
|
8 years ago |
|
yflory
|
25dd103f6f
|
Reduce font-size for register explanations
|
8 years ago |
|
ansuz
|
7d0c29513c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
7d21206cae
|
add registration introductory text
|
8 years ago |
|
yflory
|
2851ceb95a
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
2807ad9dc3
|
Add spinner and translate the register page
|
8 years ago |
|
ansuz
|
562e5b8c70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
5d4d530c89
|
switch registration text to an explanation of how login works
|
8 years ago |
|
yflory
|
bff9d05210
|
Make sure the login_name is in the object
|
8 years ago |
|
yflory
|
b1b294aade
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
20083264b2
|
load fontawesome icons on register page
|
8 years ago |
|
yflory
|
3aa03225c9
|
Add a spinner when hashing the password and translate homepage
|
8 years ago |
|
ansuz
|
fbcf4ccec4
|
force usernames to be lowercase
|
8 years ago |
|
ansuz
|
5614bea271
|
redirect users to login and register from toolbar
|
8 years ago |
|
ansuz
|
f723585758
|
add api to check whether the realtime has synced with the server
|
8 years ago |
|
ansuz
|
3b1bd2f720
|
use additional translation keys for registration
|
8 years ago |
|
ansuz
|
b5b2454f0b
|
use bootstrap for login and register pages
|
8 years ago |
|
ansuz
|
c556f78562
|
log in directly from home page, sign up at /register/
|
8 years ago |
|
ansuz
|
d0edf75c89
|
signup link directs users to register page, not user
|
8 years ago |
|
ansuz
|
1232aa8a79
|
jshint compliance
|
8 years ago |
|
yflory
|
8eec7ec7c8
|
Fix typo
|
8 years ago |
|
ansuz
|
88af104ce8
|
basic registration page to replace user page
|
8 years ago |
|
ansuz
|
a995df25f6
|
disable new OT in pad and code app
|
8 years ago |
|
ansuz
|
f92ba193c3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
e100110741
|
implement log in as an api
|
8 years ago |
|
yflory
|
d54262c8df
|
Use the same disconnecter error translation key for all the apps
|
8 years ago |
|
yflory
|
f8366e0cfc
|
Remove support for legacy store and add a way to import legacy pads
|
8 years ago |
|
yflory
|
342cb44cf7
|
Ability to migrate a anon drive directly from the drive
|
8 years ago |
|
ansuz
|
c642bce984
|
restore disabled listener
|
8 years ago |
|
yflory
|
67d881b2cf
|
Remove the drive entry from the user menu if already in drive
|
8 years ago |
|
yflory
|
e865b89f43
|
Add the contextmenu button in the drive dynamically
|
8 years ago |
|
yflory
|
3af7c9cff8
|
Replace the expand/collapse ckeditor button by our own to save space
|
8 years ago |
|
yflory
|
914c442615
|
Do not redirect to home page when logging out from another tab
|
8 years ago |
|
yflory
|
702798f65a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
1e2cc6bea4
|
Fix race condition with the iframe store
|
8 years ago |
|
ansuz
|
dae17588c6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
32a5c5ff62
|
better integration between /user/ and home
|
8 years ago |
|
ansuz
|
fe7ba98338
|
remove dead code from /user/
|
8 years ago |
|
ansuz
|
9b047bfb53
|
don't autocorrect usernames. add trailing slash to /drive
|
8 years ago |
|
ansuz
|
6e97082ff9
|
remove dead code from login function
|
8 years ago |
|
yflory
|
b3e73b0f0b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
367a02c031
|
Add mobile support for the code app
|
8 years ago |
|
yflory
|
628148d001
|
Display the contextmenu button only if contextmenu exists
|
8 years ago |
|
ansuz
|
8a1acc3c37
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
6f07a3b7b4
|
erase lingering sessionStorage values when logging out
|
8 years ago |
|
yflory
|
ac79fbb5a2
|
Improve mobile support for the toolbar and the drive
|
8 years ago |
|
yflory
|
9f1789b2d2
|
Fix creation of pads from non-root category in the drive
|
8 years ago |
|
yflory
|
7e7d1f7a16
|
Display the error when opening a document with the wrong app
|
8 years ago |
|
yflory
|
6f0d33dc1d
|
Fix missing placeholder in the Slide app
|
8 years ago |
|
yflory
|
7d6e15e465
|
Throw an error when trying to open a document with the wrong app
|
8 years ago |
|
yflory
|
ad82a275bc
|
Replace the Apps button by a New button again
|
8 years ago |
|
yflory
|
fd33ffd56f
|
Fix issue creating a patch everytime the user clicked in an app
|
8 years ago |
|
yflory
|
fbbf8a2829
|
Replace initialState by a placeholder in slide and code
|
8 years ago |
|
yflory
|
87abfac5e0
|
Fix lint error
|
8 years ago |
|
yflory
|
02439e0f61
|
Improve the homepage with new images and translations
|
8 years ago |
|
yflory
|
f57c8c0e4b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
2c6b4b9c6a
|
Hide disabled applications from the context menu in drive
|
8 years ago |
|
ansuz
|
85b49d5ec8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
91299f5f30
|
Ability to access the drive from any pad
|
8 years ago |
|
yflory
|
b0fb56fa63
|
Allow logge din users to access the home page
|
8 years ago |
|
ansuz
|
72c4175b6f
|
remove slide/oldmain.js
|
8 years ago |
|
yflory
|
e607ba5dad
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
9cea8d82c2
|
Fix left-click disabled in Edge after renaming a file
|
8 years ago |
|
ansuz
|
2dfe182d8d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
0ca1775657
|
add page for listing missing translations
|
8 years ago |
|
yflory
|
6a5769405b
|
Fix a race condition issue introduced with reconnecting patch
|
8 years ago |
|
yflory
|
8881334ca8
|
Fix renaming folders from the tree
|
8 years ago |
|
yflory
|
65054119cf
|
Fix a bug preventing reconnection in drive
|
8 years ago |
|
yflory
|
89da142204
|
Fix pad creation from the context menu
|
8 years ago |
|
yflory
|
757ae7a3ad
|
Fix a cross origin frame issue with dropdowns
|
8 years ago |
|
ansuz
|
3321d01040
|
add background image
|
8 years ago |
|
yflory
|
8427b6ae8e
|
Fix 'sort by type' in drive
|
8 years ago |
|
yflory
|
39c85ca3f7
|
Fix race condition causing missing translations in homepage
|
8 years ago |
|
yflory
|
dc39c4e179
|
Fix a race condition causing the drive toolbar to be missing
|
8 years ago |
|
yflory
|
2e247d44c7
|
Hide the backup icon when logged in
|
8 years ago |
|
yflory
|
8ed593bfff
|
Keep the anon drive when signing up
|
8 years ago |
|
yflory
|
5e69b78334
|
Remove the domain from the href in store
|
8 years ago |
|
yflory
|
a9c9d19212
|
Hide the template from the list in the drive until it's done
|
8 years ago |
|
yflory
|
487650df78
|
Remove the remember me checkbox
|
8 years ago |
|
yflory
|
58d8a30b5b
|
Redirect to the main page when logging out
|
8 years ago |
|
yflory
|
29578a7400
|
Merge branch 'hpbs' into newtoolbar
|
8 years ago |
|
yflory
|
2d79649949
|
Fix the 'NoScript' bug with the drive
|
8 years ago |
|
yflory
|
5ef074370b
|
Name a place before creating it in the drive
|
8 years ago |
|
yflory
|
02906b3945
|
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
|
8 years ago |
|
yflory
|
a4286f1c83
|
Merge branch 'soon' into newtoolbar
|
8 years ago |
|
yflory
|
0e9e0e545f
|
Load the new pad when the hash is changed
|
8 years ago |
|
yflory
|
e41cbb92d8
|
Use default FILES_DATA name if not provided
|
8 years ago |
|
yflory
|
fa1582f307
|
Replace 'filename' by 'title' in drive when there is no filename
|
8 years ago |
|
yflory
|
c44f3a1044
|
Delete multiple elements could also remove unselected ones
|
8 years ago |
|
yflory
|
b79e1e48c7
|
Update colors in drive
|
8 years ago |
|
yflory
|
fb48484d2a
|
Fix the rename feature in drive not working with tables
|
8 years ago |
|
yflory
|
3f44444f41
|
Display the 'New' button in the trash
|
8 years ago |
|
yflory
|
00efc96919
|
Move the toolbar and add a breadcrumb
|
8 years ago |
|
yflory
|
6f5ff07c2b
|
Display the elements as a table instead of a list
|
8 years ago |
|
yflory
|
95056315cf
|
Move the folder icon style to the less file
|
8 years ago |
|
yflory
|
8c7305bf1b
|
Use less to write the drive stylesheet
|
8 years ago |
|
yflory
|
11f0a9ae5f
|
Revert the changes adding anonymous pads
|
8 years ago |
|
yflory
|
f42665ba49
|
Remove the unowned pads category
|
8 years ago |
|
yflory
|
cb85ad3fdf
|
Merge branch 'newtoolbar' into ownedpads
|
8 years ago |
|
yflory
|
75f1eed712
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
373b07ed28
|
Fix lint errors
|
8 years ago |
|
yflory
|
097f78d777
|
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
|
8 years ago |
|
yflory
|
015e6fc262
|
Make sure we have the same hash in all the tabs when disconnecting
|
8 years ago |
|
yflory
|
88021f2264
|
Anonymous pads fo anonymous users
|
8 years ago |
|
yflory
|
8ccd845d52
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
ce1e792419
|
Merge branch 'soon' into newtoolbar
|
8 years ago |
|
yflory
|
9d275daebb
|
Backport changes for the login page from hpbs branch
|
8 years ago |
|
yflory
|
a5c03c1540
|
Make sure data is migrated before leaving registration page
|
8 years ago |
|
yflory
|
69fb8b4d2f
|
Merge branch 'master' into soon
|
8 years ago |
|
yflory
|
f8455875a9
|
Fix the NoScript (iframe not loaded) bug with inner iframes
|
8 years ago |
|
yflory
|
c77abfa7f4
|
Remove a second scrollbar in polls
|
8 years ago |
|
yflory
|
5e36d9ea29
|
Fix polls table not updated with local events
|
8 years ago |
|
yflory
|
39ca2e6dd6
|
Fix bootstrap conflict with context menus
|
8 years ago |
|
yflory
|
d1bed5ae4b
|
Fix polls table not updated with local events
|
8 years ago |
|
yflory
|
26bea774cb
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
99b8898e54
|
Apply new title when clicking on the page without pressing enter
|
8 years ago |
|
yflory
|
ea8667302c
|
Display only a placeholder when the poll title is default
|
8 years ago |
|
yflory
|
7d66d391fc
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
1e1bfd275c
|
Don't show the tab notification when someone has joined the pad
|
8 years ago |
|
yflory
|
5d5d03163e
|
Add favicon and notifications in polls
|
8 years ago |
|
yflory
|
3338000018
|
Add Esc and Arrow icons in the slide's present mode
|
8 years ago |
|
yflory
|
efdae19f0c
|
Update the lists in the code and slide toolbars to use the new dropdown
|
8 years ago |
|
yflory
|
36c8ade26c
|
Update the lists in the code and slide toolbars to use the new dropdown
|
8 years ago |
|
yflory
|
fa8a0d5880
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
69bee7d79a
|
Add data into the homepage
|
8 years ago |
|
yflory
|
88d5b4cc9c
|
Add a 'New pad' button in the toolbar
|
8 years ago |
|
yflory
|
73d424b506
|
Improve the login UI (css and translations)
|
8 years ago |
|
yflory
|
e006ed7076
|
Ability to log in from the main page
|
8 years ago |
|
yflory
|
a9063e0459
|
Reload all tabs when the user logs in or out
|
8 years ago |
|
yflory
|
efed1f5efe
|
Add handlers to login and logout buttons
|
8 years ago |
|
yflory
|
767ba8b549
|
Select what we want to display in the toolbar
|
8 years ago |
|
yflory
|
2afdc11327
|
Replace the username button by a dropdown menu
|
8 years ago |
|
yflory
|
4adde0f0c0
|
Use the new dropdown for userlist and share
|
8 years ago |
|
yflory
|
70b73206b7
|
Merge branch 'brandones-master' into soon
|
8 years ago |
|
yflory
|
efffd4974f
|
Add createDropdown and createLanguageSelector in cryptpad-common
|
8 years ago |
|
yflory
|
29c8f0bbef
|
Use a FontAwesome spinner to replace the old unaligned one
|
8 years ago |
|
Brandon Istenes
|
b5acdb8cc0
|
Disable zooming on mobile
|
8 years ago |
|
Brandon Istenes
|
40985f1811
|
Dubious height setting for iOS
|
8 years ago |
|
Brandon Istenes
|
52d8d8db1d
|
Get rid of margins on mobile
|
8 years ago |
|
Brandon Istenes
|
cd0931c951
|
UI improvements for mobile browsers
|
8 years ago |
|
yflory
|
6352656737
|
Remove the default context menu in the entire drive
|
8 years ago |
|
yflory
|
ed79b8870c
|
Merge branch 'master' into soon
|
8 years ago |
|
yflory
|
605072cfbf
|
Fix empty title with new documents
|
8 years ago |
|
yflory
|
4963c77b61
|
Fix the title reset bug
|
8 years ago |
|
Caleb James DeLisle
|
35a853ffff
|
Stop failing tests over missing translations because otherwise they'll almost never be passing.
|
8 years ago |
|
yflory
|
3f1e287811
|
Fix an issue causing a user object to be turned into a pad
|
8 years ago |
|
Caleb James DeLisle
|
994f6991c8
|
Merge branch 'master' into soon
|
8 years ago |
|
Caleb James DeLisle
|
6c5e8d3118
|
Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up
|
8 years ago |
|
yflory
|
569ea21705
|
Replace the language selector by our custom dropdown menu
|
8 years ago |
|
ansuz
|
33b8de888e
|
clean up unused files
|
8 years ago |
|
yflory
|
26dd4ea11f
|
Fix lint errors
|
8 years ago |
|
yflory
|
4278ac7637
|
Merge branch 'soon' into fileManager
|
8 years ago |
|
yflory
|
2be5db9540
|
Ability to open files in readonly mode
Fix CSS issues
|
8 years ago |
|
ansuz
|
63b9d4e9fd
|
remove path for backwards compatibility
|
8 years ago |
|
yflory
|
f74d0a46a4
|
Remove the alert when pressing del in 'all files'
|
8 years ago |
|
ansuz
|
b39067d2a1
|
jshint compliance
|
8 years ago |
|
ansuz
|
74a12f50ac
|
only migrate keys which don't already exist
|
8 years ago |
|
ansuz
|
1c3f1a15cd
|
make sure that /pad is resized after loading
|
8 years ago |
|
yflory
|
5b08fed7fa
|
Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
|
8 years ago |
|
ansuz
|
a3cd100c94
|
apply yflory's safari patch
|
8 years ago |
|
ansuz
|
0373556475
|
support old hashes in /poll
|
8 years ago |
|
yflory
|
d5561910d4
|
Move the file manager into /drive and add a toolbar
|
8 years ago |
|
yflory
|
1e70af0c16
|
Use the same network for the apps and the file store
|
8 years ago |
|
yflory
|
bf764d26e7
|
Merge branch 'staging' into workgroups
|
8 years ago |
|
yflory
|
3836b20b08
|
enable the file store
|
8 years ago |
|
yflory
|
b0d4dad417
|
Fix creation of a new file manager object
|
8 years ago |
|
yflory
|
5a8f0df19e
|
Add support for reconnecting websocket
|
8 years ago |
|
ansuz
|
b33661d9d5
|
don't toggle maximization state after setting
|
8 years ago |
|
ansuz
|
e56cc49f79
|
catch errors that popped up because of a cross-origin iframe
|
8 years ago |
|
ansuz
|
5080751a90
|
hide unnecessary scrollbar
|
8 years ago |
|
ansuz
|
95617a11c8
|
fix broken paths in old poll
|
8 years ago |
|
yflory
|
7a0442afe0
|
Drag and drop files into a workgroup
|
8 years ago |
|
ansuz
|
05a956879a
|
prepare new poll app for release
move old poll into poll/old
|
8 years ago |
|
ansuz
|
5cd714b18a
|
configure filestore usage via customize/application_config.js
|
8 years ago |
|
ansuz
|
2b5085625c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
69b1764c9d
|
Missing entries in the context menu with users
|
8 years ago |
|
ansuz
|
c6499d6789
|
make panel styles reusable
|
8 years ago |
|
ansuz
|
34967ac354
|
encapsulate rendering functions so we can pass in cryptpad-common
|
8 years ago |
|
ansuz
|
66b8c93205
|
remember time of first visit
|
8 years ago |
|
ansuz
|
ba4df1a22c
|
create examples directory with old prototypes
|
8 years ago |
|
ansuz
|
0abf45bdc5
|
better fsStore debugging
|
8 years ago |
|
ansuz
|
e3f79f914a
|
fix user hash
|
8 years ago |
|
ansuz
|
d232a5a83e
|
Revert "simplify key generation and remember user's additional keys"
This reverts commit 75786ff9ff.
|
8 years ago |
|
ansuz
|
91a806ab86
|
focus on OK button when we pop an alert
|
8 years ago |
|
ansuz
|
850bd42149
|
don't try to display things that don't exist
|
8 years ago |
|
ansuz
|
75786ff9ff
|
simplify key generation and remember user's additional keys
|
8 years ago |
|
ansuz
|
621476424d
|
make strings translatable and refocus on correct input
|
8 years ago |
|
ansuz
|
a97696c712
|
show user's display name and account name
|
8 years ago |
|
ansuz
|
3560f0580f
|
commit prototype upload script
|
8 years ago |
|
ansuz
|
2f9f3d921a
|
trim excess whitespace from usernames
|
8 years ago |
|
ansuz
|
89e5830409
|
make alertify display time configurable
|
8 years ago |
|
ansuz
|
49d80d91d9
|
don't load customize/pad.js anymore
|
8 years ago |
|
ansuz
|
f020fd5a75
|
remove /customize/pad.js from main apps
|
8 years ago |
|
ansuz
|
aae443c8e9
|
replace old poll app with new
|
8 years ago |
|
ansuz
|
387f4ebf5d
|
add this important js file I forgot
|
8 years ago |
|
ansuz
|
8f0de589dc
|
add missing cp class to more html
|
8 years ago |
|
ansuz
|
e9376a66c2
|
apply 'cp' class for unified styles
|
8 years ago |
|
ansuz
|
8b034a9554
|
better flow and animations for login page
|
8 years ago |
|
ansuz
|
db12b5e896
|
move text for login page into translation file
|
8 years ago |
|
ansuz
|
5e1d8292c5
|
guard against trying to parse special fragments
|
8 years ago |
|
ansuz
|
51067430f9
|
more restructuring of user app
|
8 years ago |
|
ansuz
|
a4ed2388e2
|
use 'box' class
|
8 years ago |
|
ansuz
|
eb620bee77
|
restructure user application
|
8 years ago |
|
yflory
|
a10eac2773
|
Fix lint errors
|
8 years ago |
|
ansuz
|
52a593c2c2
|
fix jshint complaints
|
8 years ago |
|
ansuz
|
53a4d4738a
|
really make sure you're logged out
|
8 years ago |
|
ansuz
|
63cd5c16ac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
|
8 years ago |
|
yflory
|
81259fc25f
|
Refresh unsorted and templates when files data changes
|
8 years ago |
|
ansuz
|
5534da8abf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
|
8 years ago |
|
yflory
|
9b6c9e3891
|
Add support for templates in the file manager
|
8 years ago |
|
ansuz
|
acfc27f5c5
|
fix merge conflicts
|
8 years ago |
|
ansuz
|
3197b62fbb
|
latest work
|
8 years ago |
|
ansuz
|
29d406b7a9
|
implement cryptput
|
8 years ago |
|
ansuz
|
84d5e4b35d
|
better tools for playing with template code
|
8 years ago |
|
yflory
|
1772cc93c8
|
Fix the taildoc bug
|
8 years ago |
|
yflory
|
87abfff66b
|
Fix Flash Of Unstyled Content (fouc)
|
8 years ago |
|
ansuz
|
86cda4357b
|
handle more possible cases
|
8 years ago |
|
ansuz
|
1682d23c1c
|
remove old user prototype
|
8 years ago |
|
yflory
|
046220f239
|
Add info boxes for the different categories
|
8 years ago |
|
yflory
|
403ba53980
|
Fix typo error
|
8 years ago |
|
yflory
|
e9418af88b
|
Add an info box in the file manager
|
8 years ago |
|
yflory
|
c359c27997
|
Use user object as default store in file manager
|
8 years ago |
|
yflory
|
4aed585574
|
Fix style issues in the toolbar
|
8 years ago |
|
yflory
|
f9db7e588e
|
Fix unused backup in localStorage
|
8 years ago |
|
yflory
|
c7e63f63fd
|
Use the user object in file manager if it exists
|
8 years ago |
|
ansuz
|
6778a7062d
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
bd6992da0a
|
create a random hash
|
8 years ago |
|
ansuz
|
2cd50498c2
|
add log(in|out) functions to common
|
8 years ago |
|
ansuz
|
dfea802c77
|
better crypto hygeine, start thinking more about ui
|
8 years ago |
|
yflory
|
e3f484d876
|
File manager in the home page, lint
|
8 years ago |
|
ansuz
|
7df460c766
|
implement createChannelId api
|
8 years ago |
|
ansuz
|
3698fe8b0e
|
Merge branch 'soon' into login
|
8 years ago |
|
ansuz
|
5a14db9f07
|
Merge branch 'test-filemanager' into login
|
8 years ago |
|
ansuz
|
dd46b9425a
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
8 years ago |
|
yflory
|
4646d5c866
|
Add suport for read-only mode in the file manager
|
8 years ago |
|
ansuz
|
2a624a0b60
|
add example usage for cryptget.js
|
8 years ago |
|
ansuz
|
303953a431
|
Merge branch 'soon' into login
|
8 years ago |
|
ansuz
|
6b9529b121
|
implement ajax-like functionality for zk docs
|
8 years ago |
|
yflory
|
5bc7766f44
|
Use a consistent toolbar across all apps
|
8 years ago |
|
ansuz
|
8a7fda6341
|
Merge branch 'soon' into login
|
8 years ago |
|
ansuz
|
a220742f68
|
fix reversed color settings
|
8 years ago |
|
ansuz
|
308db7fa79
|
fix uncolored /pad/ content in IE
|
8 years ago |
|
ansuz
|
67baf30d65
|
basic outline of logins
|
8 years ago |
|
ansuz
|
2968488278
|
convert uint8 arrays to hex
|
8 years ago |
|
yflory
|
d95a3ac92e
|
Fix an issue when deleting a key from the proxy
|
8 years ago |
|
yflory
|
82f3d5f852
|
Open the file manager of someone else
|
8 years ago |
|
ansuz
|
c0d96fb10d
|
Merge branch 'login' into test-filemanager
|
8 years ago |
|
yflory
|
c3e3aa69c3
|
Merge branch 'fileManager' into fmIndex
|
8 years ago |
|
ansuz
|
5d335ba796
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
8 years ago |
|
yflory
|
8e6830d080
|
Fix file manager with a chosen hash
|
8 years ago |
|
yflory
|
2b077a8e95
|
add the file manager in the main page
|
8 years ago |
|
ansuz
|
f36d15d0db
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
8 years ago |
|
yflory
|
b7f2ef97c7
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager
|
8 years ago |
|
yflory
|
fdb5c2ddb5
|
Fix UI issues with rename and delete actions
|
8 years ago |
|
yflory
|
319ce5d8c8
|
Fix the code app
|
8 years ago |
|
yflory
|
ee56f5608f
|
Fix the infinite spinner bug with the file manager store
|
8 years ago |
|
yflory
|
43ccd11adc
|
Merge branch 'infiniteSpinner' into fileManagerMerge
|
8 years ago |
|
yflory
|
05fd6c1563
|
Fix the infinite spinner problem
|
8 years ago |
|
yflory
|
5cd7d8ec84
|
Fix undefined userid in new poll
|
8 years ago |
|
yflory
|
cb43eb9ca1
|
Merge branch 'newpoll' into fileManagerMerge
|
8 years ago |
|
yflory
|
9b3719e0ae
|
Merge branch 'soon' into fileManagerMerge
|
8 years ago |
|
yflory
|
b7b4a034a3
|
Merge branch 'soon' into newpoll
|
8 years ago |
|
yflory
|
ddc99cecb1
|
Fix lint errors
|
8 years ago |
|
yflory
|
f26cdb1a21
|
Fix UI issues, unclickable user column, add confirm dialog
|
8 years ago |
|
yflory
|
6feb8548b3
|
Prevent the proxy handlers from being called on the parents
|
8 years ago |
|
yflory
|
740b6e955e
|
Improve UI, fix issues with the table
|
8 years ago |
|
ansuz
|
94fbc2dca4
|
prototype cryptographic login
|
8 years ago |
|
ansuz
|
a23b3d3517
|
use new ot in code too
|
8 years ago |
|
ansuz
|
de0863e232
|
use new ot
|
8 years ago |
|
ansuz
|
4cd9bd5534
|
strip listeners
|
8 years ago |
|
ansuz
|
b79618c94a
|
don't allow listeners in /slide/
|
8 years ago |
|
ansuz
|
ebff304602
|
turn off some unwanted behaviour
|
8 years ago |
|
yflory
|
6dff82ede2
|
Improve UI, scrollbar in the table, publish/admin buttons
|
8 years ago |
|
yflory
|
90804ed9e0
|
Add usernames/userlist in the toolbar and fix publish button
|
8 years ago |
|
yflory
|
3632834500
|
Lock inputs when the user is not editing them
|
8 years ago |
|
yflory
|
eaeaf4df40
|
Improve UI, add title input and forget button
|
8 years ago |
|
yflory
|
bca746bbb5
|
Fix uncommitted column, add toolbar
|
8 years ago |
|
yflory
|
ffedcb63f7
|
Display own column at the beginning, add uncommitted column
|
8 years ago |
|
ansuz
|
4a4d4a0474
|
most recent work
|
8 years ago |
|
ansuz
|
e5ff7020fb
|
move buttons out of form
|
8 years ago |
|
yflory
|
c88fa34558
|
Improve UI, fix issues with new file manager channels
|
8 years ago |
|
yflory
|
5a5451d94c
|
Sort elements in the trash, add properties in the context menu, fix issue with Edge
|
8 years ago |
|
yflory
|
19e4a2d044
|
Create new files, sort displayed elements
|
8 years ago |
|
yflory
|
a957b72598
|
Create a new pad from the file manager
|
8 years ago |
|
yflory
|
4fcdece4af
|
Test create new pad from the file manager
|
8 years ago |
|
yflory
|
d6e1215166
|
Refresh the directory if needed when the object has changed
|
8 years ago |
|
yflory
|
118829617f
|
Use the FS store as default store
|
8 years ago |
|
yflory
|
aa14ea7ac4
|
Use the old store format
|
8 years ago |
|
yflory
|
da19608269
|
Translate the context menus, Shift+Del shortcut and realtime object
|
8 years ago |
|
yflory
|
7a035fa4a0
|
Fix drag and drop with multiple elements selected
|
8 years ago |
|
yflory
|
d77970975c
|
Add translations, ability to select multiple elements, clean the code
|
8 years ago |
|
ansuz
|
eb50177201
|
do a bit of work to preserve cursors
|
8 years ago |
|
ansuz
|
ac43f4cb1f
|
new prototype poll
|
8 years ago |
|
yflory
|
f05efbb113
|
Clean the code
|
8 years ago |
|
yflory
|
851d3df656
|
Ability to see, move and delete unsorted files
|
8 years ago |
|
yflory
|
43d93938c3
|
Fix the list, find the unsorted files, ability to add a folder
|
8 years ago |
|
yflory
|
cfe3d38197
|
Add expend/collapse to the tree, fix CSS, add list/grid view modes
|
8 years ago |
|
yflory
|
c9cd06514c
|
Add "restore" from trash, improve drag and drop and update css
|
8 years ago |
|
ansuz
|
4c5cb79c20
|
Merge pull request #58 from xwiki-labs/replaceState
use replaceState if available
|
8 years ago |
|
ansuz
|
c2770a7a74
|
set correct hash even if browser does not implement replaceState
|
8 years ago |
|
ansuz
|
d009b7400c
|
fall back to default title if one is not suggested
|
8 years ago |
|
ansuz
|
e77ad4e909
|
better fixes for export
|
8 years ago |
|
ansuz
|
75dd4a5926
|
slightly better test for variable
|
8 years ago |
|
ansuz
|
b7d9998b9b
|
fix reference to undefined variable
|
8 years ago |
|
ansuz
|
303c65f2c3
|
use replaceState if available, instead of setting the hash
|
8 years ago |
|
yflory
|
8e1bff706b
|
Add drag and drop, rename and delete actions
|
8 years ago |
|
ansuz
|
67bf41627d
|
comment out dead code so CI doesn't complain
|
8 years ago |
|
ansuz
|
002e22ee9a
|
turn off unwanted behaviour until we can do it correctly
|
8 years ago |
|
ansuz
|
5fc44a6e4b
|
Merge branch 'soon' into fixpolls
|
8 years ago |
|
yflory
|
ce9eb47351
|
Initial state of the file manager app
|
8 years ago |
|
ansuz
|
2d5448458b
|
export messages
|
8 years ago |
|
ansuz
|
b1370c05b7
|
add translation completeness test to assertion page
|
8 years ago |
|
ansuz
|
5f6ebb5cc1
|
fix incorrect regex for c-like title detection
|
8 years ago |
|
ansuz
|
d512b113cd
|
address failure to parse url when hash is not present
|
8 years ago |
|
ansuz
|
6ae851ffdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon
|
8 years ago |
|
ansuz
|
636b0fcadc
|
do our best to keep the console quiet
|
8 years ago |
|
yflory
|
3de4e5709b
|
Clean the code
|
8 years ago |
|
yflory
|
ab1d3958ce
|
Add a pencil icon when hovering the title
|
8 years ago |
|
yflory
|
6d1e06cca3
|
Add notifications when a user joins or leaves the channel
|
8 years ago |
|
yflory
|
54a63267cd
|
Add a share button and merge the viewers and editors buttons
|
8 years ago |
|
yflory
|
87d86384ac
|
Fix broken elements in the new toolbar
|
8 years ago |
|
yflory
|
6351d1856f
|
Remove the top bar and move its content in the applications' toolbars
|
8 years ago |
|
yflory
|
3d74290c7d
|
Merge branch 'usability5' into staging
|
8 years ago |
|
yflory
|
9e92a597b3
|
Ability to edit the title in the toolbar by clicking it
|
8 years ago |
|
ansuz
|
0a9d34a6c9
|
hide appended color pickers
|
8 years ago |
|
ansuz
|
c858b247c1
|
filter absent users from the userlist
|
8 years ago |
|
ansuz
|
ac3ddbab70
|
expose userList for later usage
|
8 years ago |
|
ansuz
|
a8612ed1c7
|
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
Yann Flory
|
10bb5e1607
|
Add the title in the toolbar
|
8 years ago |
|
Yann Flory
|
1e003b13a8
|
ask anonymous, first-time users to set their name when they first join a pad
|
8 years ago |
|
ansuz
|
5d9b81ab2f
|
Merge pull request #53 from xwiki-labs/update
minor fixes to html and userlist
|
8 years ago |
|
ansuz
|
46c5f64369
|
remove absent users from the userlist
|
8 years ago |
|
yflory
|
51a79c5218
|
Remove unused dependency
|
8 years ago |
|
yflory
|
9a733bb360
|
Fix dropdown menus with Edge
|
8 years ago |
|
yflory
|
39bbf8a6c1
|
Fix the new userlist button and make the toolbar responsive
|
8 years ago |
|
yflory
|
24fbe22c9d
|
Improve the toolbar style and the way the userlist is displayed
|
8 years ago |
|
yflory
|
d2389a5729
|
Change the userlist in the toolbar
|
8 years ago |
|
yflory
|
e739c49e7f
|
Remove the 'about' button in ckeditor
|
8 years ago |
|
yflory
|
b23fe783e3
|
Fix the color picker in Chrome and hide the buttons when not supported
|
8 years ago |
|
yflory
|
91b4446c0b
|
Merge branch 'fix-chrome-style-bug' into soon
|
8 years ago |
|
yflory
|
53fe002d3b
|
Merge branch 'slide' into soon
|
8 years ago |
|
yflory
|
6c04b7967d
|
Remove unused library
|
8 years ago |
|
yflory
|
d63c912af0
|
Use the HTML5 color picker to change the colors in slides
|
8 years ago |
|
ansuz
|
bb2317d8e6
|
fix chrome style bug by forcing reload of style sheet
|
8 years ago |
|
yflory
|
765498e88e
|
Remove the support for old.cryptpad.fr
|
8 years ago |
|
yflory
|
d7e170c797
|
Test colorpicker
|
8 years ago |
|
Yann Flory
|
81fce1237f
|
Colorpicker to choose the background color in present mode
|
8 years ago |
|
yflory
|
5300bc363c
|
Fix a race condition in the slide application
|
8 years ago |
|
yflory
|
c322aa440e
|
Fix the username icon hcih was not working anymore
|
8 years ago |
|
yflory
|
8575f3f79f
|
Fix the "rename" feature which was not working anymore in some cases
|
8 years ago |
|
yflory
|
a989b51d74
|
Fix race conditions with Alertify
|
8 years ago |
|
yflory
|
74df38f94f
|
Fix race conditions that could prevent applications from being loaded
|
8 years ago |
|
ansuz
|
a28daf2715
|
use websocket url configuration api
|
8 years ago |
|
ansuz
|
dbc8f01b8b
|
fix merge errors and reach full jshint compliance
|
8 years ago |
|
yflory
|
a30e17121d
|
Merge branch 'readonlyButton' into soon
|
8 years ago |
|
yflory
|
e84a54556c
|
Move the toolbar buttons' events handlers in cryptpad-common
|
8 years ago |
|
ansuz
|
2ac1b02572
|
Merge branch 'config-sockets' into soon
|
8 years ago |
|
ansuz
|
11f63c861c
|
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
|
8 years ago |
|
ansuz
|
5e76194262
|
use new config api
|
8 years ago |
|
ansuz
|
3dfa19b786
|
more flexible websocket configuration (WIP)
|
8 years ago |
|
yflory
|
76fdadee7f
|
Store only the strongest hash in the localstorage
|
8 years ago |
|
yflory
|
1c808b3da8
|
Add comment for the 'important' css rule
|
8 years ago |
|
yflory
|
17b4f91810
|
Do not share the title in the doc if it is the default title
|
8 years ago |
|
yflory
|
391728ee6d
|
Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
|
8 years ago |
|
yflory
|
8c33218ceb
|
Move the codemirror themes in /common
|
8 years ago |
|
Yann Flory
|
2609af2105
|
Use the CodeMirror editor in the slide application
|
8 years ago |
|
yflory
|
b5b0eacebc
|
Remove the old (non-bower) codemirror
|
8 years ago |
|
yflory
|
261d2fecbc
|
Get codemirror from bower and use that version in the code app
|
8 years ago |
|
yflory
|
bc73fa2074
|
Merge branch 'fontawesome' into soon
|
8 years ago |
|
yflory
|
f03018f3bc
|
Improve the top bar and use the font awesome icons in /code
|
8 years ago |
|
ansuz
|
0be8c333e0
|
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
|
8 years ago |
|
yflory
|
3d54413343
|
Improve the UI with FontAwesome icons
|
8 years ago |
|
ansuz
|
a266f0bee1
|
query parameter for messages
|
8 years ago |
|
yflory
|
c16e8d603b
|
Enable reconnecting websocket in code pad
|
8 years ago |
|
ansuz
|
d6525087c7
|
jshint compliancy
|
8 years ago |
|
ansuz
|
ed9acf1c00
|
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
|
8 years ago |
|
ansuz
|
a4843cb5d7
|
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
|
8 years ago |
|
ansuz
|
a82b7aaf8b
|
allow empty names
|
8 years ago |
|
yflory
|
2267ec8c43
|
Slides in read-only were not updated with the latest content
|
8 years ago |
|
Yann Flory
|
eac0cdd6dd
|
Enable read-only mode in slides
|
8 years ago |
|
yflory
|
d46bd1af5c
|
Improve the toolbar UI with the username displayed
|
8 years ago |
|
yflory
|
79884e2400
|
Use the same username for all pads
|
8 years ago |
|
yflory
|
73d5ea967b
|
Fix an error created by the merge
|
8 years ago |
|
yflory
|
dde519795d
|
Merge branch 'newhash' into newhashNoConflict
|
8 years ago |
|
yflory
|
99004428d5
|
Enable the read-only mode in Cryptpoll
|
8 years ago |
|
yflory
|
47e8be1681
|
Remove the IMPORT button and editor toolbars in read-only mode
|
8 years ago |
|
ansuz
|
f29e3d7b0d
|
don't let notifications interfere with document titles
|
8 years ago |
|
ansuz
|
a9e2ca8d72
|
make tests green again
|
8 years ago |
|
yflory
|
83705ae058
|
Improve the UI in read-only mode
|
8 years ago |
|
ansuz
|
e6785b4dad
|
push /pad/ state once ready to avoid OT collision
|
8 years ago |
|
ansuz
|
723df4880e
|
Merge branch 'slides' into merge-slides
|
8 years ago |
|
ansuz
|
b96f050555
|
Merge branch 'board' into merge-boards
|
8 years ago |
|
ansuz
|
fa8199bc75
|
don't try to use experimental user code
|
8 years ago |
|
ansuz
|
2d42cadb23
|
push /code/ state once ready to avoid OT collision
|
8 years ago |
|
ansuz
|
bf5dac58dd
|
Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
|
8 years ago |
|
Yann Flory
|
bf8c9a2c4b
|
Add a button to get the read only URL
|
8 years ago |