2104 Commits (3314778c5482b3501331b6444e75153fe881c52f)

Author SHA1 Message Date
ansuz c0cb5c4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 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
7 years ago
ansuz 5b3cca58bd modifications to handle latest media-tag 7 years ago
yflory 7f5c301734 Add display name in the settings useradmin menu 7 years ago
yflory fb21a650ce Lint errors 7 years ago
yflory 159ccc2866 Fix mediatag flickering 7 years ago
yflory 16d0527e92 Add a page title in drive, settings and file 7 years ago
yflory a0b14faf89 Fix the font in settings and drive 7 years ago
yflory 8f5a244999 Replace mediatag markdown syntax by html. Enable file upload in /code. 7 years ago
yflory 438e7e6cf9 Fix display name in useradmin (friends app) 7 years ago
yflory e6188bfb63 Fix useradmin dropdown position 7 years ago
yflory 97d8d86395 Fix avatar in static pages 7 years ago
yflory e8f3df5a46 Clean less 7 years ago
yflory 159d72f33b Merge branch 'msg' into staging 7 years ago
yflory 8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory ff10c282d4 Avatar in the user admin button 7 years ago
yflory be6ee672d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory f0523a0153 Avatar in the user admin menu 7 years ago
ansuz e10de1219b feedback on view hash usage 7 years ago
ansuz 52eb8e307c feedback for language used 7 years ago
yflory 1c531ccd47 Pin the chat channels 7 years ago
ansuz 4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 7 years ago
ansuz c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 7 years ago
ansuz 22fbc7e5d8 implement getter for public keys 7 years ago
yflory df103c4074 Messaging app 7 years ago
ansuz 1c462d5c4a use random token for feedback instead of date 7 years ago
yflory 21f1527c71 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
yflory 5c7441f82c Display the friend list in the friend app 8 years ago
ansuz fac715dd09 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
ansuz 4b23ef74d7 add support for curve message signing and curve validateKeys 8 years ago
yflory a5e8f6ae81 Add friend app and fix avatar size 8 years ago
yflory af31771e3a Share a channel id, not a hash 8 years ago
yflory 852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
yflory 26a83003b5 Create an owned channel 8 years ago
yflory 5b5a7ab286 Hide the friend button when the resquest is accepted 8 years ago
ansuz d3bbdc27c0 lint compliance 8 years ago
ansuz bce0b03ba4 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
ansuz 909e00bbc3 create a listmap object using public key crypto 8 years ago
yflory 96fde4e5ed Add missing file 8 years ago
ansuz df53166b37 implement and use prototype curve encryptors 8 years ago
ansuz d293ba4d44 add support for invite hashes 8 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 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
yflory cab595f959 Fix duplicate folders in the drive 8 years ago
ansuz ac8da0d52d load codemirror in the correct context. fix selection events 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
yflory fa2d857d70 Fix css issues with Safari 8 years ago
yflory 81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 8b0210baf1 hide useless error 8 years ago
yflory 991cb896bd Fix avatar in /pad 8 years ago
ansuz 6ac056e314 make explicit file size RPCs unauthenticated 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 b153dda6ff Add avatars in the user list 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 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 75c2a1fd73 jshint compliance 8 years ago
ansuz b8934c0b97 smarter redraws of drive/settings usage bar 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
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 39149a052b add new feedback keys 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
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 1c1869a22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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 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 33ea8cb183 Make sure we don't call both the yes and no handlers in prompts 8 years ago
ansuz 51e06e68a7 don't change slides when navigating through history 8 years ago
yflory 38f568635d Fix duplicate media-tag in slides when adding or removing a slide 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 2710279904 Use the new share button in the file app 8 years ago
yflory 684269fdda Userlist in polls 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 ab54dcf84d make libs pass jshint 8 years ago
yflory 8d956c3de6 New toolbar 8 years ago
ansuz 48f9745619 clientside templating 8 years ago
yflory b7a0547b77 New toolbar colors 8 years ago
yflory 3052ec8abb Merge branch 'newCk' into staging 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 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 f29f430e7c better handling of non-rpc messages 8 years ago
yflory e40f43bd20 Migrated pads were not displayed instantly in the drive 8 years ago
yflory a5924cb803 Make sure the initial title is set in the userDoc when creating a new pad 8 years ago
ansuz 0e9ebddf11 fix the things 8 years ago
ansuz c0e2c1060e don't reload when slide hash changes 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 17146d7af9 send feedback for uploads 8 years ago
yflory 2068a8b85b Embed the mediatag library in the file app 8 years ago
yflory 66b076111e Add an upload button to the slide's file picker 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 a237eec41e Add a file picker in the slide app 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
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 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 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 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
yflory 803bad1421 Move the file upload code in a separate file 8 years ago
yflory a58162a617 Make the drive tests work when not logged in 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
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
yflory 30bdb9881c Fix undefined element in select dropdown menus 8 years ago
yflory 8471dab6b1 Provide hints in theme and language dropdowns 8 years ago
yflory a5cb5f2ceb Merge branch 'staging' into newDrive 8 years ago
yflory 9cc25d4c9f Merge branch 'staging' into newDrive 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
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
yflory 1c2ea04f11 Drive refactoring 8 years ago
ansuz fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors 8 years ago
ansuz da533b106a improve type checking in getFileSize 8 years ago
ansuz d25477e8c6 don't let tooltips interfere with DOM interaction 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 767793b5ca fix stuck loading tip 8 years ago
ansuz f631973f1f optimize file upload 8 years ago
ansuz 55af84cc90 lower spinner timeout interval 8 years ago
ansuz 07279c8dc7 export boolean Test.testing 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 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 21c39572be Update media-tag and fix bower dependencies 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 9ca5bc507e add support for donate button 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
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
yflory df2b00122a New drive structure without file names 8 years ago
ansuz d9f7470f06 copy user details into sessionStorage for safari 8 years ago
ansuz fd83ae3e61 implement createRandomInteger 8 years ago
ansuz dc80b6b11f throttle markdown preview 8 years ago
ansuz e6c04ccb49 bump server after paying for an account 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 d55b7e411c Display an alert in the drive when the limit is reached 8 years ago
ansuz 71dc0af6c7 better test for success error codes 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 ba5ef5157e show pretty representations of storage usage 8 years ago
ansuz e78299aed6 use async file decryption, listen for progress events. 8 years ago
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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 2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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
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 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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
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
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 2dd04f7631 get limits from the server 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 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 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 42f3a62cac handle errors with XHR 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 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 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
ansuz 6d30d7f89f strip junk bytes from base64 more safely 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 5c8586f8a3 Fix typo in file upload 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 922e7803e9 remove extraneous slashes from hashes when parsing 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
yflory 63710e1ccc Move the code related to the title in another file 8 years ago
yflory ce5cdce917 Fix an issue where the username was lost on websocket reconnect 8 years ago
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere' 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 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 3e118c6a38 allow instance-wide custom salt for login 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 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 ef89451a83 Display the storage limit 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
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 ef58120819 Prevent multiple concurrent clicks to get the history 8 years ago
yflory 16f6ab813c Make it clear that the number is the history represents a version 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
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 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 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
yflory fdd51ec18d Don't remove a folder moved into unsorted or into itself 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 3afaf029cb feedback about how often we migrate an old drive 8 years ago
ansuz e8b053e48b use bootloader in feedback.html 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
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
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 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
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
yflory 633d60ccd0 Remove a TODO 8 years ago
yflory 81d83897ec Rename hash.js 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
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 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
ansuz 2c8d1b8183 jshint compliance 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
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 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 a2f692b9a3 clean up serverside and clientside pinning logic 8 years ago
ansuz fdede0d1fd remove some dead code 8 years ago
ansuz e87992c7ec implement atomic pin reset rpc 8 years ago
ansuz 3380cf0348 implement getTotalSize rpc 8 years ago
ansuz 5c292fb1fa jshint compliance 8 years ago
ansuz 64089c5f6b implement pad pinning 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 3e47b8a38d remove dead code 8 years ago
ansuz 182dbfc874 implement pinning logic in pinpad.js 8 years ago
ansuz a5e5ddae08 rpc all the things 8 years ago
ansuz 04069cc7f4 fix font size 8 years ago
ansuz 6e9968f989 add 'lol' code theme 8 years ago
ansuz 9b4b642d4a protect against subtly corrupted user objects 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 ed89a13fe6 progress on adding version string to some css 8 years ago
ansuz 76990ac1b2 version toolbar.css for cache-busting 8 years ago
ansuz a0c17d7c9b latest rpc code 8 years ago
ansuz 59a80d5fde remove silly TODO 8 years ago
yflory a8ffac5dcd Remove old code 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
yflory 994d640f8b Fix an issue causing the lag icon to lose its color 8 years ago
yflory 6fbd1f0028 Store the dates as number and not strings to avoid ot issues 8 years ago
yflory 51033ab70a Remove useless links in the context menu and properties for readonly pads in the drive 8 years ago
yflory 7afde2309d Add properties to the files not in the trash 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 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
ansuz d422c7e165 support old hashes in getUserChannelList 8 years ago
ansuz 5ed6223313 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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 7761aaa89f Add search UI 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 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
ansuz 7187d3c550 implement getUserChannelList 8 years ago
ansuz 306f6ce806 resolve merge-conflict with accounting branch 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 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
ansuz 07a2d8e189 apply translations on feedback page 8 years ago
yflory b7986ff6b1 Replace the spinner code with a font awesome spinner 8 years ago
ansuz d9996cc874 current work for pinning 8 years ago
ansuz b3cc8da315 implement basic clientside RPC infrastructure
and provide a basic example for testing it
8 years ago
ansuz 81027b4200 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting 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 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 9ad33574e9 Fix the function returning the pads list in the drive 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
yflory 2a1b241592 Display a button to open the editing link while in read-only mode if we know it 8 years ago
yflory ed9bcca96f Close the websocket network when CryptGet/CryptPut is done 8 years ago
ansuz 0bb10a8a0a Merge branch 'staging' of 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
ansuz 01c4d7d4a7 Merge branch 'maybe' into staging 8 years ago
ansuz c884782d57 here are some changes 8 years ago
yflory 9a7c2dd5e2 Add a 'settings' link to the user menu in static pages 8 years ago
yflory c5f983ecd7 Convert read-only link to editing link in the drive 8 years ago
ansuz a9afa24428 return empty string instead of blowing up when fixing HTML 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
ansuz cb5e01815c validate all alertify strings by default. require 'force' argument to bypass 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 5d39125004 Make onSettle Async Again 8 years ago
yflory 4f4075ed6e Make the settings app available to anonymous users 8 years ago
ansuz 12aec60a12 hack around onSettle not doing its job 8 years ago
ansuz 1a259bb3aa check if user has disallowed feedback api 8 years ago
yflory 498f4065cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 66dc166936 Make sure the realtime is synced with onSettle when using cryptget 8 years ago
ansuz de5a21fe57 add a simple feedback api and text explaining what it is 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 e15a6a347f Fix the forget pad button 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 ba0b314f5e Fix the 'new' button in drive which was broken in non root categories 8 years ago
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 8 years ago
ansuz 7e77c6828a more correct pluralization 8 years ago
yflory c72bbd4c37 Use the file name as initial title 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 d81d17b86c Remove old translations keys no longer used 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
ansuz 94417d9a8b jshint compliance 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 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 7758d056fa Ability to import/export a user realtime object 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 b1b294aade Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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 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 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 f8366e0cfc Remove support for legacy store and add a way to import legacy pads 8 years ago
yflory 67d881b2cf Remove the drive entry from the user menu if already in drive 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 6e97082ff9 remove dead code from login function 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 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 87abfac5e0 Fix lint error 8 years ago
yflory 02439e0f61 Improve the homepage with new images and translations 8 years ago
yflory 2c6b4b9c6a Hide disabled applications from the context menu in drive 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
yflory 65054119cf Fix a bug preventing reconnection in drive 8 years ago
yflory 757ae7a3ad Fix a cross origin frame issue with dropdowns 8 years ago
yflory 39c85ca3f7 Fix race condition causing missing translations in homepage 8 years ago
yflory 5e69b78334 Remove the domain from the href in store 8 years ago
yflory 58d8a30b5b Redirect to the main page when logging out 8 years ago
yflory 5ef074370b Name a place before creating it in the drive 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 c44f3a1044 Delete multiple elements could also remove unselected ones 8 years ago
yflory 3f44444f41 Display the 'New' button in the trash 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 373b07ed28 Fix lint errors 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 9d275daebb Backport changes for the login page from hpbs branch 8 years ago
yflory 99b8898e54 Apply new title when clicking on the page without pressing enter 8 years ago
yflory 88d5b4cc9c Add a 'New pad' button in the toolbar 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 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
yflory 3f1e287811 Fix an issue causing a user object to be turned into a pad 8 years ago
yflory 569ea21705 Replace the language selector by our custom dropdown menu 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
yflory f74d0a46a4 Remove the alert when pressing del in 'all files' 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
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
ansuz e56cc49f79 catch errors that popped up because of a cross-origin iframe 8 years ago
ansuz 5cd714b18a configure filestore usage via customize/application_config.js 8 years ago
ansuz 91a806ab86 focus on OK button when we pop an alert 8 years ago
ansuz 89e5830409 make alertify display time configurable 8 years ago
ansuz 5e1d8292c5 guard against trying to parse special fragments 8 years ago
ansuz 52a593c2c2 fix jshint complaints 8 years ago
ansuz 53a4d4738a really make sure you're logged out 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 29d406b7a9 implement cryptput 8 years ago
yflory 87abfff66b Fix Flash Of Unstyled Content (fouc) 8 years ago
ansuz 1682d23c1c remove old user prototype 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
ansuz bd6992da0a create a random hash 8 years ago
ansuz 2cd50498c2 add log(in|out) functions to common 8 years ago
ansuz 7df460c766 implement createChannelId api 8 years ago
ansuz 5a14db9f07 Merge branch 'test-filemanager' into login 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 2968488278 convert uint8 arrays to hex 8 years ago
yflory 8e6830d080 Fix file manager with a chosen hash 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 cb43eb9ca1 Merge branch 'newpoll' into fileManagerMerge 8 years ago
yflory 9b3719e0ae Merge branch 'soon' into fileManagerMerge 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 5a5451d94c Sort elements in the trash, add properties in the context menu, fix issue with Edge 8 years ago
yflory a957b72598 Create a 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
ansuz c2770a7a74 set correct hash even if browser does not implement replaceState 8 years ago
ansuz 303c65f2c3 use replaceState if available, instead of setting the hash 8 years ago
ansuz 2d5448458b export messages 8 years ago
ansuz d512b113cd address failure to parse url when hash is not present 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 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
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 91b4446c0b Merge branch 'fix-chrome-style-bug' into soon 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 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 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 3dfa19b786 more flexible websocket configuration (WIP) 8 years ago
yflory 76fdadee7f Store only the strongest hash in the localstorage 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 f03018f3bc Improve the top bar and use the font awesome icons in /code 8 years ago
yflory 3d54413343 Improve the UI with FontAwesome icons 8 years ago
ansuz d6525087c7 jshint compliancy 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 dde519795d Merge branch 'newhash' into newhashNoConflict 8 years ago
ansuz f29e3d7b0d don't let notifications interfere with document titles 8 years ago
yflory 83705ae058 Improve the UI in read-only mode 8 years ago
ansuz fa8199bc75 don't try to use experimental user code 8 years ago
Yann Flory 99b50465c7 Add the read-only mode for /pad and /code 8 years ago
Yann Flory 42f14873cd Merge branch 'translations' into newhashmerge 8 years ago
Yann Flory 391b7690e6 Set the pad to readonly mode when using a 'view' url 8 years ago
Yann Flory 368e253c9f Ability to send a read-only URL 8 years ago
yflory 5c63585952 Complete the French translation 8 years ago
yflory 0d9f63b977 Merge branch 'translations' - part one 8 years ago
yflory f086492e50 Improve the localization system
Improve and enable the French translation
8 years ago
yflory 25c8d16bf5 Use a new version-prefixed hash parser 8 years ago
yflory c736caceba Use a better default pad title 8 years ago
ansuz 97415d8158 Merge branch 'users' 8 years ago
ansuz 8e86be81b2 Merge branch 'better-slides' 8 years ago
ansuz fb21b4e46b fix up /render/ 8 years ago
ansuz 4941c1493e better user integration. a few more common utils 8 years ago
ansuz 30ea1b59b7 integrate users into common utilities 8 years ago
ansuz 6d775f61c6 add missing functions 8 years ago
ansuz 168338b898 add missing functions 8 years ago
ansuz f47a6f1cbb Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
ansuz f40b798d88 Merge pull request #30 from xwiki-labs/reconnect
Ability to reconnect after a connection failure
8 years ago
yflory c168ce2d1c Ability to reconnect after a connection failure 8 years ago
ansuz 1bec02239c coerce dates into strings 8 years ago
ansuz 0add01a940 remove dead code 8 years ago
ansuz 8c914dfe1f better filenames 8 years ago
ansuz 7eaa4ce733 recognize pads with the same type and hash as identical no matter their domain 8 years ago
ansuz 5131f47cca jshint compliance 8 years ago
ansuz 306d524416 fix broken removal call 8 years ago
ansuz dd3a5d47be migrate localStorage so people go to cryptpad.fr 8 years ago
ansuz a094e3c02e use correct store api calls in frame.js
also don't log unnecessarily
8 years ago
ansuz dcc9810a42 avoid extra call to store if there are no keys to remove 8 years ago
ansuz 9a5294016d fix incorrect usage of store api 8 years ago
ansuz 4e5f381325 add spinner to API. update bower deps 8 years ago
ansuz fa654a7646 slightly better regex 8 years ago
ansuz cd18075ac7 add some redirection logic to support old hash types 8 years ago
ansuz 600f3151e9 don't use the store until it's ready to be used 8 years ago
ansuz fffa9acf15 remove unused files from fs and jshintignore 8 years ago
ansuz 551d38c930 let the abstraction take care of stringification 8 years ago
ansuz 0ada6a3d0a jshint compliance. gotta keep those tests green 8 years ago
ansuz 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
8 years ago
ansuz 7f02c899ea add snippet for copying text to the clipboard 8 years ago
ansuz 42eafe9e29 don't create duplicate stylesheets in the document head 8 years ago
ansuz c6bdb7506d forget everything about a pad when you forget it 8 years ago
ansuz e84fbf0bc3 more helpers in common 8 years ago
ansuz ff74a67a09 translate alertify button messages 8 years ago
ansuz d39ab5c250 point to the actual translation file 8 years ago
ansuz dea8e225db fix double scrollbar issue 8 years ago
ansuz 3eccec7054 better effort for translation 9 years ago
ansuz cbeaa8d609 major refactoring for toolbar. CAN HAZ LESS 9 years ago
ansuz 7504f79e05 add log and warn methods to cryptpad common 9 years ago
ansuz 3ad5d71ab1 make sure the regular favicon is set 9 years ago
ansuz fd3cd73d0b try to fix favicon bug 9 years ago
ansuz 589b0087a1 listen for keyup events while alertify prompts are active 9 years ago
ansuz deae7ac78f don't hide the notification until it has been seen 9 years ago
ansuz 3d3c6e4800 add wrappers for alertifyjs 9 years ago
ansuz 73d2b6561a add small modules for page visibility api and notification apis 9 years ago
ansuz d8b467422a fix default title in localStorage migration 9 years ago
ansuz 7a5877d12a don't filter pads after 30 days 9 years ago
ansuz d844551fba add a forget button. clean up toolbar a bit 9 years ago
ansuz 8a82e11306 make sure title is defined for home page usage 9 years ago
ansuz 71b1f71ba0 fix migration to include ctime 9 years ago
ansuz 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
ansuz a3da10766a add rename button to /code/ and /pad/ 9 years ago
ansuz 93dcf29c15 more functions for working with localstorage 9 years ago
ansuz d025d13295 address some jshint complaints 9 years ago
ansuz 12bbf3e8f6 don't drop values onto the window 9 years ago
ansuz ca45e3533d pass loaded file to callback when importing 9 years ago
ansuz 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
ansuz 31aa09d6f6 work a bit more on import/export and code highlighting 9 years ago
ansuz 242c9a99e3 implement import and export in /pad/ 9 years ago
ansuz 0a8137e7eb move rememberPad to cryptpad common and simplify it a bit 9 years ago
ansuz c3d2568d3c add file export for codepad
addresses #24
9 years ago
ansuz 2b8c21d292 set styles with setAttribute. fixes style fights 9 years ago
ansuz 1746a4e732 use crypto from bower 9 years ago
ansuz 2a3ff256b9 remove libraries which are now in bower 9 years ago
ansuz f72cb24fc5 rm LORIA 9 years ago
ansuz 2c3de49922 remove realtime-input, since it's in bower now 9 years ago
ansuz 2798d1b1f9 all of the list/map api's dependencies are now on bower 9 years ago
ansuz 58c968b319 minor cleanup in realtime-input 9 years ago
ansuz 288b4d5b66 depend on main passing in the crypto module for now 9 years ago
ansuz 85dbd5cb6e pass in websocketURL from main 9 years ago
ansuz d9a4f2f22c missed one 9 years ago
ansuz ff0f7d15dc use json-ot from bower 9 years ago
ansuz 58633af943 listmap can be reused. put it in common/ 9 years ago
ansuz dbf1e2b870 support reusing the netflux network
export more internals from realtime input
9 years ago
ansuz 83696495a8 use chainpad from bower, not local 9 years ago
ansuz 954ee26f4d fix undefined disconnect reason 9 years ago
ansuz 9336c4de5c import latest chainpad 9 years ago
ansuz 058548b95a revert my reversion
Revert "Revert "Added checkpoints with the new code from ChainPad""

This reverts commit 6e2e8bf21f.
9 years ago
ansuz 6e2e8bf21f Revert "Added checkpoints with the new code from ChainPad"
This reverts commit da2bfe2de9.
9 years ago
ansuz ce99bd9ba3 Merge branch 'two' of github.com:xwiki-labs/cryptpad into two 9 years ago
ansuz a0c73c95d8 do away with a bit of boilerplate 9 years ago
Caleb James DeLisle da2bfe2de9 Added checkpoints with the new code from ChainPad 9 years ago
ansuz cf85de6113 remove old bencoding code 9 years ago
ansuz d99bb8ff84 WIP : fallback to old parsing doesn't work 9 years ago
ansuz f04be53d11 fall back to old parsing if the message is bencoded? 9 years ago
ansuz 976a08cc7a move to chainpad version 2 9 years ago
ansuz cae750cd75 update padrtc for to use bower libraries 9 years ago
ansuz 7faf57602b implement log level settings from application layer 9 years ago
ansuz 523aff3067 use upstream chainpad.js 9 years ago
ansuz c752e4a6e5 remove sharejs 9 years ago
ansuz 6b2e986789 remove deprecated textsocket library 9 years ago
ansuz 150ebaba7b add ability to force text diffing 9 years ago
ansuz ba17b78f7a restyle name change button 9 years ago
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied 9 years ago
Yann Flory 5bb2e12db2 Merge branch 'beta' into migrate 9 years ago
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux 9 years ago
Caleb James DeLisle 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 9 years ago
Yann Flory 85d5f5c47f Convert netflux to es5 9 years ago
Caleb James DeLisle 5f16ad4a58 Update to most recent chainpad 9 years ago
ansuz aa07dd31ee have json-ot initialize its own debug module, instead of relying on a window variable's existence 9 years ago
Yann Flory 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
Yann Flory 8ac69ca262 Add a missing "time" property in the netflux client causing incorrect
timeout errors
9 years ago
ansuz b140b6429d remove a little bit of dead code 9 years ago
ansuz bbdc9da853 delete duplicated file 9 years ago
ansuz 5f4825f3a0 don't change the hash from realtime input
let applications handle that logic
9 years ago
ansuz 4f426651ad remove TextPatcher from RealtimeTextSocket 9 years ago
ansuz 02ff1a63a4 Merge branch 'netflux' into beta
Conflicts:
	www/assert/main.js
9 years ago
ansuz a18c793f98 use latest hyperjson 9 years ago
ansuz 9efcc443cd add 'format' to TextPatcher's API 9 years ago
ansuz 0769e50414 move TextPatcher to highest application layer 9 years ago
ansuz 1d70335228 provide all callbacks before starting 9 years ago
ansuz a3787ee4dc Merge branch 'netflux' into beta 9 years ago
ansuz 010566d3c3 pushDelta was mistakenly deprecated. restored. 9 years ago
ansuz 3598c93098 move new hyperjson into common 9 years ago
ansuz 103bb69daa move custom hyperscript into common 9 years ago
ansuz b83fb7b823 improve brFix logic
stop exporting functions which we wish to deprecate
9 years ago
ansuz cb979844f6 implement text patching at application layer 9 years ago
ansuz 4a41575e6d accept onLocal in config 9 years ago
ansuz d3c2c901b6 implement cursor transformation in a common library 9 years ago
ansuz 92d89f6cac start to factor sharejs into two modules 9 years ago
ansuz 13dc77b7f6 remove commented line 9 years ago
ansuz 41e635b2e5 realtime-input.js : turn on logging 9 years ago
Yann Flory 69e8e18283 Remove the pipe character in the hash 9 years ago
ansuz d62e9fc1c9 add a missing semicolon 9 years ago
Yann Flory c32045d7d0 Fix an issue with missing characters when several users were typing at the same time 9 years ago
Yann Flory be09a1808d Remove old code from realtime-input 9 years ago
Yann Flory 6884b0890a Fix the typong tests not working properly 9 years ago
Yann Flory e207d8b579 Merge branch 'diffdom' into netflux 9 years ago
ansuz f4c5b2a996 Add sane defaults to TextPatcher diffs 9 years ago
ansuz 259772dd62 Turn on TextPatcher logging for _socket 9 years ago
ansuz 0537c28919 Add switchable logging to TextPatcher.js 9 years ago
Caleb James DeLisle 8a36963582 Enable ChainPad PARANOIA mode but remove the part which causes most slowness 9 years ago
ansuz 19cd991dba trim dead code, comment, very minor optimizations 9 years ago
ansuz 9f45ccb2d9 use console.error for stack traces 9 years ago
ansuz 368d72b337 add missing semicolons to TextPatcher.js 9 years ago
ansuz 851ccfbdb6 detect falsey operations in OT and ignore them 9 years ago
ansuz 400f6efde1 json-ot.js : jshint compliance 9 years ago
ansuz ca94d30386 detect falsey operations in OT and ignore them 9 years ago
ansuz 9f9cd8d8cd realtime-input.js : fixes for jshint compliance 9 years ago
ansuz 793149a608 json-ot.js : jshint compliance 9 years ago
ansuz 06a3b63923 jshint compliance for toolbar.js 9 years ago
ansuz 5cead3fad3 add missing semicolons to TextPatcher.js 9 years ago
ansuz 94e57e4a26 update location of text-patcher.js 9 years ago
ansuz b37dab1f49 Merge branch 'diffdom' into netflux
Simple cleanup and unit tests
9 years ago
ansuz 6b9d982d40 stabilize _socket/realtime-input.js
...as common/RealtimeTextSocket.js
9 years ago
ansuz 39071021eb stabilize typingTest.js as /common/TypingTests.js 9 years ago
ansuz 9805958ad7 stabilize text-patcher.js into /common/TextPatcher.js 9 years ago
ansuz 7782069dbd Merge pull request #15 from xwiki-labs/diffdom
merge diffdom into netflux
9 years ago
ansuz a1f9b10175 remove offending line from chainpad entirely
RTCHAINPAD-3
9 years ago
ansuz 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
ansuz 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
Yann Flory 713c90242b Hide the usernames when they have not been changed 9 years ago
Yann Flory 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
Yann Flory cf9f60bd57 The server don't send back anymore messages to their sender 9 years ago
Yann Flory eb4ea7a6b0 Remove the content from the ACK messages sent by the server 9 years ago
Yann Flory ba4faea939 Update the pads to run with the latest improvements to the websocket server 9 years ago
Yann Flory 5ef7e29a9b Add the latest changes from _socket into the netflux pad 9 years ago
ansuz b59a14c5ac merge hyperjson changes from realtime xwiki
more resilient class serialization.
comments
9 years ago
Yann Flory b41f0e8c50 Merge branch 'cjd-fixed-it-with-hax' into netflux2 9 years ago
ansuz c50690349b comments describing the role of each argument 9 years ago
ansuz 96e03fcfa4 Use latest chainpad without mutations 9 years ago
ansuz 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
ansuz 6c340a6527 chainpad testing = true, reject non-compliant messages 9 years ago
ansuz afa1104d85 Pull the cursor out of bogus BR tarpits when it gets stuck 9 years ago
ansuz bac0e0ff88 implement hyperjson filtering 9 years ago
ansuz 478ccbf984 revert changes to chainpad 9 years ago
Caleb James DeLisle 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
Caleb James DeLisle 98c85cef8b xxx 9 years ago
Caleb James DeLisle 62eabbc7ae If a message does not match parent hash, don't delete it from storage 9 years ago
Caleb James DeLisle dbf31798d5 json-ot triggering PARANOIA errors in ChainPad 9 years ago
Caleb James DeLisle 03932d0169 small changes to chainpad for testing 9 years ago
Caleb James DeLisle 420a7098a6 more testing and crap 9 years ago
ansuz e066730b68 add notes about how hyperjson is to be used 9 years ago
ansuz 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
ansuz 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
ansuz 475ca9bea8 hyperjson.js : used split instead of filter... oops 9 years ago
ansuz 1bd5cb9e27 hyperjson.js : used split instead of filter... oops 9 years ago
ansuz b2753ef7b7 fix string manipulation off-by-one 9 years ago
ansuz f98fda7604 fix string manipulation off-by-one 9 years ago
ansuz 4f3fcb08a4 better error reporting when the operational transform fails to parse JSON 9 years ago
ansuz 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
ansuz fbe6225681 Don't attempt to use the cursor selection when it has length 0
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
ansuz 0c6222b5f9 better error reporting when the operational transform fails to parse JSON 9 years ago
ansuz 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
ansuz bd24821c6c Don't attempt to use the cursor selection when it has length 0
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
Yann Flory 38d797a4f1 Fix issue with Chrome and WebRTC 9 years ago
Yann Flory 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
Yann Flory e77d85bc82 Trigger an onReady() method when the user's pad is fully synced (the history is loaded) 9 years ago
Yann Flory eca4ec699c Ability to change the username (the user ID is displayed by default) 9 years ago
Yann Flory 6e50ae94dd Remove unused code 9 years ago
Yann Flory 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
Yann Flory 3a188625e0 Improve the detection of a disconnected peer to update the user list with the WebRTC service 9 years ago
Yann Flory 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
Yann Flory 06e5c84702 Clean some code 9 years ago
Yann Flory b1e8bcddef Fix the user list not working with the WebRTC service and causing major issues 9 years ago
Yann Flory c576241104 Add a Chainpad adapter to make Chainpad know the userList 9 years ago
Yann Flory ae8f6f7f2c Ability to choose which protocol to use (Websocket or WebRTC) with Netflux 9 years ago
Yann Flory b7885eb539 Fix channel history 9 years ago
ansuz 8258018c1d Revert "fix undefined reference"
This reverts commit 7d65540123.

To restore functionality in convert.js
9 years ago
ansuz 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
Yann Flory c536ecbc1c Temp commit 9 years ago
Yann Flory 870b2dbb7e Add the WebRTC server in Cryptpad 9 years ago
Yann Flory c4f62fb812 First try with WebRTC 9 years ago
Yann Flory 09a06a8bc5 Replace the chainpad server by the netflux server 9 years ago
Yann Flory 60c3aceb0d Add chatflux server 9 years ago
Yann Flory deb2084fc5 Add the socket connection checker 9 years ago
ansuz d3e2a2f52e make verbose logging switchable via a conditional 9 years ago
ansuz fefb904261 realtime input changes 9 years ago
ansuz fd99dba4a3 modify realtime-input api to take a single object as configuration. merge netflux API 9 years ago
Yann Flory 62ba579d4a Add Netflux API with WebSocket service V1 9 years ago
ansuz d7b34cf6be don't call toolbar from within realtime-input.js 9 years ago
ansuz 5e1566eaec fix incomplete 'onAbort' block 9 years ago
ansuz 1d6ccc99a1 add 'onAbort' hook to realtime-input.js 9 years ago
ansuz 6ff5b10486 remove local diffDOM version 9 years ago
ansuz 93fb944e1f remove broken functions from convert module 9 years ago
ansuz 7d65540123 fix undefined reference 9 years ago
ansuz 6884fabda9 Use local diffDOM instead of bower_components
At least until the PR gets accepted
9 years ago
ansuz f5a8727254 remove some unused functions from cursor.js 9 years ago
ansuz db1515c445 cursor.js : commit before cleaning up 9 years ago
ansuz 91ada5ce7a export Operation from chainpad. for use with OT 9 years ago
ansuz 5425699f43 check if possible parent exists before checking if it contains another element 9 years ago
ansuz 67bdb8a65a fix a bad regex that occasionally threw an error
'nothing to repeat'
9 years ago
ansuz 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
ansuz de46be85ba add better helpers for finding and resetting the cursor 9 years ago
ansuz c09036bd29 snapshot cursor.js, as some things are working quite well now 9 years ago
ansuz 4eee1f5210 add orderOfNodes function to tree library 9 years ago
ansuz 7689151fc0 pull json validation for OT into its own module for reuse 9 years ago
ansuz 2c8a2406c6 cursor.js : snapshot before code deletion 9 years ago
ansuz 1beb3f5355 snapshot of treesome.js before deletion 9 years ago
ansuz 8ead5ca129 realtime-input.js : add notes regarding integration of the netflux api 9 years ago
ansuz d1885fbab6 better jshint compliance for common files 9 years ago
ansuz 539cc3a2fa remove unused files from common directory 9 years ago
ansuz afa2811472 remove local version of marked.js, prefer bower version 9 years ago
ansuz a600ece5c5 fix jshint complaints in common directory 9 years ago
ansuz 2c5a2b6023 remove unused code, add todos, fix minor errors 9 years ago
ansuz 967d636df9 address more jshint complaints 9 years ago
ansuz f6c848385f hyperjson.js : jshint complains about var index in for loop 9 years ago
ansuz 7f92abc7bf Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect 9 years ago
Caleb James DeLisle 86c4a69a97 Switch to patching with DiffDOM for testing :D 9 years ago
ansuz 653ba33b65 Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect 9 years ago
Caleb James DeLisle 2031191261 testing=false 9 years ago
Caleb James DeLisle 37db31b09e Attempt an operational transformation and if the result is not valid JSON then fail 9 years ago
ansuz c22269e36e cursor.js : make the console a little less noisy 9 years ago
ansuz 99a23154b7 files for unstubbing OT 9 years ago
ansuz c740c0ec92 add stuff for walking the tree 9 years ago
ansuz ad184b1114 add stuff to recover the cursor 9 years ago
ansuz 019750bea8 realtime-input.js : callback onInit if exists 9 years ago
ansuz 7102a0a164 make rainbows 9 years ago
ansuz d2f6c63d8a realtime-input.js : changed the api and left an undefined reference. fixed 9 years ago
ansuz 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
ansuz ed03a48092 minor patches that make things a bit more reliable, still some bugs 9 years ago
ansuz ac0f7852fc committing latest changes for review 9 years ago
ansuz 2016550e01 virtual-dom.js : identify problem area? 9 years ago
ansuz fd1e5d5735 better styling on render page
now solarized dark
9 years ago
ansuz b18dfef656 sharejs textarea is used by realtime-input.js 9 years ago
ansuz 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
ansuz 40b8c0efe8 drop in chjj's marked.js for a cool demo 9 years ago
ansuz 0c2e057f9d export component APIs from convert 9 years ago
ansuz b958caebdd dom, vdom, hyperjson, and an api which provides a matrix of conversions 9 years ago
ansuz 2ed9f0867a Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad 9 years ago
ansuz ff52f050e5 chainpad.js : pull in upstream changes to chainpad.js. new APIs 9 years ago
ansuz 9fc44cdf0c add notes to clientside js files 9 years ago
Yann Flory 9a932a3f56 Patch Realtime into CodeMirror in CryptPad 9 years ago
Caleb James DeLisle 88fb6772e8 Cleaned up the front page and added a little piece of code to show recent pads 10 years ago
Caleb James DeLisle 51544db9a2 Completed adding of customization system and bottom infobar 10 years ago
Caleb James DeLisle 0e44b10aeb Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet 10 years ago
Caleb James DeLisle e039e90a24 upgrade to most recent chainpad 10 years ago
Caleb James DeLisle 50c10f818e Added cryptsheet to cryptpad suite! 10 years ago