1678 Commits (a40315aff7b4376d811e93ee70058b90f7670ebd)

Author SHA1 Message Date
ansuz ee874878dd clear tooltips when the userlist is redrawn 7 years ago
ansuz f207edfd28 handle errors when deriving keys. fix incorrect reference 7 years ago
Caleb James DeLisle e04c0b89a1 manual merge of staging 7 years ago
ansuz 130b330ede refactor messaging 7 years ago
ansuz 736288a85b lint compliance 7 years ago
ansuz 5037f444e9 update markdown sanitization strategy 7 years ago
Caleb James DeLisle 878a565f89 tiny little performance improvement in something that really doesn't need it 7 years ago
Caleb James DeLisle 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
Pierre Bondoerffer 17b986a6ca
fix toolbar drive link (oops) 7 years ago
ansuz 284124a32d WIP 7 years ago
Caleb James DeLisle 4acd9957a9 Set the url if there is none 7 years ago
Caleb James DeLisle 33e73dd5e5 fixed one last fight 7 years ago
Caleb James DeLisle 9c0b0cc6a8 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 1e56fa31c0 yay, they talk and they don't fight 7 years ago
ansuz 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle b3d349bf80 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 8efac4e661 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Caleb James DeLisle 0dde1d7507 wip 7 years ago
Pierre Bondoerffer baf64114a6
point to homepage in drive 7 years ago
Caleb James DeLisle c304071492 wip 7 years ago
Caleb James DeLisle e49a42db18 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 1f9bd866c3 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Pierre Bondoerffer edad5deeac
fix logo not showing sometimes in chrome 7 years ago
Caleb James DeLisle 52565076b9 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Caleb James DeLisle 4b25ab80d6 wip 7 years ago
ansuz 844967a880 continued refactoring 7 years ago
Pierre Bondoerffer a4aeada585
make the file dialog placeholder visible, center file list 7 years ago
Pierre Bondoerffer e08ed72653
generate the tooltip after the button 7 years ago
Pierre Bondoerffer 665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended 7 years ago
Pierre Bondoerffer 34ba673cd3
improve file upload UI 7 years ago
ansuz 34a5a32c44 lint compliance 7 years ago
ansuz cdf3cee9c8 split out message rendering into ui 7 years ago
ansuz fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 58b3b32cc3 big messaging refactor. split UI from logic 7 years ago
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar 7 years ago
Pierre Bondoerffer d3f2398865
bump tippy to 1.2.0, add dynamicTitle option 7 years ago
ansuz 8301bd44be Merge pull request #164 from pbondoer/staging
UI improvements
7 years ago
Pierre Bondoerffer f585ddccdf
fix image sizes in /slide/ 7 years ago
ansuz fc95f1b6a8 lint compliance 7 years ago
ansuz ba9696ba33 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle a612f02be2 Merge branch 'staging' into pad2 7 years ago
ansuz c63807fd2b implement channel.send 7 years ago
Caleb James DeLisle 35a55a15ed wip 7 years ago
ansuz d835005905 simplify in-memory message format 7 years ago
Pierre Bondoerffer 8f285eba9f
make file picker ui even prettier 7 years ago
ansuz 797cc2b105 handle messages which fail to decrypt 7 years ago
Caleb James DeLisle 65dfd99171 major wip 7 years ago
Pierre Bondoerffer c53e738054
improve file picker ui 7 years ago
ansuz bad5160885 fix bad reference 7 years ago
ansuz 05aa5ed347 hide new feature until it is finished 7 years ago
ansuz 395f6e1b27 reset confirm text for alertify 7 years ago
ansuz 9865359bb0 don't tell users about new versions 7 years ago
ansuz c8c44d3bfc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 0d1f19f5d4 Big manual merge 7 years ago
Pierre Bondoerffer f6d45d05f6
use logo in toolbar 7 years ago
ansuz 11c72499a0 don't add duplicate messages to the history 7 years ago
ansuz 52854c5a8e ignore history range responses 7 years ago
ansuz e786117110 get new messages when reconnecting and WIP get more history 7 years ago
ansuz 2ce341fed6 disable input field when disconnected 7 years ago
ansuz 66d81429bd integrate file embed into code editor 7 years ago
ansuz 8b0831ac5d save images drawn with whiteboard to your CryptDrive 7 years ago
ansuz fe826133b3 make some markdown styles reusable 7 years ago
ansuz 35cf23ce2c clear tooltips when redrawing the userlist 7 years ago
ansuz 4c6f8d71e1 don't invoke spinner if it does not exist 7 years ago
ansuz 311f709dc4 lint compliance 7 years ago
ansuz c147d342a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 542d0cd17f drop support for legacy pad list 7 years ago
Pierre Bondoerffer 93e007b52a
reduce png sizes 7 years ago
ansuz 3fa010027c implement clearTooltips 7 years ago
ansuz a68a225d79 fix read-only synchronization bug 7 years ago
CatalinScr 796bf89491 Update of the front-page 8 years ago
Nicolas Lemoine 658b00814b TodoApp - Style and translations 8 years ago
ansuz ae693ff5a7 lint compliance 8 years ago
ansuz 6622735db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 55cb0734e2 make bad state timeout configurable 8 years ago
yflory 469f49fc0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a80b00a765 Move the file picker in common 8 years ago
ansuz d44f0696af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 2d0635a409 use custom version of tippy 8 years ago
yflory 09793e0d7d jshint 8 years ago
yflory 683769f30a Fix tooltips 8 years ago
yflory 9633025afe CSS for the removeHistory button in contacts 8 years ago
yflory 97f1bbedc5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b9bba76b4e Make the delay for tooltips configurable 8 years ago
ansuz dd98e2222a WIP erase chat history button 8 years ago
ansuz 128d5b2c6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz b22127f10c add history removal 8 years ago
yflory a5a73ce326 Fix print button in slide 8 years ago
yflory 140964478e Enter + shift key to add a new line in chat 8 years ago
yflory e26e041a5b fix jshint errors 8 years ago
yflory c33d2a2db0 New tooltips 8 years ago
yflory b56a782f01 Store the userlist state when it is closed using the icon 8 years ago
yflory 82c87144cb Remove the friend request button when the request is sent 8 years ago
yflory 5ce49af57b Make CryptDrive fast again 8 years ago
yflory e2d031c76a Add support for markdown syntax in contacts 8 years ago
yflory cba113a2b0 Lint 8 years ago
yflory 91ebbdfdb4 View contact status 8 years ago
ansuz 39fd0d0f5f notify if you're focused on a conversation in a bacgkrounded tab 8 years ago
yflory f719b34e09 Add tab notification in contacts 8 years ago
yflory baf439648e Add the contacts app in the dropdown menu 8 years ago
yflory 36d792874a Fix initial text not removed in /contacts 8 years ago
ansuz df0442c2bf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz eb4b5ca77c stub history removal. coming soon 8 years ago
yflory aa8181ab2b Contacts app translations 8 years ago
yflory 73e32f273e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 009d01abde Fix friend removal and update user data 8 years ago
ansuz 1aecdeb075 fresh media tag build 8 years ago
ansuz 7114bfaa52 lint compliance 8 years ago
ansuz e2c17dbeb4 resolve conflicts 8 years ago
yflory 557f13f796 Unfriend and update username - beta 8 years ago
ansuz 96d2ff67e1 user-plus as icon for add-friend 8 years ago
ansuz c3ba7cd792 fix race condition 8 years ago
ansuz d0d38aa2a3 feedback on first visit 8 years ago
ansuz 9527a5def7 avoid a CSP error. silence pdfjs warnings 8 years ago
ansuz 9707433944 comment out debugging info 8 years ago
ansuz 575d4612f9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz eda9908c3b prevent accessing attributes of null 8 years ago
ansuz eeb2ee2d17 add clear channel rpc 8 years ago
ansuz 89af8e4472 fix funny off-by-one thing 8 years ago
yflory ac684a8dc7 Use the APP toolbar in profile 8 years ago
yflory 2d509e3e25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b3e225cb3b Replace spinner by text and fix mobile UI 8 years ago
ansuz f450a28d11 improve logic for guessing titles within code documents 8 years ago
ansuz 0483d15b8f lint compliance 8 years ago
ansuz c0cb5c4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 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
8 years ago
ansuz 5b3cca58bd modifications to handle latest media-tag 8 years ago
yflory 7f5c301734 Add display name in the settings useradmin menu 8 years ago
yflory fb21a650ce Lint errors 8 years ago
yflory 159ccc2866 Fix mediatag flickering 8 years ago
yflory 16d0527e92 Add a page title in drive, settings and file 8 years ago
yflory a0b14faf89 Fix the font in settings and drive 8 years ago
yflory 8f5a244999 Replace mediatag markdown syntax by html. Enable file upload in /code. 8 years ago
yflory 438e7e6cf9 Fix display name in useradmin (friends app) 8 years ago
yflory e6188bfb63 Fix useradmin dropdown position 8 years ago
yflory 97d8d86395 Fix avatar in static pages 8 years ago
yflory e8f3df5a46 Clean less 8 years ago
yflory 159d72f33b Merge branch 'msg' into staging 8 years ago
yflory 8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory ff10c282d4 Avatar in the user admin button 8 years ago
yflory be6ee672d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f0523a0153 Avatar in the user admin menu 8 years ago
ansuz e10de1219b feedback on view hash usage 8 years ago
ansuz 52eb8e307c feedback for language used 8 years ago
yflory 1c531ccd47 Pin the chat channels 8 years ago
ansuz 4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 8 years ago
ansuz c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
ansuz 22fbc7e5d8 implement getter for public keys 8 years ago
yflory df103c4074 Messaging app 8 years ago
ansuz 1c462d5c4a use random token for feedback instead of date 8 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