f88a6f63fe
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fb4808e1e1
Fix queries callback arguments
7 years ago
6dd1643738
Manual merge work done on loading page to pad2
7 years ago
8b702e0150
wip
7 years ago
e65b2f4e9f
Add shareButton to pad2
7 years ago
beb45740d0
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
90f892de9c
Useradmin menu, notifications and share button in pad2
7 years ago
253ab68d8d
Merge branch 'staging' into new-messaging
7 years ago
498c8229e9
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
7 years ago
0693a98890
create a thumbnail when uploading images from whiteboard
7 years ago
b17044ad98
add support for thumbnails in metadata
7 years ago
dd9b38066e
Change display name in useradmin menu
7 years ago
a96d447e8b
Add notifications in pad2
7 years ago
cf6d8c83b2
Fix title setter logic and separate it from UI
7 years ago
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
415399ef64
Changes to support title change in metadata
7 years ago
d1affebd14
Title in pad2
7 years ago
604415b32c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fab3d67b75
Enable title in pad2
7 years ago
909bda4302
This should fix laxy metadata
7 years ago
a4dbf39c4a
fix pdf display problems in chrome
7 years ago
2490ee253f
Added setDisplayName RPC
7 years ago
887a26b1a6
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
0b34ceb0eb
Added RPC setPadTitleInDrive()
7 years ago
bed7d95bf3
use latest compiled cryptpad media-tag
7 years ago
3a5526e247
infer pdfjs document title from iframe url
7 years ago
25466aa2f9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
1d237735ef
Useradmin menu in pad2
7 years ago
3b5af3ea74
sframe common changes
7 years ago
d1157c4d72
Add missing file
7 years ago
d237c76f6c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
f5855a2870
Add account name in metadata manager
7 years ago
3c0197cbf4
Firefox fails to boot the iframe if there is no number on setInterval
7 years ago
d88704fb50
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
a4850a7fcc
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fc5bdd3bed
Add lazy metadata to fix parse errors in pad2
7 years ago
ad9f2ff223
Made pad2 server more generic and easy to implement
7 years ago
a125253cde
lint compliance
7 years ago
290763d6c5
don't complain about bad realtime state just because you disconnected
7 years ago
226ef1fd00
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fb512c8923
Toolbar in pad2
7 years ago
3b20dcd435
add optional cache-busting to favicon
7 years ago
ee874878dd
clear tooltips when the userlist is redrawn
7 years ago
f207edfd28
handle errors when deriving keys. fix incorrect reference
7 years ago
e04c0b89a1
manual merge of staging
7 years ago
130b330ede
refactor messaging
7 years ago
736288a85b
lint compliance
7 years ago
5037f444e9
update markdown sanitization strategy
7 years ago
878a565f89
tiny little performance improvement in something that really doesn't need it
7 years ago
7a698d092e
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
7 years ago
17b986a6ca
fix toolbar drive link (oops)
7 years ago
284124a32d
WIP
7 years ago
4acd9957a9
Set the url if there is none
7 years ago
33e73dd5e5
fixed one last fight
7 years ago
9c0b0cc6a8
Merge branch 'staging' into pad2
7 years ago
1e56fa31c0
yay, they talk and they don't fight
7 years ago
1c526feffb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
b3d349bf80
Merge branch 'staging' into pad2
7 years ago
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
0dde1d7507
wip
7 years ago
baf64114a6
point to homepage in drive
7 years ago
c304071492
wip
7 years ago
e49a42db18
Merge branch 'staging' into pad2
7 years ago
1f9bd866c3
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
edad5deeac
fix logo not showing sometimes in chrome
7 years ago
52565076b9
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
4b25ab80d6
wip
7 years ago
844967a880
continued refactoring
7 years ago
a4aeada585
make the file dialog placeholder visible, center file list
7 years ago
e08ed72653
generate the tooltip after the button
7 years ago
665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended
7 years ago
34ba673cd3
improve file upload UI
7 years ago
34a5a32c44
lint compliance
7 years ago
cdf3cee9c8
split out message rendering into ui
7 years ago
fcdfa52aa9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
58b3b32cc3
big messaging refactor. split UI from logic
7 years ago
6ca6755d02
more missing titles in toolbar
7 years ago
d3f2398865
bump tippy to 1.2.0, add dynamicTitle option
7 years ago
8301bd44be
Merge pull request #164 from pbondoer/staging
...
UI improvements
7 years ago
f585ddccdf
fix image sizes in /slide/
7 years ago
fc95f1b6a8
lint compliance
7 years ago
ba9696ba33
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a612f02be2
Merge branch 'staging' into pad2
7 years ago
c63807fd2b
implement channel.send
7 years ago
35a55a15ed
wip
7 years ago
d835005905
simplify in-memory message format
7 years ago
8f285eba9f
make file picker ui even prettier
7 years ago
797cc2b105
handle messages which fail to decrypt
7 years ago
65dfd99171
major wip
7 years ago
c53e738054
improve file picker ui
7 years ago
bad5160885
fix bad reference
7 years ago
05aa5ed347
hide new feature until it is finished
7 years ago
395f6e1b27
reset confirm text for alertify
7 years ago
9865359bb0
don't tell users about new versions
7 years ago
c8c44d3bfc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
0d1f19f5d4
Big manual merge
7 years ago
f6d45d05f6
use logo in toolbar
7 years ago
11c72499a0
don't add duplicate messages to the history
7 years ago
52854c5a8e
ignore history range responses
7 years ago
e786117110
get new messages when reconnecting and WIP get more history
7 years ago
2ce341fed6
disable input field when disconnected
7 years ago
66d81429bd
integrate file embed into code editor
7 years ago
8b0831ac5d
save images drawn with whiteboard to your CryptDrive
8 years ago
fe826133b3
make some markdown styles reusable
8 years ago
35cf23ce2c
clear tooltips when redrawing the userlist
8 years ago
4c6f8d71e1
don't invoke spinner if it does not exist
8 years ago
311f709dc4
lint compliance
8 years ago
c147d342a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
542d0cd17f
drop support for legacy pad list
8 years ago
93e007b52a
reduce png sizes
8 years ago
3fa010027c
implement clearTooltips
8 years ago
a68a225d79
fix read-only synchronization bug
8 years ago
796bf89491
Update of the front-page
8 years ago
658b00814b
TodoApp - Style and translations
8 years ago
ae693ff5a7
lint compliance
8 years ago
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
55cb0734e2
make bad state timeout configurable
8 years ago
469f49fc0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a80b00a765
Move the file picker in common
8 years ago
d44f0696af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
2d0635a409
use custom version of tippy
8 years ago
09793e0d7d
jshint
8 years ago
683769f30a
Fix tooltips
8 years ago
9633025afe
CSS for the removeHistory button in contacts
8 years ago
97f1bbedc5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b9bba76b4e
Make the delay for tooltips configurable
8 years ago
dd98e2222a
WIP erase chat history button
8 years ago
128d5b2c6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b22127f10c
add history removal
8 years ago
a5a73ce326
Fix print button in slide
8 years ago
140964478e
Enter + shift key to add a new line in chat
8 years ago
e26e041a5b
fix jshint errors
8 years ago
c33d2a2db0
New tooltips
8 years ago
b56a782f01
Store the userlist state when it is closed using the icon
8 years ago
82c87144cb
Remove the friend request button when the request is sent
8 years ago
5ce49af57b
Make CryptDrive fast again
8 years ago
e2d031c76a
Add support for markdown syntax in contacts
8 years ago
cba113a2b0
Lint
8 years ago
91ebbdfdb4
View contact status
8 years ago
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
8 years ago
f719b34e09
Add tab notification in contacts
8 years ago
baf439648e
Add the contacts app in the dropdown menu
8 years ago
36d792874a
Fix initial text not removed in /contacts
8 years ago
df0442c2bf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
eb4b5ca77c
stub history removal. coming soon
8 years ago
aa8181ab2b
Contacts app translations
8 years ago
73e32f273e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
009d01abde
Fix friend removal and update user data
8 years ago
1aecdeb075
fresh media tag build
8 years ago
7114bfaa52
lint compliance
8 years ago
e2c17dbeb4
resolve conflicts
8 years ago
557f13f796
Unfriend and update username - beta
8 years ago
96d2ff67e1
user-plus as icon for add-friend
8 years ago
c3ba7cd792
fix race condition
8 years ago
d0d38aa2a3
feedback on first visit
8 years ago
9527a5def7
avoid a CSP error. silence pdfjs warnings
8 years ago
9707433944
comment out debugging info
8 years ago
575d4612f9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
eda9908c3b
prevent accessing attributes of null
8 years ago
eeb2ee2d17
add clear channel rpc
8 years ago
89af8e4472
fix funny off-by-one thing
8 years ago
ac684a8dc7
Use the APP toolbar in profile
8 years ago
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b3e225cb3b
Replace spinner by text and fix mobile UI
8 years ago
f450a28d11
improve logic for guessing titles within code documents
8 years ago
0483d15b8f
lint compliance
8 years ago
c0cb5c4263
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f4bca0f9c0
Modifications for latest media-tag
...
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
8 years ago
5b3cca58bd
modifications to handle latest media-tag
8 years ago
7f5c301734
Add display name in the settings useradmin menu
8 years ago
fb21a650ce
Lint errors
8 years ago
159ccc2866
Fix mediatag flickering
8 years ago
16d0527e92
Add a page title in drive, settings and file
8 years ago
a0b14faf89
Fix the font in settings and drive
8 years ago
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
8 years ago
438e7e6cf9
Fix display name in useradmin (friends app)
8 years ago
e6188bfb63
Fix useradmin dropdown position
8 years ago
97d8d86395
Fix avatar in static pages
8 years ago
e8f3df5a46
Clean less
8 years ago
159d72f33b
Merge branch 'msg' into staging
8 years ago
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ff10c282d4
Avatar in the user admin button
8 years ago
be6ee672d3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f0523a0153
Avatar in the user admin menu
8 years ago
e10de1219b
feedback on view hash usage
8 years ago
52eb8e307c
feedback for language used
8 years ago
1c531ccd47
Pin the chat channels
8 years ago
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
8 years ago
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
22fbc7e5d8
implement getter for public keys
8 years ago
df103c4074
Messaging app
8 years ago
1c462d5c4a
use random token for feedback instead of date
8 years ago
21f1527c71
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
5c7441f82c
Display the friend list in the friend app
8 years ago
fac715dd09
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
4b23ef74d7
add support for curve message signing and curve validateKeys
8 years ago
a5e8f6ae81
Add friend app and fix avatar size
8 years ago
af31771e3a
Share a channel id, not a hash
8 years ago
852b2eaf1d
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
26a83003b5
Create an owned channel
8 years ago
5b5a7ab286
Hide the friend button when the resquest is accepted
8 years ago
d3bbdc27c0
lint compliance
8 years ago
bce0b03ba4
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
909e00bbc3
create a listmap object using public key crypto
8 years ago
96fde4e5ed
Add missing file
8 years ago
df53166b37
implement and use prototype curve encryptors
8 years ago
d293ba4d44
add support for invite hashes
8 years ago
37d5b0afb9
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
95e2efab89
Add to friend list
8 years ago
e353627204
log users out if they do not have curve keys. add curve keys to object on registration and login.
8 years ago
4016a95540
prototype invite app
8 years ago
465ef74f2b
Fix rpc
8 years ago
bf17ad3f1e
Friend button in the userlist
8 years ago
8dc8aa27ab
Lint
8 years ago
35e8c1a63b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
43ac71603c
Move pad attributes in pad data
8 years ago
9f6ecea5d9
fix nacl reference error in media tag
8 years ago
69f4ce2abd
Fix middle click on the drive button
8 years ago
cbd9fc4076
Merge branch 'staging'
8 years ago
3fe0baa956
disable pin limit caching
8 years ago
9c1eaf9c1a
lint compliance
8 years ago
cab595f959
Fix duplicate folders in the drive
8 years ago
ac8da0d52d
load codemirror in the correct context. fix selection events
8 years ago
43b877ad27
fix styling on media tag download button
8 years ago
1fd0ba488a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
04a28433ae
replace inner content of media tag download buttons
8 years ago
f85af7ef4c
hide useless messages
8 years ago
a59853f9c2
use new media tag
8 years ago
8cf694bea6
Lint
8 years ago
47c6c64b8a
Allow emojis in default avatars
8 years ago
ffd184d50e
Fix overflowing names in the new userlist
8 years ago
92d88d1644
don't change allowed media types until we have media-tag scoping
8 years ago
fa2d857d70
Fix css issues with Safari
8 years ago
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8b0210baf1
hide useless error
8 years ago
991cb896bd
Fix avatar in /pad
8 years ago
6ac056e314
make explicit file size RPCs unauthenticated
8 years ago
5694505719
Fix syntax highlighting
8 years ago
335898a4c7
Hack the drawer to close it when clicking outside
8 years ago
472a62730b
Fix profile creation and add a link to the profile app
8 years ago
b153dda6ff
Add avatars in the user list
8 years ago
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
568ce70afd
Add a spinner for the history and update history buttons
8 years ago
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c25f2df721
Added caching versions to some of the images which are loaded by js
8 years ago
7e69d051c4
Lint errors
8 years ago
26193aeaa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b9320e6005
Toolbar improvements
8 years ago
75c2a1fd73
jshint compliance
8 years ago
b8934c0b97
smarter redraws of drive/settings usage bar
8 years ago
cc5b7615ad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ed0121d172
Lint errors
8 years ago
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
8 years ago
b037cfbfdb
set usage tips relative to bottom of screen, not top
8 years ago
1763cf72d1
tell anonymous users they can't upload
8 years ago
7a87775372
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
45f180955b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
56a25e1036
Small fixes for the new toolbar
8 years ago
1179992a90
update feedback key name
8 years ago
39149a052b
add new feedback keys
8 years ago
9b8866ed72
handle RPC_NOT_READY error for logged out users
8 years ago
a9f8f42e3c
use minified less compiler
8 years ago
877c5a8d0e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
19ff8a345d
Avatar upload in the profile app
8 years ago
5e56ad912e
remove the last bit of compiled css
8 years ago
7a7307d560
fix logging when resetting
8 years ago
6c94605b9b
File upload in the profile
8 years ago
1c1869a22c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f232675cc9
create a favicon if it does not already exist
8 years ago
3be6433fdf
send feedback on name changes
8 years ago
bb74935b08
allow pin limit caching to occur at api level
8 years ago
00a554ca0d
Fix the donate button style with the new toolbar
8 years ago
e9bfaa9a60
compile less clientside. remove compiled css
8 years ago
67a096a8a4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7b37146034
don't let spacebar keyups propagate outside of the title
8 years ago
9195c0cd12
is isOverPinLimit in toolbar
8 years ago
fce0a37f50
cache pin data once retrieved from the server
8 years ago
33ea8cb183
Make sure we don't call both the yes and no handlers in prompts
8 years ago
51e06e68a7
don't change slides when navigating through history
8 years ago
38f568635d
Fix duplicate media-tag in slides when adding or removing a slide
8 years ago
cc341ca6d4
Lint error
8 years ago
0d4d104e08
Mobile support for the new toolbar
8 years ago
b4b851959f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
61a891267f
more feedback
8 years ago
c1d2fa6b52
Unhack validateKey for the history mode
8 years ago
2710279904
Use the new share button in the file app
8 years ago
684269fdda
Userlist in polls
8 years ago
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
13288ee18b
Update the userlist in code, slide and pad
8 years ago
852c028822
don't allow editing if pad type is wrong
8 years ago
92b6e60573
Small improvements for the new toolbar
8 years ago
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
115813c191
Merge branch 'new-templates' into staging
8 years ago
ab54dcf84d
make libs pass jshint
8 years ago
8d956c3de6
New toolbar
8 years ago
48f9745619
clientside templating
8 years ago
b7a0547b77
New toolbar colors
8 years ago
3052ec8abb
Merge branch 'newCk' into staging
8 years ago
c22f610d5c
Fix the drive integrity check
8 years ago
fb388f2610
Fix an issue with invalid drive before migration
8 years ago
59fb5bd8be
One toolbar color per app
8 years ago
5a248db267
Merge branch 'staging' into newCk
8 years ago
728272d936
Fix undefined function
8 years ago
a38819f5b9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1ad1b78c64
Fix the history mode with readOnly and old URLs
8 years ago
f29f430e7c
better handling of non-rpc messages
8 years ago
e40f43bd20
Migrated pads were not displayed instantly in the drive
8 years ago
a5924cb803
Make sure the initial title is set in the userDoc when creating a new pad
8 years ago
0e9ebddf11
fix the things
8 years ago
c0e2c1060e
don't reload when slide hash changes
8 years ago
594405de73
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
cbe21959b4
Update UI for the file/media app
8 years ago
17146d7af9
send feedback for uploads
8 years ago
2068a8b85b
Embed the mediatag library in the file app
8 years ago
66b076111e
Add an upload button to the slide's file picker
8 years ago
b480346f5b
more efficient media-tag
8 years ago
0d47e68d3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0eb50b8b6c
drop pdf.js dependency
8 years ago
a237eec41e
Add a file picker in the slide app
8 years ago
d25a0893cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
3184e5d235
don't reload page on hash mode change
8 years ago
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a98353af6c
Add a button to upload a file in the drive
8 years ago
295f9c00a6
send feedback on buttons
8 years ago
497ddeee6d
Upload files with drag&drop in the drive
8 years ago
687b4d8307
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
69c3bd392f
update built media tag to latest XWiki version
8 years ago
d8ebe566d8
Don't call mediatag for non-image files
8 years ago
37d3d04f0e
Clean mediatag integration code
8 years ago
802146e2af
don't put download buttons in a div
8 years ago
19cb920a7c
Don't redraw a media-tag everytime the content has changed
8 years ago
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f9c26645cf
Upload images using the slide app
8 years ago
17e4e9be27
download anything that isn't an image in media-tag
8 years ago
1b574da053
fix typo
8 years ago
7ad89bd9af
don't interrupt boot because of localStorage failure
8 years ago
3337e2133a
more thorough tests for localStorage presence
8 years ago
4eeea93265
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
11e2226f1a
Fix lint errors
8 years ago
c779e328e8
warn users if their browser does not support localStorage
8 years ago
d7292e69c6
Fix undefined variable
8 years ago
803bad1421
Move the file upload code in a separate file
8 years ago
a58162a617
Make the drive tests work when not logged in
8 years ago
2fb5e3ae35
Merge branch 'staging' into newToolbar
8 years ago
969cec5d60
Make sure everything is synced before migrating the drive
8 years ago
7dd9ed543a
Merge branch 'newDrive' into staging
8 years ago
376b60c21c
New toolbar temp
8 years ago
c9725af508
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
db9b9547d9
don't complain about missing callbacks for messages which are not our responsibility
8 years ago
30bdb9881c
Fix undefined element in select dropdown menus
8 years ago
8471dab6b1
Provide hints in theme and language dropdowns
8 years ago
a5cb5f2ceb
Merge branch 'staging' into newDrive
8 years ago
9cc25d4c9f
Merge branch 'staging' into newDrive
8 years ago
a57f7c6ce7
Fix lint errors
8 years ago
4bcad3e154
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
47857ec382
use cached pinned usage data
8 years ago
75c3c10b20
Merge branch 'soon' into staging
8 years ago
c1402fbb0a
Lint error
8 years ago
b36484931d
Lint
8 years ago
1fb638f519
clean the code
8 years ago
23318357a6
make fewer RPC calls for usageBar
8 years ago
df586a223c
update limits, usage, plan, and note whenever they are checked
8 years ago
8bad0c556e
change log to error
8 years ago
b0e00d337e
more careful validation
8 years ago
fd88162624
Merge branch 'staging' into newDrive
8 years ago
7c9e86e351
Merge branch 'soon' into staging
8 years ago
9694272083
Fix html code not parsed
8 years ago
9ca10ba524
Merge branch 'staging' into newDrive
8 years ago
7f120c8fc1
Merge branch 'soon' into staging
8 years ago
78e6118153
Merge branch 'staging' into newDrive
8 years ago
444c41974e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
8 years ago
6a96aa6819
Disconnect the network when migrating the drive in another tab
8 years ago
2a94bdaf05
test
8 years ago
ca95b5c42b
Remove unused console.log
8 years ago
f8c69573fd
Disconnect other tabs when migrating the drive
8 years ago
c4e5741ae0
update upgrade button logic
8 years ago
f1a9002417
use upgradeURL with usage bar
8 years ago
51e0d40572
Make sure the old storage key is removed after migration
8 years ago
b0fe04381d
Merge branch 'staging' into newDrive
8 years ago
1c2ea04f11
Drive refactoring
8 years ago
fe42f5e88c
ask for new cookies and resend commands on NO_COOKIE errors
8 years ago
da533b106a
improve type checking in getFileSize
8 years ago
d25477e8c6
don't let tooltips interfere with DOM interaction
8 years ago
5641a4a839
Add the file app in the 'new' dropdown menus
8 years ago
ac91d2f413
Fix the upgrade and donate buttons in the home page
8 years ago
ee57458158
Remove the pin limit alert
8 years ago
767793b5ca
fix stuck loading tip
8 years ago
f631973f1f
optimize file upload
8 years ago
55af84cc90
lower spinner timeout interval
8 years ago
07279c8dc7
export boolean Test.testing
8 years ago
71bd808e4f
Send everything through the test global function
8 years ago
244bd7b378
;;;
8 years ago
7d557df74b
a new and more horrible way of sniffing the logs out of the instance
8 years ago
0d4b74cfba
;;;;;; keep these ;;; for later ;;;;;
8 years ago
24f37ea414
Delicious testing
8 years ago
7b94106bac
fix inverted conditional :/
8 years ago
2e03485db4
remove known bad entries from localStorage.userHash...
8 years ago
936bf8df9d
return falsey if userHash is junk
8 years ago
105e5cdac9
fix 'undefined/' userHash
8 years ago
401e908963
use media-tag with xhr error handling
8 years ago
3465710237
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
8 years ago
21c39572be
Update media-tag and fix bower dependencies
8 years ago
ebfa228bc0
add upgrade button to all static pages
8 years ago
149568689a
color donate button green
8 years ago
ec6ad6772b
send feedback on donation
8 years ago
cb2efe138b
Media Tag integration, image, audio, video, pdf
8 years ago
9ca5bc507e
add support for donate button
8 years ago
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
8 years ago
3f3d64992d
resolve merge conflicts
8 years ago
57017c68fa
hacks for cross-domain safari
8 years ago
cf658c1b3a
backport live changes
8 years ago
df2b00122a
New drive structure without file names
8 years ago
d9f7470f06
copy user details into sessionStorage for safari
8 years ago
fd83ae3e61
implement createRandomInteger
8 years ago
dc80b6b11f
throttle markdown preview
8 years ago
e6c04ccb49
bump server after paying for an account
8 years ago
6324d9bbb0
feedback on template feature usage
8 years ago
c3437382fb
Fix the release version in the what's new popup
8 years ago
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
70cae0d2c3
safely access pin reset response
8 years ago
d55b7e411c
Display an alert in the drive when the limit is reached
8 years ago
71dc0af6c7
better test for success error codes
8 years ago
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
538aec6ef5
Display a message when pinPads returns an error
8 years ago
ba5ef5157e
show pretty representations of storage usage
8 years ago
e78299aed6
use async file decryption, listen for progress events.
8 years ago
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d014fccfce
Fix lint error
8 years ago
2082b328b4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
814c81fb13
Display an alert when CryptPad has a new version
8 years ago
34606ea8ba
use newest xwiki media-tag
8 years ago
2cee9534c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
164342920e
fix inverted condition
8 years ago
620f4dc512
Add translations for the markdown preview button title
8 years ago
51bd41d4e8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0bd4caeb7e
Add the task list code to the markdown renderer
8 years ago
d187945e94
jshint compliance
8 years ago
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d13dde856a
Add the markdown renderer file and change code's default content
8 years ago
73ec91aa5e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7befaccd88
move more rpc calls into pinpad
8 years ago
56bcdff890
Add a preview of the markdown content in the code editor
8 years ago
b72415b56b
Fix old hashes not working with the new parser
8 years ago
6b7aeb9121
Fix the text example
8 years ago
fe0f21594a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
953e7155f0
Send only the hostname to the accounts server
8 years ago
afef456b18
fix undefined reference
8 years ago
1a7c4d5ebe
Store the FS_hash in the user object after the merge
8 years ago
87fa28180a
Display an upgrade button in the settings page
8 years ago
c1b43db363
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1542aa96bc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
dc2cdb7c08
Add the usage bar in the settings page
8 years ago
2dd04f7631
get limits from the server
8 years ago
8172f117a7
Fix Hash.alert not a function
8 years ago
0e58859393
Fix lint error
8 years ago
771348720b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
57979f6314
Display the public key using a href in the settings page
8 years ago
a9b670fdf5
don't parse trailing slash as part of encryption key in old hashes
8 years ago
06f3d0eefe
shim isArray if not exists. correctly report how often this occurs
8 years ago
50d9f72b3a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
601226115b
New anonymous drive
8 years ago
30f6ef3f85
handle more response codes, use metadata
8 years ago
18d959ef16
handle non-200 status codes
8 years ago
ed95bbb08f
Fix lint errors
8 years ago
89a993be3c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0f13198119
Move the parseHash code into parsePadUrl
8 years ago
42f3a62cac
handle errors with XHR
8 years ago
6c68b5e6ca
use new media-tag, listen for decryption events
8 years ago
7dd5907ff0
Merge branch 'limit' into staging
8 years ago
a993ab6616
use new encrypted file encoding in media-tag
8 years ago
8c49150725
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e0293a1162
Merge branch 'master' into staging
8 years ago
57ee7de7d4
Update and return the storage limit
8 years ago
371edff943
Fix an error when moving unsorted files to root in the drive
8 years ago
b76dcba1d6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6d30d7f89f
strip junk bytes from base64 more safely
8 years ago
8f5989b6b0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
cf81b02096
Make sure the spinner is always centered in the loading screen
8 years ago
5c8586f8a3
Fix typo in file upload
8 years ago
96ccb94397
Add the share button when a file upload is complete
8 years ago
c00158d23a
Move code to common-history
8 years ago
922e7803e9
remove extraneous slashes from hashes when parsing
8 years ago
a338b23f40
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
df47b913e3
fetch array buffers in cryptpad-common
8 years ago
ff16084719
Fix lint errors
8 years ago
50c8a859e6
Move the CodeMirror cursor code to common-codemirror
8 years ago
9eb8e55cf6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
8 years ago
63710e1ccc
Move the code related to the title in another file
8 years ago
ce5cdce917
Fix an issue where the username was lost on websocket reconnect
8 years ago
42dcfb9661
unceremoniously kick web clients when you 'log out everywhere'
8 years ago
9206d89531
Fix lint errors
8 years ago
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
5a883d5a57
Use the new toolbar and move the userlist code in a separate file
8 years ago
6847906ac9
Move the userlist code in a separate file
8 years ago
3a338e0890
fix undefined reference
8 years ago
a173e4c7a0
add 'log out everywhere' functionality in settings
8 years ago
5a5b02b82b
Don't store in the drive pads without a hash
8 years ago
3e118c6a38
allow instance-wide custom salt for login
8 years ago
706120ae5b
Display images uploaded in the File app with the Media app
8 years ago
28cb40d7ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1b6fae4dd2
Update mediatag
8 years ago
a0c420af8e
jshint compliance
8 years ago
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
78b11584f8
remove unused variables
8 years ago
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a190c99426
Toolbar refactoring
8 years ago
7573b86946
call back with error if an RPC is made while disconnected
8 years ago
410a9dfb17
temporary solution for testing pin limits
8 years ago
ef89451a83
Display the storage limit in the drive
8 years ago
f2672d587a
fix variable redefinition
8 years ago
0e7eeb285c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f414d480a9
Add the history mode to the CryptDrive
8 years ago
cf4dee28f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
28e4ef1b13
WIP RPC code
8 years ago
afb0061d7b
Fix an issue with anonymous user unable to store new pads
8 years ago
56aaeea003
Fix the drive toolbar not displaying the displayName
8 years ago
3fa0a73025
prevent using string methods on undefined variable
8 years ago
1b3ce5aa96
fix typo
8 years ago
a51a35da70
Fix an issue with hashes ending with a slash
8 years ago
ef58120819
Prevent multiple concurrent clicks to get the history
8 years ago
16f6ab813c
Make it clear that the number is the history represents a version
8 years ago
c820b3485c
Fix function undefined when loading a template
8 years ago
0ef1c14d7f
Fix lint errors
8 years ago
fc760b4820
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a165332c15
Don't store a pad in the drive if the limit has been reached
8 years ago
e51c7f9cf0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
bf7c7c45d0
Add the storage limit warning in the toolbar
8 years ago
aedc46bdaf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a97e7223f1
implement getBlobPathFromHex
8 years ago
520dabe094
Remove the unsorted files category
8 years ago
f50aa5c29b
Move the mediatag viewer into a media app
8 years ago
6a8274518b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9882a3a923
Add support for the file applicaiton in the drive
8 years ago
12898b3358
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
74bcec8b31
programming is hard okay
8 years ago
2a417ddae8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d985b144cc
Add a new hash version for the file viewer
8 years ago
3309087277
send feedback if isArray is not supported
8 years ago
5194677443
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c9c7d61ad1
Media tag viewer
8 years ago
729d1460b9
Merge branch 'master' into staging
8 years ago
a840fb9e85
add example hashes and start working on hash v2
8 years ago
d1fa68e30d
build UCF Media Tag
8 years ago
fdd51ec18d
Don't remove a folder moved into unsorted or into itself
8 years ago
4fdc5f897e
only feedback migration if user had legacy store
8 years ago
218f2ff76c
feedback when logging in or registering
8 years ago
4c3e842664
Fix focus issues with the history input in ckeditor
8 years ago
f7e96b4e8c
resolve merge conflicts and jquery errors
8 years ago
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
8 years ago
18e2e66b06
jshint compliance
8 years ago
92ea03d7d9
View and restore the history of a pad
8 years ago
4c0d7bf8e8
support multiple calls to cryptpad.ready
8 years ago
ec041c88e2
console.log when providing feedback
...
also notify server if a users browser does not support proxies
8 years ago
c51073f211
support batch getFileSize calls
8 years ago
3afaf029cb
feedback about how often we migrate an old drive
8 years ago
e8b053e48b
use bootloader in feedback.html
8 years ago
347459781c
show the size of your files, if you're logged in
8 years ago
2b8579e8b7
add pretty-printers for byte-counts
8 years ago
2a25afae5f
Merge branch 'soon' into staging
8 years ago
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
8 years ago
da69c1822c
ask users to sign back if signing keys are missing
8 years ago
821c1a3ec6
annotate code which we hope to be able to deprecate in the future
8 years ago
43c045721c
Get the channel history
8 years ago
a27cc76fc0
uppercase LOL
8 years ago
402ce2db93
better validation of inputs
8 years ago
c7eae9675b
keep exporting isArray for backwards compatibility
...
but prevent internal use
8 years ago
fbebbf0dca
minor clean up
8 years ago
525d35c9ec
redefine alert
8 years ago
f694a81a5c
move more interface code out of cryptpad-common
8 years ago
a4157b9908
remove more unused functions
8 years ago
e10901edb2
begin to move interface code out of cryptpad-common
8 years ago
95789d3cbe
expose rpc for pinned usage
8 years ago
8f4dbcf4c6
remove getPadTitle
8 years ago
f42da4ecd8
move hashChannelList into common-hash.js
8 years ago
63960bd38c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
520ae822fc
correct undefined reference
8 years ago
633d60ccd0
Remove a TODO
8 years ago
81d83897ec
Rename hash.js
8 years ago
07705cd5c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
eb2a3c1bbf
Fix lint errors
8 years ago
607d9652f5
jshint compliance
8 years ago
3ba90332bb
Merge branch 'refactor' into staging
8 years ago
daabb0b3ad
Integrate and fix the new fileObject (userObject)
8 years ago
df4a250359
use feedback api instead of app=
8 years ago
86c37bfa37
fix find+replace error
8 years ago
e618483395
extract all code for encoding and decoding hashes
8 years ago
fdd2716ad5
move constants to the top of cryptpad-common.js
8 years ago
c1e0316d43
Refactor fileObject
8 years ago
5212539a16
move standalone functions from common into their own file
8 years ago
7437d6b902
remove unused function
8 years ago
4e590a9dd1
remove even more dead code
8 years ago
85fcaa9bbc
remove more dead code
8 years ago
401936a91e
move singly-used css file out of /common/
8 years ago
7a59183bb1
pinpad.create should always be async
8 years ago
8de3610532
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9aa0548b1f
remove dead cursor code
8 years ago
4e61b79f9a
Clean fileObject
8 years ago
cde724399c
Pin the pads
8 years ago
2c8d1b8183
jshint compliance
8 years ago
05a50b1f4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a14bb1480a
progress for implicit pinning
8 years ago
f82278a25c
handle return of undefined hash
8 years ago
1d933be5a6
make reset return the hash, not an array with containing it
8 years ago
f34492be94
Remove duplicates uid in the user list
8 years ago
cfc5d634f4
Merge branch 'templates' into staging
8 years ago
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
8 years ago
84d8615cf1
Save and use templates in pad, code and slides
8 years ago
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
8 years ago
a70388284d
disable unnecessary messages
8 years ago
abd87e1322
jshint compliance
8 years ago
e4b15bc616
implement 'getCanonicalChannelList'
8 years ago
a2f692b9a3
clean up serverside and clientside pinning logic
8 years ago
fdede0d1fd
remove some dead code
8 years ago
e87992c7ec
implement atomic pin reset rpc
8 years ago
3380cf0348
implement getTotalSize rpc
8 years ago
5c292fb1fa
jshint compliance
8 years ago
64089c5f6b
implement pad pinning
8 years ago
13514dff63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
46a5eee597
Display the spinner in the toolbar for local changes
8 years ago
6c7cdc90a9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
212baeb3a6
better cookie schema. expire old sessions
8 years ago
54d271c4e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a9777ce560
Fix input losing focus in polls with Chrome 57
8 years ago
3e47b8a38d
remove dead code
8 years ago
182dbfc874
implement pinning logic in pinpad.js
8 years ago
a5e5ddae08
rpc all the things
8 years ago
04069cc7f4
fix font size
8 years ago
6e9968f989
add 'lol' code theme
8 years ago
9b4b642d4a
protect against subtly corrupted user objects
8 years ago
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
8 years ago
3cfd0a4326
commit some garbage
8 years ago
ed89a13fe6
progress on adding version string to some css
8 years ago
76990ac1b2
version toolbar.css for cache-busting
8 years ago
a0c17d7c9b
latest rpc code
8 years ago
59a80d5fde
remove silly TODO
8 years ago
a8ffac5dcd
Remove old code
8 years ago
fa9249ef29
don't notify for userlist changes if a user joins twice
8 years ago
40f5e1706f
add a unique id to user objects, define a getter
8 years ago
994d640f8b
Fix an issue causing the lag icon to lose its color
8 years ago
6fbd1f0028
Store the dates as number and not strings to avoid ot issues
8 years ago
51033ab70a
Remove useless links in the context menu and properties for readonly pads in the drive
8 years ago
7afde2309d
Add properties to the files not in the trash
8 years ago
b542245086
fix lint error
8 years ago
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
98027dad27
jshint compliance
8 years ago
4a173e30dc
set user's cursor to either the beginning or end of the document
8 years ago
29174b2922
Update the lag icon
8 years ago
26edb77cf0
Fix style and usability issues in slides
8 years ago
d422c7e165
support old hashes in getUserChannelList
8 years ago
5ed6223313
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c9c9dd0999
use userChannelList if a list is not supplied to pinpad
8 years ago
e8c3cf6aa5
implement rpc message signing
8 years ago
d85a42c776
include User_hash in user channel list
8 years ago
7761aaa89f
Add search UI
8 years ago
c3c866fa2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d19bbcb001
Add support for search in the drive
8 years ago
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
298725b3c2
don't show usage tips on error screens
8 years ago
0a6373852e
add signing keys to user object at login and register time
8 years ago
b9c64a526a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
8 years ago
8129b8cdc1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
15a67afc75
jshint compliance
8 years ago
13d7b3cadc
Merge branch 'd' into staging
8 years ago
7187d3c550
implement getUserChannelList
8 years ago
306f6ce806
resolve merge-conflict with accounting branch
8 years ago
f10149db1c
Make sure the tip is always visible when the loading screen is removed
8 years ago
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
09afba80db
add support for logging in from register page
8 years ago
16e5788011
Call the callback if we can't parse the local Drive to import it
8 years ago
413d9a6f0b
add a style-callback to confirm
8 years ago
803e57c958
add more parameters to confirm dialogs
8 years ago
ceaf757680
Allow right click on the CryptPad logo/link in the top left corner
8 years ago
f2aa531f27
apply styles to confirm buttons if provided
8 years ago
df6298eeb6
apply styles to confirm buttons if provided
8 years ago
07a2d8e189
apply translations on feedback page
8 years ago
b7986ff6b1
Replace the spinner code with a font awesome spinner
8 years ago
d9996cc874
current work for pinning
8 years ago
b3cc8da315
implement basic clientside RPC infrastructure
...
and provide a basic example for testing it
8 years ago
81027b4200
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
8 years ago
459b18c97b
Add the loading screen in the HTML so that it is displayed before JS is loaded
8 years ago
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
8 years ago
0c1efd361b
Make sure the href is updated everywhere when importing a stronger link
8 years ago
b701e3cc85
Fix lint errors
8 years ago
4206382865
Fix the settings app to allow backup for unregistered users
8 years ago
f62267f8a1
Ability to import local pads in the user object
8 years ago
e2418a6be2
sketch of how pinning rpc will look
8 years ago
dc567fa7f3
signing keys are stored in hex so encode and decode them
8 years ago
9ad33574e9
Fix the function returning the pads list in the drive
8 years ago
d93a270336
Ability to display tips in the loading screen
8 years ago
77d09f64e1
Display anonymous users in the user list
8 years ago
cb88227e2b
Autocomplete on key press in some dropdown menus
8 years ago
2a1b241592
Display a button to open the editing link while in read-only mode if we know it
8 years ago
ed9bcca96f
Close the websocket network when CryptGet/CryptPut is done
8 years ago
0bb10a8a0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e1303a16da
add support for title attributes on dropdowns
8 years ago
52793385ea
Fix lint errors
8 years ago
01c4d7d4a7
Merge branch 'maybe' into staging
8 years ago
c884782d57
here are some changes
8 years ago
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
8 years ago
c5f983ecd7
Convert read-only link to editing link in the drive
8 years ago
a9afa24428
return empty string instead of blowing up when fixing HTML
8 years ago
8bdc8415ab
Find a pad in the drive
8 years ago
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
7db0e14bc0
add 'force' flag to override removal of html elements
8 years ago
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
8 years ago
2c5c6da0d9
Fix XSS in alertify logs
8 years ago
5797aab3f2
Fix XSS with display names in the user list
8 years ago
26e3971482
Fix XSS in the user dropdown menu
8 years ago
5d39125004
Make onSettle Async Again
8 years ago
4f4075ed6e
Make the settings app available to anonymous users
8 years ago
12aec60a12
hack around onSettle not doing its job
8 years ago
1a259bb3aa
check if user has disallowed feedback api
8 years ago
498f4065cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
66dc166936
Make sure the realtime is synced with onSettle when using cryptget
8 years ago
de5a21fe57
add a simple feedback api and text explaining what it is
8 years ago
88b29e8bdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
5303e76ece
Make sure the content is correctly applied in onReady
8 years ago
cc829d51f8
jshint compliance
8 years ago
42b6cca18d
Fix new pad not working
8 years ago
3fd5669647
Hide the trash icon for read-only pads if we have the edit link in drive
8 years ago
e15a6a347f
Fix the forget pad button
8 years ago
54b0a86c2e
Make sure we redirect to the drive if we access the login page from the homepage
8 years ago
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
8 years ago
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
8 years ago
7e77c6828a
more correct pluralization
8 years ago
c72bbd4c37
Use the file name as initial title
8 years ago
47b8fefd9e
Load messages.js only once, in cryptpad-common
8 years ago
11d9c9e813
Merge branch 'master' into staging
8 years ago
2103f0afa8
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
0bdf59c1dd
Fix broken link in the 'New' button on cryptpad.fr
8 years ago
d81d17b86c
Remove old translations keys no longer used
8 years ago
239e2bcc1f
Fix issue with null entries in Cryptpad_RECENTPADS
8 years ago
1540ae3f6f
Fix issue with null entries in Cryptpad_RECENTPADS
8 years ago
94417d9a8b
jshint compliance
8 years ago
c9b8889380
add cache-busting to chainpad-crypto
8 years ago
09fade6127
add cache-busting to chainpad-crypto
8 years ago
2daa9f8658
Link to main page was opened in the inner iframe
8 years ago
deda40375a
Use the new onSettle from chainpad to determine if the realtime is synced
8 years ago
92d50ded64
Merge branch 'soon' into staging
8 years ago
97762f9f9a
Make sure all the elements in RECENTPADS are non-null objects
8 years ago
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
8 years ago
7762ffcbff
Ability to use Ctrl+click on the cryptpad logo in apps
8 years ago
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
8 years ago
7758d056fa
Ability to import/export a user realtime object
8 years ago
cd9cea8fa4
Create a settings app to manage user objects
8 years ago
71b84afdb2
Redirect to the pad when logging in or signing up from a pad
8 years ago
92050eb04f
Fix the trash button in toolbar not always working
8 years ago
aae3fba284
Fix the storage when the hash is invalid
8 years ago
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
3aa03225c9
Add a spinner when hashing the password and translate homepage
8 years ago
fbcf4ccec4
force usernames to be lowercase
8 years ago
5614bea271
redirect users to login and register from toolbar
8 years ago
f723585758
add api to check whether the realtime has synced with the server
8 years ago
d0edf75c89
signup link directs users to register page, not user
8 years ago
1232aa8a79
jshint compliance
8 years ago
8eec7ec7c8
Fix typo
8 years ago
f92ba193c3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e100110741
implement log in as an api
8 years ago
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
8 years ago
67d881b2cf
Remove the drive entry from the user menu if already in drive
8 years ago
914c442615
Do not redirect to home page when logging out from another tab
8 years ago
702798f65a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1e2cc6bea4
Fix race condition with the iframe store
8 years ago
6e97082ff9
remove dead code from login function
8 years ago
8a1acc3c37
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6f07a3b7b4
erase lingering sessionStorage values when logging out
8 years ago
ac79fbb5a2
Improve mobile support for the toolbar and the drive
8 years ago
9f1789b2d2
Fix creation of pads from non-root category in the drive
8 years ago
ad82a275bc
Replace the Apps button by a New button again
8 years ago
fd33ffd56f
Fix issue creating a patch everytime the user clicked in an app
8 years ago
87abfac5e0
Fix lint error
8 years ago
02439e0f61
Improve the homepage with new images and translations
8 years ago
2c6b4b9c6a
Hide disabled applications from the context menu in drive
8 years ago
91299f5f30
Ability to access the drive from any pad
8 years ago
b0fb56fa63
Allow logge din users to access the home page
8 years ago
65054119cf
Fix a bug preventing reconnection in drive
8 years ago
757ae7a3ad
Fix a cross origin frame issue with dropdowns
8 years ago
39c85ca3f7
Fix race condition causing missing translations in homepage
8 years ago
5e69b78334
Remove the domain from the href in store
8 years ago
58d8a30b5b
Redirect to the main page when logging out
8 years ago
5ef074370b
Name a place before creating it in the drive
8 years ago
0e9e0e545f
Load the new pad when the hash is changed
8 years ago
e41cbb92d8
Use default FILES_DATA name if not provided
8 years ago
c44f3a1044
Delete multiple elements could also remove unselected ones
8 years ago
3f44444f41
Display the 'New' button in the trash
8 years ago
11f0a9ae5f
Revert the changes adding anonymous pads
8 years ago
f42665ba49
Remove the unowned pads category
8 years ago
cb85ad3fdf
Merge branch 'newtoolbar' into ownedpads
8 years ago
373b07ed28
Fix lint errors
8 years ago
015e6fc262
Make sure we have the same hash in all the tabs when disconnecting
8 years ago
88021f2264
Anonymous pads fo anonymous users
8 years ago
9d275daebb
Backport changes for the login page from hpbs branch
8 years ago
99b8898e54
Apply new title when clicking on the page without pressing enter
8 years ago
88d5b4cc9c
Add a 'New pad' button in the toolbar
8 years ago
a9063e0459
Reload all tabs when the user logs in or out
8 years ago
efed1f5efe
Add handlers to login and logout buttons
8 years ago
767ba8b549
Select what we want to display in the toolbar
8 years ago
2afdc11327
Replace the username button by a dropdown menu
8 years ago
4adde0f0c0
Use the new dropdown for userlist and share
8 years ago
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
8 years ago
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
8 years ago
3f1e287811
Fix an issue causing a user object to be turned into a pad
8 years ago
569ea21705
Replace the language selector by our custom dropdown menu
8 years ago
26dd4ea11f
Fix lint errors
8 years ago
4278ac7637
Merge branch 'soon' into fileManager
8 years ago
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
8 years ago
f74d0a46a4
Remove the alert when pressing del in 'all files'
8 years ago
1c3f1a15cd
make sure that /pad is resized after loading
8 years ago
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
d5561910d4
Move the file manager into /drive and add a toolbar
8 years ago
1e70af0c16
Use the same network for the apps and the file store
8 years ago
e56cc49f79
catch errors that popped up because of a cross-origin iframe
8 years ago
5cd714b18a
configure filestore usage via customize/application_config.js
8 years ago
91a806ab86
focus on OK button when we pop an alert
8 years ago
89e5830409
make alertify display time configurable
8 years ago
5e1d8292c5
guard against trying to parse special fragments
8 years ago
52a593c2c2
fix jshint complaints
8 years ago
53a4d4738a
really make sure you're logged out
8 years ago
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
8 years ago
9b6c9e3891
Add support for templates in the file manager
8 years ago
29d406b7a9
implement cryptput
8 years ago
87abfff66b
Fix Flash Of Unstyled Content (fouc)
8 years ago
1682d23c1c
remove old user prototype
8 years ago
c359c27997
Use user object as default store in file manager
8 years ago
4aed585574
Fix style issues in the toolbar
8 years ago
bd6992da0a
create a random hash
8 years ago
2cd50498c2
add log(in|out) functions to common
8 years ago
7df460c766
implement createChannelId api
8 years ago
5a14db9f07
Merge branch 'test-filemanager' into login
8 years ago
303953a431
Merge branch 'soon' into login
8 years ago
6b9529b121
implement ajax-like functionality for zk docs
8 years ago
5bc7766f44
Use a consistent toolbar across all apps
8 years ago
2968488278
convert uint8 arrays to hex
8 years ago
8e6830d080
Fix file manager with a chosen hash
8 years ago
ee56f5608f
Fix the infinite spinner bug with the file manager store
8 years ago
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
8 years ago
05fd6c1563
Fix the infinite spinner problem
8 years ago
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
8 years ago
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
8 years ago
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
8 years ago
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
8 years ago
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
8 years ago
a957b72598
Create a new pad from the file manager
8 years ago
d6e1215166
Refresh the directory if needed when the object has changed
8 years ago
118829617f
Use the FS store as default store
8 years ago
c2770a7a74
set correct hash even if browser does not implement replaceState
8 years ago
303c65f2c3
use replaceState if available, instead of setting the hash
8 years ago
2d5448458b
export messages
8 years ago
d512b113cd
address failure to parse url when hash is not present
8 years ago
ab1d3958ce
Add a pencil icon when hovering the title
8 years ago
6d1e06cca3
Add notifications when a user joins or leaves the channel
8 years ago
54a63267cd
Add a share button and merge the viewers and editors buttons
8 years ago
87d86384ac
Fix broken elements in the new toolbar
8 years ago
6351d1856f
Remove the top bar and move its content in the applications' toolbars
8 years ago
3d74290c7d
Merge branch 'usability5' into staging
8 years ago
9e92a597b3
Ability to edit the title in the toolbar by clicking it
8 years ago
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
8 years ago
10bb5e1607
Add the title in the toolbar
8 years ago
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
8 years ago
51a79c5218
Remove unused dependency
8 years ago
9a733bb360
Fix dropdown menus with Edge
8 years ago
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
8 years ago
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
8 years ago
d2389a5729
Change the userlist in the toolbar
8 years ago
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
8 years ago
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
8 years ago
765498e88e
Remove the support for old.cryptpad.fr
8 years ago
c322aa440e
Fix the username icon hcih was not working anymore
8 years ago
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
8 years ago
a989b51d74
Fix race conditions with Alertify
8 years ago
74df38f94f
Fix race conditions that could prevent applications from being loaded
8 years ago
dbc8f01b8b
fix merge errors and reach full jshint compliance
8 years ago
a30e17121d
Merge branch 'readonlyButton' into soon
8 years ago
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
8 years ago
2ac1b02572
Merge branch 'config-sockets' into soon
8 years ago
3dfa19b786
more flexible websocket configuration (WIP)
8 years ago
76fdadee7f
Store only the strongest hash in the localstorage
8 years ago
17b4f91810
Do not share the title in the doc if it is the default title
8 years ago
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
8 years ago
8c33218ceb
Move the codemirror themes in /common
8 years ago
2609af2105
Use the CodeMirror editor in the slide application
8 years ago
f03018f3bc
Improve the top bar and use the font awesome icons in /code
8 years ago
3d54413343
Improve the UI with FontAwesome icons
8 years ago
d6525087c7
jshint compliancy
8 years ago
d46bd1af5c
Improve the toolbar UI with the username displayed
8 years ago
79884e2400
Use the same username for all pads
8 years ago
dde519795d
Merge branch 'newhash' into newhashNoConflict
8 years ago
f29e3d7b0d
don't let notifications interfere with document titles
8 years ago
83705ae058
Improve the UI in read-only mode
8 years ago
fa8199bc75
don't try to use experimental user code
8 years ago
99b50465c7
Add the read-only mode for /pad and /code
8 years ago
42f14873cd
Merge branch 'translations' into newhashmerge
8 years ago
391b7690e6
Set the pad to readonly mode when using a 'view' url
8 years ago
368e253c9f
Ability to send a read-only URL
8 years ago
5c63585952
Complete the French translation
8 years ago
0d9f63b977
Merge branch 'translations' - part one
8 years ago
f086492e50
Improve the localization system
...
Improve and enable the French translation
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
c736caceba
Use a better default pad title
8 years ago
97415d8158
Merge branch 'users'
8 years ago
8e86be81b2
Merge branch 'better-slides'
8 years ago
fb21b4e46b
fix up /render/
8 years ago
4941c1493e
better user integration. a few more common utils
8 years ago
30ea1b59b7
integrate users into common utilities
8 years ago
6d775f61c6
add missing functions
8 years ago
168338b898
add missing functions
8 years ago
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
8 years ago
c168ce2d1c
Ability to reconnect after a connection failure
8 years ago
1bec02239c
coerce dates into strings
8 years ago
0add01a940
remove dead code
8 years ago
8c914dfe1f
better filenames
8 years ago
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
9 years ago
5131f47cca
jshint compliance
9 years ago
306d524416
fix broken removal call
9 years ago
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
9 years ago
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
9 years ago
dcc9810a42
avoid extra call to store if there are no keys to remove
9 years ago
9a5294016d
fix incorrect usage of store api
9 years ago
4e5f381325
add spinner to API. update bower deps
9 years ago
fa654a7646
slightly better regex
9 years ago
cd18075ac7
add some redirection logic to support old hash types
9 years ago
600f3151e9
don't use the store until it's ready to be used
9 years ago
fffa9acf15
remove unused files from fs and jshintignore
9 years ago
551d38c930
let the abstraction take care of stringification
9 years ago
0ada6a3d0a
jshint compliance. gotta keep those tests green
9 years ago
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
9 years ago
7f02c899ea
add snippet for copying text to the clipboard
9 years ago
42eafe9e29
don't create duplicate stylesheets in the document head
9 years ago
c6bdb7506d
forget everything about a pad when you forget it
9 years ago
e84fbf0bc3
more helpers in common
9 years ago
ff74a67a09
translate alertify button messages
9 years ago
d39ab5c250
point to the actual translation file
9 years ago
dea8e225db
fix double scrollbar issue
9 years ago
3eccec7054
better effort for translation
9 years ago
cbeaa8d609
major refactoring for toolbar. CAN HAZ LESS
9 years ago
7504f79e05
add log and warn methods to cryptpad common
9 years ago
3ad5d71ab1
make sure the regular favicon is set
9 years ago
fd3cd73d0b
try to fix favicon bug
9 years ago
589b0087a1
listen for keyup events while alertify prompts are active
9 years ago
deae7ac78f
don't hide the notification until it has been seen
9 years ago
3d3c6e4800
add wrappers for alertifyjs
9 years ago
73d2b6561a
add small modules for page visibility api and notification apis
9 years ago
d8b467422a
fix default title in localStorage migration
9 years ago
7a5877d12a
don't filter pads after 30 days
9 years ago
d844551fba
add a forget button. clean up toolbar a bit
9 years ago
8a82e11306
make sure title is defined for home page usage
9 years ago
71b1f71ba0
fix migration to include ctime
9 years ago
7da58a0de9
improve pad naming UX, slight refactoring
...
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
9 years ago
a3da10766a
add rename button to /code/ and /pad/
9 years ago
93dcf29c15
more functions for working with localstorage
9 years ago
d025d13295
address some jshint complaints
9 years ago
12bbf3e8f6
don't drop values onto the window
9 years ago
ca45e3533d
pass loaded file to callback when importing
9 years ago
1a5905d9fd
more work on highlighting modes in codemirror
...
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
9 years ago
31aa09d6f6
work a bit more on import/export and code highlighting
9 years ago
242c9a99e3
implement import and export in /pad/
9 years ago
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
9 years ago
c3d2568d3c
add file export for codepad
...
addresses #24
9 years ago
2b8c21d292
set styles with setAttribute. fixes style fights
9 years ago
1746a4e732
use crypto from bower
9 years ago
2a3ff256b9
remove libraries which are now in bower
9 years ago
f72cb24fc5
rm LORIA
9 years ago
2c3de49922
remove realtime-input, since it's in bower now
9 years ago
2798d1b1f9
all of the list/map api's dependencies are now on bower
9 years ago
58c968b319
minor cleanup in realtime-input
9 years ago
288b4d5b66
depend on main passing in the crypto module for now
9 years ago
85dbd5cb6e
pass in websocketURL from main
9 years ago
d9a4f2f22c
missed one
9 years ago
ff0f7d15dc
use json-ot from bower
9 years ago
58633af943
listmap can be reused. put it in common/
9 years ago
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
9 years ago
83696495a8
use chainpad from bower, not local
9 years ago
954ee26f4d
fix undefined disconnect reason
9 years ago
9336c4de5c
import latest chainpad
9 years ago
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
9 years ago
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
9 years ago
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
9 years ago
a0c73c95d8
do away with a bit of boilerplate
9 years ago
da2bfe2de9
Added checkpoints with the new code from ChainPad
9 years ago
cf85de6113
remove old bencoding code
9 years ago
d99bb8ff84
WIP : fallback to old parsing doesn't work
9 years ago
f04be53d11
fall back to old parsing if the message is bencoded?
9 years ago
976a08cc7a
move to chainpad version 2
9 years ago
cae750cd75
update padrtc for to use bower libraries
9 years ago
7faf57602b
implement log level settings from application layer
9 years ago
523aff3067
use upstream chainpad.js
9 years ago
c752e4a6e5
remove sharejs
9 years ago
6b2e986789
remove deprecated textsocket library
9 years ago
150ebaba7b
add ability to force text diffing
9 years ago
ba17b78f7a
restyle name change button
9 years ago
492054a938
Fix the cursor position when a remote patch is applied
9 years ago
5bb2e12db2
Merge branch 'beta' into migrate
9 years ago
cc51e6d6ed
Update CodeMirror pad to work with Netflux
9 years ago
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
85d5f5c47f
Convert netflux to es5
9 years ago
5f16ad4a58
Update to most recent chainpad
9 years ago
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
9 years ago
d3203d1c2a
Remove Crypto from the modules loaded with RequireJS in realtime-input
...
It now has to be passed in the config in the main JS file
9 years ago
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
9 years ago
b140b6429d
remove a little bit of dead code
9 years ago
bbdc9da853
delete duplicated file
9 years ago
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
9 years ago
4f426651ad
remove TextPatcher from RealtimeTextSocket
9 years ago
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
9 years ago
a18c793f98
use latest hyperjson
9 years ago
9efcc443cd
add 'format' to TextPatcher's API
9 years ago
0769e50414
move TextPatcher to highest application layer
9 years ago
1d70335228
provide all callbacks before starting
9 years ago
a3787ee4dc
Merge branch 'netflux' into beta
9 years ago
010566d3c3
pushDelta was mistakenly deprecated. restored.
9 years ago
3598c93098
move new hyperjson into common
9 years ago
103bb69daa
move custom hyperscript into common
9 years ago
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
9 years ago
cb979844f6
implement text patching at application layer
9 years ago
4a41575e6d
accept onLocal in config
9 years ago
d3c2c901b6
implement cursor transformation in a common library
9 years ago
92d89f6cac
start to factor sharejs into two modules
9 years ago
13dc77b7f6
remove commented line
9 years ago
41e635b2e5
realtime-input.js : turn on logging
9 years ago
69e8e18283
Remove the pipe character in the hash
9 years ago
d62e9fc1c9
add a missing semicolon
9 years ago
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
9 years ago
be09a1808d
Remove old code from realtime-input
9 years ago
6884b0890a
Fix the typong tests not working properly
9 years ago
e207d8b579
Merge branch 'diffdom' into netflux
9 years ago
f4c5b2a996
Add sane defaults to TextPatcher diffs
9 years ago
259772dd62
Turn on TextPatcher logging for _socket
9 years ago
0537c28919
Add switchable logging to TextPatcher.js
9 years ago
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
9 years ago
19cd991dba
trim dead code, comment, very minor optimizations
9 years ago
9f45ccb2d9
use console.error for stack traces
9 years ago
368d72b337
add missing semicolons to TextPatcher.js
9 years ago
851ccfbdb6
detect falsey operations in OT and ignore them
9 years ago
400f6efde1
json-ot.js : jshint compliance
9 years ago
ca94d30386
detect falsey operations in OT and ignore them
9 years ago
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
9 years ago
793149a608
json-ot.js : jshint compliance
9 years ago
06a3b63923
jshint compliance for toolbar.js
9 years ago
5cead3fad3
add missing semicolons to TextPatcher.js
9 years ago
94e57e4a26
update location of text-patcher.js
9 years ago
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
9 years ago
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
9 years ago
39071021eb
stabilize typingTest.js as /common/TypingTests.js
9 years ago
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
9 years ago
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
9 years ago
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
9 years ago
4ba68eb2bf
fix leaky variable in chainpad
...
Patch.transform declared a 'toTransform' variable without using 'var'
this caused it to leak onto the window during operational transformations
9 years ago
05108efdfa
correct chainpad's transformation function
...
addresses RTCHAINPAD-3
Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
9 years ago
713c90242b
Hide the usernames when they have not been changed
9 years ago
0b3d6e15b8
Replace the Netflux old client (netflux.js) by the Netflux2 client.
...
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
9 years ago
cf9f60bd57
The server don't send back anymore messages to their sender
9 years ago
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
9 years ago
ba4faea939
Update the pads to run with the latest improvements to the websocket server
9 years ago
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
9 years ago
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
9 years ago
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
9 years ago
c50690349b
comments describing the role of each argument
9 years ago
96e03fcfa4
Use latest chainpad without mutations
9 years ago
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
9 years ago
6c340a6527
chainpad testing = true, reject non-compliant messages
9 years ago
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
9 years ago
bac0e0ff88
implement hyperjson filtering
9 years ago
478ccbf984
revert changes to chainpad
9 years ago
b372b0b77c
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
9 years ago
98c85cef8b
xxx
9 years ago
62eabbc7ae
If a message does not match parent hash, don't delete it from storage
9 years ago
dbf31798d5
json-ot triggering PARANOIA errors in ChainPad
9 years ago
03932d0169
small changes to chainpad for testing
9 years ago
420a7098a6
more testing and crap
9 years ago
e066730b68
add notes about how hyperjson is to be used
9 years ago
c047d5310f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
Conflicts:
www/common/convert.js
9 years ago
0d33af773f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
9 years ago
475ca9bea8
hyperjson.js : used split instead of filter... oops
9 years ago
1bd5cb9e27
hyperjson.js : used split instead of filter... oops
9 years ago
b2753ef7b7
fix string manipulation off-by-one
9 years ago
f98fda7604
fix string manipulation off-by-one
9 years ago
4f3fcb08a4
better error reporting when the operational transform fails to parse JSON
9 years ago
0ff4906f0e
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
9 years ago
fbe6225681
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
0c6222b5f9
better error reporting when the operational transform fails to parse JSON
9 years ago
79a9998b13
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
9 years ago
bd24821c6c
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
38d797a4f1
Fix issue with Chrome and WebRTC
9 years ago
7237c751d5
Move 'vdom' to the main 'pad'.
...
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
9 years ago
e77d85bc82
Trigger an onReady() method when the user's pad is fully synced (the history is loaded)
9 years ago
eca4ec699c
Ability to change the username (the user ID is displayed by default)
9 years ago
6e50ae94dd
Remove unused code
9 years ago
5da8560e22
Fix the user list in the toolbar keeping old data with the WebSocket server
...
Chainpad is no longer responsible for the userlist or the ping
9 years ago
3a188625e0
Improve the detection of a disconnected peer to update the user list with the WebRTC service
9 years ago
77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
9 years ago
06e5c84702
Clean some code
9 years ago
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
9 years ago
c576241104
Add a Chainpad adapter to make Chainpad know the userList
9 years ago
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
9 years ago
b7885eb539
Fix channel history
9 years ago
8258018c1d
Revert "fix undefined reference"
...
This reverts commit 7d65540123
9 years ago
c67451bc1a
Revert "remove broken functions from convert module"
...
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f
9 years ago
c536ecbc1c
Temp commit
9 years ago
870b2dbb7e
Add the WebRTC server in Cryptpad
9 years ago
c4f62fb812
First try with WebRTC
9 years ago
09a06a8bc5
Replace the chainpad server by the netflux server
9 years ago
60c3aceb0d
Add chatflux server
9 years ago
deb2084fc5
Add the socket connection checker
9 years ago
d3e2a2f52e
make verbose logging switchable via a conditional
9 years ago
fefb904261
realtime input changes
9 years ago
fd99dba4a3
modify realtime-input api to take a single object as configuration. merge netflux API
9 years ago
62ba579d4a
Add Netflux API with WebSocket service V1
9 years ago
d7b34cf6be
don't call toolbar from within realtime-input.js
9 years ago
5e1566eaec
fix incomplete 'onAbort' block
9 years ago
1d6ccc99a1
add 'onAbort' hook to realtime-input.js
9 years ago
6ff5b10486
remove local diffDOM version
9 years ago
93fb944e1f
remove broken functions from convert module
9 years ago
7d65540123
fix undefined reference
9 years ago
6884fabda9
Use local diffDOM instead of bower_components
...
At least until the PR gets accepted
9 years ago
f5a8727254
remove some unused functions from cursor.js
9 years ago
db1515c445
cursor.js : commit before cleaning up
9 years ago
91ada5ce7a
export Operation from chainpad. for use with OT
9 years ago
5425699f43
check if possible parent exists before checking if it contains another element
9 years ago
67bdb8a65a
fix a bad regex that occasionally threw an error
...
'nothing to repeat'
9 years ago
39f56d4fd1
throw error when checking for the index of a node that has no parent.
...
it probably isn't in the dom if this is the case.
Check if it's there before using this function
9 years ago
de46be85ba
add better helpers for finding and resetting the cursor
9 years ago
c09036bd29
snapshot cursor.js, as some things are working quite well now
9 years ago
4eee1f5210
add orderOfNodes function to tree library
9 years ago
7689151fc0
pull json validation for OT into its own module for reuse
9 years ago
2c8a2406c6
cursor.js : snapshot before code deletion
9 years ago
1beb3f5355
snapshot of treesome.js before deletion
9 years ago
8ead5ca129
realtime-input.js : add notes regarding integration of the netflux api
9 years ago
d1885fbab6
better jshint compliance for common files
9 years ago
539cc3a2fa
remove unused files from common directory
9 years ago
afa2811472
remove local version of marked.js, prefer bower version
9 years ago
a600ece5c5
fix jshint complaints in common directory
9 years ago
2c5a2b6023
remove unused code, add todos, fix minor errors
9 years ago
967d636df9
address more jshint complaints
9 years ago
f6c848385f
hyperjson.js : jshint complains about var index in for loop
9 years ago
7f92abc7bf
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
9 years ago
86c4a69a97
Switch to patching with DiffDOM for testing :D
9 years ago
653ba33b65
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
9 years ago
2031191261
testing=false
9 years ago
37db31b09e
Attempt an operational transformation and if the result is not valid JSON then fail
9 years ago
c22269e36e
cursor.js : make the console a little less noisy
9 years ago
99a23154b7
files for unstubbing OT
9 years ago
c740c0ec92
add stuff for walking the tree
9 years ago
ad184b1114
add stuff to recover the cursor
9 years ago
019750bea8
realtime-input.js : callback onInit if exists
9 years ago
7102a0a164
make rainbows
9 years ago
d2f6c63d8a
realtime-input.js : changed the api and left an undefined reference. fixed
9 years ago
d96124229b
clean up realtime-input.js, break API
...
use an object for configuration, so as to be more extensible.
modify applications which use the API to match.
9 years ago
ed03a48092
minor patches that make things a bit more reliable, still some bugs
9 years ago
ac0f7852fc
committing latest changes for review
9 years ago
2016550e01
virtual-dom.js : identify problem area?
9 years ago
fd1e5d5735
better styling on render page
...
now solarized dark
9 years ago
b18dfef656
sharejs textarea is used by realtime-input.js
9 years ago
997ce1147f
realtime input wraps up basic realtime stuff
...
so we don't have to rewrite the realtime api for every application.
starting to move towards a portable api :D
9 years ago
40b8c0efe8
drop in chjj's marked.js for a cool demo
9 years ago
0c2e057f9d
export component APIs from convert
9 years ago
b958caebdd
dom, vdom, hyperjson, and an api which provides a matrix of conversions
9 years ago
2ed9f0867a
Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad
9 years ago
ff52f050e5
chainpad.js : pull in upstream changes to chainpad.js. new APIs
9 years ago
9fc44cdf0c
add notes to clientside js files
9 years ago
9a932a3f56
Patch Realtime into CodeMirror in CryptPad
9 years ago
88fb6772e8
Cleaned up the front page and added a little piece of code to show recent pads
10 years ago
51544db9a2
Completed adding of customization system and bottom infobar
10 years ago
0e44b10aeb
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
10 years ago
e039e90a24
upgrade to most recent chainpad
10 years ago
50c10f818e
Added cryptsheet to cryptpad suite!
10 years ago
yflory