2074 Commits (5d96c68ad74d590138a5f8a5df63b17f59b764e2)

Author SHA1 Message Date
ansuz 299a53ded7 prefer to use functions from common 8 years ago
ansuz a338b23f40 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz df47b913e3 fetch array buffers in cryptpad-common 8 years ago
yflory ff16084719 Fix lint errors 8 years ago
yflory 50c8a859e6 Move the CodeMirror cursor code to common-codemirror 8 years ago
yflory 9eb8e55cf6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files 8 years ago
ansuz 56a871cb67 Merge branch 'soon' into staging 8 years ago
ansuz 521f99a3d6 support drag and drop for file upload 8 years ago
ansuz b4973b7610 Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
ansuz ae7d65c3fa fix drag to select in chrome 8 years ago
yflory 63710e1ccc Move the code related to the title in another file 8 years ago
yflory 48898c97e5 Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
yflory ce5cdce917 Fix an issue where the username was lost on websocket reconnect 8 years ago
ansuz 1d4d4cffdb correct some copypasted code 8 years ago
ansuz 2b4f503aff Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
ansuz 4a104052b4 handle errors in file 8 years ago
yflory b818fd8a37 Fix 'undefined' error with the context menu 8 years ago
yflory c34c1cb07c Press enter to open a folder 8 years ago
ansuz 7da01d0862 unlist removed examples 8 years ago
ansuz ea3dc8a852 remove file upload test 8 years ago
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere' 8 years ago
yflory 1547063b7f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a20a319a7a Fix focus issues in the CryptDrive search bar 8 years ago
ansuz 36ab38f3ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 9206d89531 Fix lint errors 8 years ago
yflory bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 5a883d5a57 Use the new toolbar and move the userlist code in a separate file 8 years ago
yflory 6847906ac9 Move the userlist code in a separate file 8 years ago
ansuz 6471b572eb correct off-by-one 8 years ago
ansuz 3a338e0890 fix undefined reference 8 years ago
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 8 years ago
yflory 5a5b02b82b Don't store in the drive pads without a hash 8 years ago
ansuz c07d3e6162 update version strings for upcoming release 8 years ago
ansuz 3e118c6a38 allow instance-wide custom salt for login 8 years ago
ansuz 6a00d11a15 fix undefined reference 8 years ago
ansuz c3d1554e8c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 660cda6573 set title when uploading 8 years ago
yflory 706120ae5b Display images uploaded in the File app with the Media app 8 years ago
yflory 28cb40d7ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1b6fae4dd2 Update mediatag 8 years ago
ansuz a0c420af8e jshint compliance 8 years ago
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 78b11584f8 remove unused variables 8 years ago
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a190c99426 Toolbar refactoring 8 years ago
ansuz 5739c3d973 blow up if you ever run out of nonce-space 8 years ago
ansuz 2232518c64 set title after uploading 8 years ago
ansuz f644dc6c0b WIP support encrypted file upload via base64 chunks 8 years ago
ansuz 7573b86946 call back with error if an RPC is made while disconnected 8 years ago
ansuz 410a9dfb17 temporary solution for testing pin limits 8 years ago
yflory cd98fc6eab Increase the z-index of the select area in the drive 8 years ago
yflory 80115d0071 Fix an 'undefined' variable error in the drive 8 years ago
yflory c9d89debba Fix lint errors 8 years ago
yflory 79365a7a82 Use the shift key to select multiple files in CryptDrive 8 years ago
yflory 3262787244 Update the icon mode in CryptDrive 8 years ago
yflory d52e9fba43 Use the arrow keys to change the selection in the drive 8 years ago
yflory ef89451a83 Display the storage limit in the drive 8 years ago
yflory 1d3b8188b3 Add mobile support in the slide app 8 years ago
yflory d2e46d1378 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 092b98d235 Fix the offset of the drag&select feature in the drive 8 years ago
ansuz f2672d587a fix variable redefinition 8 years ago
ansuz 0e7eeb285c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f414d480a9 Add the history mode to the CryptDrive 8 years ago
ansuz cf4dee28f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 28e4ef1b13 WIP RPC code 8 years ago
yflory afb0061d7b Fix an issue with anonymous user unable to store new pads 8 years ago
yflory 56aaeea003 Fix the drive toolbar not displaying the displayName 8 years ago
yflory 538e85c080 Fix the context menu in the drive flowing off the screen if too long 8 years ago
ansuz 841c9ee9de don't close popup dialog when hitting enter if textarea has focus 8 years ago
ansuz 3fa0a73025 prevent using string methods on undefined variable 8 years ago
ansuz 1b3ce5aa96 fix typo 8 years ago
yflory a51a35da70 Fix an issue with hashes ending with a slash 8 years ago
yflory d9b5eb8a97 Fix an issue with the right click triggering the select area 8 years ago
yflory ef58120819 Prevent multiple concurrent clicks to get the history 8 years ago
ansuz 38a115d8f8 feedback on anonymous drive 8 years ago
yflory 16f6ab813c Make it clear that the number is the history represents a version 8 years ago
yflory 0ee228666b Replace the IRC link by the Matrix one 8 years ago
yflory c820b3485c Fix function undefined when loading a template 8 years ago
yflory 0ef1c14d7f Fix lint errors 8 years ago
yflory fc760b4820 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 8 years ago
ansuz e51c7f9cf0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz e132ccf94a prepare for upload 8 years ago
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 8 years ago
yflory 197b366712 Ability to drag&select in the drive 8 years ago
ansuz e2942f959b add crypto for decrypting a chunked file 8 years ago
ansuz aedc46bdaf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a97e7223f1 implement getBlobPathFromHex 8 years ago
yflory 520dabe094 Remove the unsorted files category 8 years ago
yflory f50aa5c29b Move the mediatag viewer into a media app 8 years ago
yflory 6a8274518b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 9882a3a923 Add support for the file applicaiton in the drive 8 years ago
ansuz 12898b3358 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 74bcec8b31 programming is hard okay 8 years ago
yflory 2a417ddae8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d985b144cc Add a new hash version for the file viewer 8 years ago
ansuz 3309087277 send feedback if isArray is not supported 8 years ago
ansuz f196b836db fix undefined reference 8 years ago
ansuz 48973bccd6 add tests to assert for hash parsing 8 years ago
ansuz 5194677443 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory c9c7d61ad1 Media tag viewer 8 years ago
ansuz 729d1460b9 Merge branch 'master' into staging 8 years ago
ansuz a840fb9e85 add example hashes and start working on hash v2 8 years ago
ansuz d1fa68e30d build UCF Media Tag 8 years ago
ansuz cc33c4abe9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a5ca461a73 update footer for new version 8 years ago
yflory fdd51ec18d Don't remove a folder moved into unsorted or into itself 8 years ago
ansuz 4b95a1da48 unbreak assert/translations 8 years ago
ansuz 4fdc5f897e only feedback migration if user had legacy store 8 years ago
ansuz 218f2ff76c feedback when logging in or registering 8 years ago
yflory 4c3e842664 Fix focus issues with the history input in ckeditor 8 years ago
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 8 years ago
yflory 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 8 years ago
ansuz 18e2e66b06 jshint compliance 8 years ago
yflory 92ea03d7d9 View and restore the history of a pad 8 years ago
ansuz 4c0d7bf8e8 support multiple calls to cryptpad.ready 8 years ago
ansuz ec041c88e2 console.log when providing feedback
also notify server if a users browser does not support proxies
8 years ago
ansuz c51073f211 support batch getFileSize calls 8 years ago
ansuz 1af621bfe5 Merge remote-tracking branch 'origin/auth' into staging 8 years ago
ansuz 3afaf029cb feedback about how often we migrate an old drive 8 years ago
Caleb James DeLisle 0e8b55edc0 Added an authentication page to allow getting the user pubkey 8 years ago
ansuz df9c312b7d make new text translateable 8 years ago
ansuz e8b053e48b use bootloader in feedback.html 8 years ago
ansuz a6dbfcecf3 remove old/unused assertions 8 years ago
ansuz b658bda421 use bootloader to fix paths to jquery and json.sortify 8 years ago
ansuz 347459781c show the size of your files, if you're logged in 8 years ago
ansuz 2b8579e8b7 add pretty-printers for byte-counts 8 years ago
ansuz 2a25afae5f Merge branch 'soon' into staging 8 years ago
ansuz e0ecf651e2 add a note about showing pinned file usage 8 years ago
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 8 years ago
ansuz da69c1822c ask users to sign back if signing keys are missing 8 years ago
Pierre Bondoerffer 7a05462eb3
Some more poll changes <3 8 years ago
ansuz 107e75b287 remove invalid semicolon 8 years ago
ansuz 821c1a3ec6 annotate code which we hope to be able to deprecate in the future 8 years ago
yflory 43c045721c Get the channel history 8 years ago
ansuz f6d6f81d55 send feedback when a user registers 8 years ago
ansuz deeb47c40b reportAppUsage for settings 8 years ago
Pierre Bondoerffer 05785e96ea
small color change 8 years ago
ansuz 5a83759ee2 add usage button to settings page 8 years ago
ansuz a27cc76fc0 uppercase LOL 8 years ago
ansuz 402ce2db93 better validation of inputs 8 years ago
ansuz c7eae9675b keep exporting isArray for backwards compatibility
but prevent internal use
8 years ago
ansuz fbebbf0dca minor clean up 8 years ago
ansuz 525d35c9ec redefine alert 8 years ago
Pierre Bondoerffer 20c252e5c6
fix placeholder styling in safari 8 years ago
ansuz f694a81a5c move more interface code out of cryptpad-common 8 years ago
ansuz a4157b9908 remove more unused functions 8 years ago
ansuz e10901edb2 begin to move interface code out of cryptpad-common 8 years ago
ansuz 95789d3cbe expose rpc for pinned usage 8 years ago
ansuz 8f4dbcf4c6 remove getPadTitle 8 years ago
ansuz f42da4ecd8 move hashChannelList into common-hash.js 8 years ago
ansuz 63960bd38c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 520ae822fc correct undefined reference 8 years ago
ansuz 50277cb0ae don't rely on 'info' in onRemote so we can call it anywhere 8 years ago
ansuz bf047fcf65 Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
8 years ago
Pierre Bondoerffer 96ff487271
fix flash of content 8 years ago
ansuz 5a7eea08c8 Merge pull request #108 from pbondoer/newpoll
Poll fixes
8 years ago
Pierre Bondoerffer 248f88034b
important fixes 8 years ago
yflory 633d60ccd0 Remove a TODO 8 years ago
Pierre Bondoerffer 6b57bb2bbb
poll: press enter to validate input 8 years ago
Pierre Bondoerffer d483e10e77
poll fixes 8 years ago
yflory 81d83897ec Rename hash.js 8 years ago
yflory 2ad0a65b71 Remove shortcuts that override browser actions 8 years ago
Pierre Bondoerffer ea5301be13
poll improved(tm) 8 years ago
Pierre Bondoerffer 7434dbcb0f
what i have 8 years ago
yflory 07705cd5c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory eb2a3c1bbf Fix lint errors 8 years ago
ansuz 607d9652f5 jshint compliance 8 years ago
yflory 3ba90332bb Merge branch 'refactor' into staging 8 years ago
Pierre Bondoerffer f11cf8e6ac
move poll styles to separate file 8 years ago
yflory daabb0b3ad Integrate and fix the new fileObject (userObject) 8 years ago
ansuz df4a250359 use feedback api instead of app= 8 years ago
ansuz 86c37bfa37 fix find+replace error 8 years ago
ansuz e618483395 extract all code for encoding and decoding hashes 8 years ago
ansuz fdd2716ad5 move constants to the top of cryptpad-common.js 8 years ago
yflory c1e0316d43 Refactor fileObject 8 years ago
ansuz 5212539a16 move standalone functions from common into their own file 8 years ago
ansuz 7437d6b902 remove unused function 8 years ago
ansuz 4e590a9dd1 remove even more dead code 8 years ago
ansuz 85fcaa9bbc remove more dead code 8 years ago
ansuz 401936a91e move singly-used css file out of /common/ 8 years ago
ansuz 9a46b58c85 deprecate this 90 days after f-release 8 years ago
ansuz 7a59183bb1 pinpad.create should always be async 8 years ago
ansuz 8de3610532 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 9aa0548b1f remove dead cursor code 8 years ago
yflory 4e61b79f9a Clean fileObject 8 years ago
yflory cde724399c Pin the pads 8 years ago
yflory 74ea2fce5a Fix lint error... 8 years ago
yflory aa49c97d6e Fix lint error 8 years ago
ansuz 2c8d1b8183 jshint compliance 8 years ago
yflory f0836f745e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 528deb11da Add missing file for whiteboard 8 years ago
ansuz cde9ea9887 update footer version 8 years ago
ansuz 05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a14bb1480a progress for implicit pinning 8 years ago
ansuz f82278a25c handle return of undefined hash 8 years ago
yflory d5e69653c0 Select opacity in draw mode in the canvas app 8 years ago
ansuz 1d933be5a6 make reset return the hash, not an array with containing it 8 years ago
yflory f34492be94 Remove duplicates uid in the user list 8 years ago
yflory cfc5d634f4 Merge branch 'templates' into staging 8 years ago
yflory bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 8 years ago
yflory 63a130c678 Add a button to delete the selection in canvas 8 years ago
yflory 33e19d5918 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 126498585e Add a context menu on the ROOT folder in the drive 8 years ago
yflory be1db2a1ec Ability to remove an object when draw mode is off 8 years ago
ansuz 108ab7e9de comment out a style assignment that doesn't seem necessary 8 years ago
ansuz 8c629185e1 cleaner less file 8 years ago
ansuz 0db141e48d rename style files 'whiteboard' instead of main 8 years ago
ansuz 395d8625a8 draw the palette on pad creation 8 years ago
ansuz 3b99c42e22 no more inline styles 8 years ago
ansuz ef821c3e7e integrate @lukevers improvements and clean up js a bit 8 years ago
yflory 84d8615cf1 Save and use templates in pad, code and slides 8 years ago
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled 8 years ago
ansuz a70388284d disable unnecessary messages 8 years ago
ansuz abd87e1322 jshint compliance 8 years ago
ansuz e4b15bc616 implement 'getCanonicalChannelList' 8 years ago
ansuz 09f8e139fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a2f692b9a3 clean up serverside and clientside pinning logic 8 years ago
yflory a13261abaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory dedf2b3c69 Display selected color and button to turn off draw mode in canvas 8 years ago
ansuz fdede0d1fd remove some dead code 8 years ago
ansuz e87992c7ec implement atomic pin reset rpc 8 years ago
ansuz 166e70f628 test new rpc apis 8 years ago
ansuz 2a566671f2 remove outdated rpc example 8 years ago
ansuz 3380cf0348 implement getTotalSize rpc 8 years ago
ansuz 6e1ffcc18d define better color palette 8 years ago
yflory 84029ac2d7 Fix the color picker in Chromium 53 and improve the cursor 8 years ago
ansuz 5c292fb1fa jshint compliance 8 years ago
yflory b14d89360d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 8e29e30a35 Realtime palette + cursor corresponding to the brush 8 years ago
ansuz 8bbbf8e252 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 64089c5f6b implement pad pinning 8 years ago
yflory d07acc5364 Don't redraw the drive if filesData changes while in unsorted 8 years ago
yflory 13514dff63 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 46a5eee597 Display the spinner in the toolbar for local changes 8 years ago
ansuz 6c7cdc90a9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 212baeb3a6 better cookie schema. expire old sessions 8 years ago
yflory 54d271c4e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a9777ce560 Fix input losing focus in polls with Chrome 57 8 years ago
ansuz 3484515283 enable more tests 8 years ago
ansuz 3e47b8a38d remove dead code 8 years ago
ansuz 31b178a306 use pinpad api 8 years ago
ansuz 182dbfc874 implement pinning logic in pinpad.js 8 years ago
ansuz a5e5ddae08 rpc all the things 8 years ago
ansuz 4f7e25eeb9 show labels for brush width 8 years ago
ansuz 2a6de5163b jshint compliance 8 years ago
ansuz 04069cc7f4 fix font size 8 years ago
ansuz 1e51f89096 wipe the userdoc when the canvas is cleared 8 years ago
ansuz e2981c0223 try to make the color picker show the current color 8 years ago
ansuz 96dac80bd5 better color picker in whiteboard 8 years ago
ansuz bd07b3a80f less cramped styling on text inputs on /settings/ 8 years ago
ansuz 6e9968f989 add 'lol' code theme 8 years ago
ansuz b85324a29e jshint compliance 8 years ago
ansuz 73d4fd1700 handle reconnection attempts 8 years ago
ansuz b07248ad42 prompt with setName if name is unset 8 years ago
ansuz 9b4b642d4a protect against subtly corrupted user objects 8 years ago
ansuz 18469edf18 extend list item rendering to support gfm task lists 8 years ago
ansuz 055bc03092 strip carriage return 8 years ago
ansuz bca13ad5a5 add notifications to whiteboard 8 years ago
ansuz 233bb7a14f reorganize some html tags for smaller diffs 8 years ago
ansuz 76471f7b90 add forget button to whiteboard and handle disconnection better 8 years ago
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long 8 years ago
ansuz 3cfd0a4326 commit some garbage 8 years ago
ansuz 364dae2882 update templated html 8 years ago
ansuz ed89a13fe6 progress on adding version string to some css 8 years ago
ansuz 4d5baa717d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 76990ac1b2 version toolbar.css for cache-busting 8 years ago
ansuz 9d3f859657 add a contextMenu entry for the whiteboard app 8 years ago
yflory 7ede430db3 Fix 'search.oldLocation is undefined' error 8 years ago
ansuz df7363f416 regenerate templated files for new footer 8 years ago
yflory 72fecb9549 Fix lint errors 8 years ago
yflory af68e41fb6 Always set the focus to the search bar in the drive 8 years ago
yflory 67f4096396 Fix cursor in the drive search bar 8 years ago
yflory 12cc49b575 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 72c60ec676 Add background to the whiteboard app 8 years ago
yflory 2732b7aa82 Fix module.onLocal not defined 8 years ago
ansuz a0c17d7c9b latest rpc code 8 years ago
yflory 4ddf9b4e04 Improve whiteboard UI 8 years ago
yflory 89877baa69 Fix read-only mode in canvas app 8 years ago
yflory c2cb24c072 Add toolbar to the whiteboard app 8 years ago
ansuz 973aeba0da remove bundled fabric.js 8 years ago
ansuz 6eab52c33d use secure fabric.js 8 years ago
ansuz 59a80d5fde remove silly TODO 8 years ago
ansuz ce5dbaeafd use alertify instead of browser prompt 8 years ago
yflory 71c59d7ae2 Remove unnecessary TODOs 8 years ago
yflory d92a875ce5 Translate the 'wrong application' error message 8 years ago
yflory a8ffac5dcd Remove old code 8 years ago
yflory 5322eff607 Use the current values for the checkboxes in the print options dialog 8 years ago
yflory 53c60a31f6 Set the properties and backup inputs to read-only in the drive 8 years ago
yflory 0c5a930cb9 Fix an issue with the 'Properties' entry not always displayed in context menu 8 years ago
ansuz 3e9eb03e5a display a user's public signing key in settings if it exists 8 years ago
ansuz 912215185f add uid to userdata for better notifications 8 years ago
ansuz fa9249ef29 don't notify for userlist changes if a user joins twice 8 years ago
ansuz 40f5e1706f add a unique id to user objects, define a getter 8 years ago
ansuz e2ee80d4e7 set icon for whiteboard app 8 years ago
ansuz dbca94437e rename canvas app to 'whiteboard' 8 years ago
yflory 994d640f8b Fix an issue causing the lag icon to lose its color 8 years ago
yflory 819c7e3bae Fix style issue with drag&drop in the active folder 8 years ago
yflory 6fbd1f0028 Store the dates as number and not strings to avoid ot issues 8 years ago
yflory 8556ce9d17 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 8ce8401107 Fix issues with middle click in context menus 8 years ago
yflory 5f4990cc80 Display or hide the context menu in a more intuitive way with multiselect 8 years ago
yflory 51033ab70a Remove useless links in the context menu and properties for readonly pads in the drive 8 years ago
ansuz 2b2e581779 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 2e8484ad4c notes about what to improve. transform json on OT instead of just validating 8 years ago
yflory 7afde2309d Add properties to the files not in the trash 8 years ago
yflory 61d33f2dd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop 8 years ago
yflory 66a80ea50c Add properties for pads in the drive 8 years ago
ansuz b542245086 fix lint error 8 years ago
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 98027dad27 jshint compliance 8 years ago
ansuz eeecb1baab Make Canvas Work Again 8 years ago
ansuz 4a173e30dc set user's cursor to either the beginning or end of the document 8 years ago
yflory 29174b2922 Update the lag icon 8 years ago
yflory 26edb77cf0 Fix style and usability issues in slides 8 years ago
yflory 85105a1382 Active folder in drive is not underlined anymore 8 years ago
yflory cd77f50717 Fix transitions in slides, add swipe event handlers, and fix print in firefox 8 years ago
yflory e139295d7e Add transitions in present mode 8 years ago
yflory 45ac3e40a2 Copy print options to present mode 8 years ago
yflory a5f11d0d0d Uniform the slides rendering in present and print mode 8 years ago
ansuz d422c7e165 support old hashes in getUserChannelList 8 years ago
ansuz 7d5ff27900 better rpc tests, sum up your channel usage 8 years ago
ansuz 5ed6223313 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 7f2f1f7191 correctly initialize RPC object 8 years ago
ansuz c9c9dd0999 use userChannelList if a list is not supplied to pinpad 8 years ago
ansuz e8c3cf6aa5 implement rpc message signing 8 years ago
ansuz d85a42c776 include User_hash in user channel list 8 years ago
yflory f98c825dc3 Fix keyboard shortcuts not working in CryptDrive 8 years ago
yflory 7b27f1dc2c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 7761aaa89f Add search UI 8 years ago
ansuz b578803136 clean up registration code a little bit 8 years ago
ansuz c3c866fa2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d19bbcb001 Add support for search in the drive 8 years ago
ansuz 5eb32b33ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 298725b3c2 don't show usage tips on error screens 8 years ago
ansuz 0a6373852e add signing keys to user object at login and register time 8 years ago
yflory 9a32fb1999 Fix sub-folders changing position in the tree when renaming them 8 years ago
yflory 931f7619c0 Keep the scroll position on redraw in drive 8 years ago
yflory 0607c3bbf3 Add a title to the 'new' button in drive 8 years ago
yflory b9c64a526a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings 8 years ago
ansuz 8129b8cdc1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 15a67afc75 jshint compliance 8 years ago
yflory 13d7b3cadc Merge branch 'd' into staging 8 years ago
yflory a286599f93 Fix fast reconnect, and add support for reconnecting ws in polls 8 years ago
ansuz bd9efd7c04 provide examples of valid and invalid rpc calls 8 years ago
ansuz 7187d3c550 implement getUserChannelList 8 years ago
ansuz 306f6ce806 resolve merge-conflict with accounting branch 8 years ago
yflory fe5e33a0ee Fix loss of presentation position when updating slides 8 years ago
ansuz 805e26bc07 add a version footer to main pages 8 years ago
yflory f10149db1c Make sure the tip is always visible when the loading screen is removed 8 years ago
ansuz 71db08eac2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 09afba80db add support for logging in from register page 8 years ago
yflory 16e5788011 Call the callback if we can't parse the local Drive to import it 8 years ago
ansuz 413d9a6f0b add a style-callback to confirm 8 years ago
ansuz 5d88c3a436 newer registration code 8 years ago
ansuz 10bb11bff6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 803e57c958 add more parameters to confirm dialogs 8 years ago
yflory ceaf757680 Allow right click on the CryptPad logo/link in the top left corner 8 years ago
ansuz f2aa531f27 apply styles to confirm buttons if provided 8 years ago
ansuz df6298eeb6 apply styles to confirm buttons if provided 8 years ago
yflory 84c16c00ad Fix click events not working on inputs in the drive tree 8 years ago
ansuz 07a2d8e189 apply translations on feedback page 8 years ago
yflory ca9faa0056 Fix wrong translation keys 8 years ago
yflory b7986ff6b1 Replace the spinner code with a font awesome spinner 8 years ago
ansuz 6e733b1329 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz d9996cc874 current work for pinning 8 years ago
ansuz a7d61aa562 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting 8 years ago
ansuz b3cc8da315 implement basic clientside RPC infrastructure
and provide a basic example for testing it
8 years ago
yflory f94db93897 Improve the slides layout in print mode 8 years ago
ansuz 81027b4200 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting 8 years ago
yflory 2392167996 Export slides as PDF 8 years ago
yflory 4bac8ea0c7 Draw all the slides at once to allow reference links (fix #77) 8 years ago
yflory 459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded 8 years ago
yflory 404fa378e6 Move the store to the 'common' folder, it is not customizable anymore 8 years ago
yflory a8d200ef2e Don't redirect until realtime is synced when logging in 8 years ago
yflory 0c1efd361b Make sure the href is updated everywhere when importing a stronger link 8 years ago
yflory b701e3cc85 Fix lint errors 8 years ago
yflory 4206382865 Fix the settings app to allow backup for unregistered users 8 years ago
yflory f62267f8a1 Ability to import local pads in the user object 8 years ago
ansuz e2418a6be2 sketch of how pinning rpc will look 8 years ago
ansuz dc567fa7f3 signing keys are stored in hex so encode and decode them 8 years ago
yflory ce6cd1211e Fix lint errors 8 years ago
ansuz aa762e7d63 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 8a48612de2 add some notes for later 8 years ago
yflory 9ad33574e9 Fix the function returning the pads list in the drive 8 years ago
yflory 14938089ac Keep the focus on the iframe window after canceling a deletion 8 years ago
yflory 3f7dea8f7e Context menu support for multi-select options in drive 8 years ago
yflory e1c02fd8a4 Drive rename: save pads and folders name on click, cancel with Esc. 8 years ago
yflory d93a270336 Ability to display tips in the loading screen 8 years ago
yflory 77d09f64e1 Display anonymous users in the user list 8 years ago
yflory cb88227e2b Autocomplete on key press in some dropdown menus 8 years ago
ansuz c04819538b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz fcb9848b3a hide toolbar when in read-only mode 8 years ago
yflory 2a1b241592 Display a button to open the editing link while in read-only mode if we know it 8 years ago
yflory 27241488a5 Merge pull request #96 from pbondoer/css
(CSS) Some improvements to drive
8 years ago
Pierre Bondoerffer 6c9da646e0
(CSS) Some improvements to drive 8 years ago
ansuz 08c862b271 add FIXME notes to poll 8 years ago
yflory ed9bcca96f Close the websocket network when CryptGet/CryptPut is done 8 years ago
yflory a68acac13b Only ask for a display name once in /poll 8 years ago
yflory a978b51656 If display name is empty, use anonymous in the drive 8 years ago
yflory 153386a6e0 CSS improvements in the drive tree 8 years ago
yflory 6098f28260 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a852112808 Fix open folder from the tree context menu 8 years ago
ansuz 2c9deed381 Merge pull request #94 from pbondoer/staging
Some CSS fixes
8 years ago
ansuz 868161a8a8 fix undefined reference in code 8 years ago
ansuz 0bb10a8a0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
Pierre Bondoerffer 800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
ansuz e1303a16da add support for title attributes on dropdowns 8 years ago
yflory 52793385ea Fix lint errors 8 years ago
Pierre Bondoerffer e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
ansuz 01c4d7d4a7 Merge branch 'maybe' into staging 8 years ago
ansuz c884782d57 here are some changes 8 years ago
yflory 2b6e44189d When trying to reset the drive, tell the user if the input text is invalid 8 years ago
yflory 9a7c2dd5e2 Add a 'settings' link to the user menu in static pages 8 years ago
yflory 370ae81106 Use the display name in the backup file name if not logged in 8 years ago
Pierre Bondoerffer e0d972674f
Fix context menu in drive and rename textbox styling 8 years ago
yflory c5f983ecd7 Convert read-only link to editing link in the drive 8 years ago
Pierre Bondoerffer d26d8f53d9
(CSS) Fixed textarea being too large 8 years ago
ansuz a9afa24428 return empty string instead of blowing up when fixing HTML 8 years ago
yflory 6b8d0c8bc7 Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2 8 years ago
yflory b32d698291 Fix issue with present mode in slide (readonly) 8 years ago
yflory 8bdc8415ab Find a pad in the drive 8 years ago
Caleb James DeLisle 91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
8 years ago
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements 8 years ago
yflory 53f4f8826e Merge branch 'staging' into staging 8 years ago
yflory 55210f17eb Clean the code to be less dependant on 'li' 8 years ago
Pierre Bondoerffer 3e9c4d0901
Add hover to file manager tree 8 years ago
Pierre Bondoerffer cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
yflory c6c3e1bbb5 Don't select subfolders in the tree when drag&drop 8 years ago
Pierre Bondoerffer d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
yflory a26b9d3240 Don't select subfolders in the tree when right-click on drag&drop 8 years ago
ansuz cb5e01815c validate all alertify strings by default. require 'force' argument to bypass 8 years ago
Pierre Bondoerffer b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
yflory a2b5200381 Add a container for the folders in the tree in the drive 8 years ago
yflory 412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security 8 years ago
yflory 11d54256da Make sure the display name is displayed in the same way everywhere 8 years ago
yflory 2c5c6da0d9 Fix XSS in alertify logs 8 years ago
yflory 5797aab3f2 Fix XSS with display names in the user list 8 years ago
yflory 26e3971482 Fix XSS in the user dropdown menu 8 years ago
ansuz 639376f1cb don't use hyperjson.toString 8 years ago
Pierre Bondoerffer eb9a39eb68
Add hover on elements in drive and make grid slightly prettier 8 years ago
yflory f130fd0598 Fix horizontal scrollbar in edge 8 years ago
yflory 345d2faab2 Fix horizontal scrollbar in Edge #3 8 years ago
yflory d683dc499a Fix horizontal scrollbar in Edge #2 8 years ago
yflory 7a0a87bf6c Fix horizontal scrollbar in Edge 8 years ago
yflory f06196c261 Remove the context menu buttons when removing selection 8 years ago
yflory c0278ba77f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory efb7380a12 Fix default pad not created after registration 8 years ago
ansuz 5d39125004 Make onSettle Async Again 8 years ago
yflory 4f4075ed6e Make the settings app available to anonymous users 8 years ago
yflory 0224d6489b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 12aec60a12 hack around onSettle not doing its job 8 years ago
yflory 0ae7f94184 Remove the pointer and text underline on icon:hover in drive 8 years ago
ansuz 69b6f80e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 86adfbf27d update cache-busting directive in all supported apps 8 years ago
ansuz cfc9f2e622 remove code for 'user' app, now that we have login and register 8 years ago
yflory ec7761eeb8 Make sure we don't use a wrong title for a new pad 8 years ago
yflory 8e7e1d336e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 96f6b5755d Add the blog link in the header and footer 8 years ago
ansuz d49a7d7ec4 fix undefined reference 8 years ago
ansuz 9a2ed5741a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a4913f2f4b provide UI for disabling the user feedback api 8 years ago
ansuz 1a259bb3aa check if user has disallowed feedback api 8 years ago
yflory 4f7a05ead2 Fix issue with the path for the trash in the drive's topbar 8 years ago
yflory 8741b50f5b Set the file name as default title if a pad is created from the drive 8 years ago
yflory e8c73f35ce In the tree, display the rename input only once 8 years ago
yflory e38df7ce47 Fix creation of new pads in /pad 8 years ago
yflory 20518a3e88 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f8d653406a Add the new content for the default pad and add french translation 8 years ago
ansuz d15a08830e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 06f0891d21 add allowUserFeedback toggle to settigs page 8 years ago
yflory 498f4065cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 95853debf9 Update the default pad #1 8 years ago
yflory d4bf7cf9aa Send the initial state only if it is a new pad in /pad 8 years ago
yflory 66dc166936 Make sure the realtime is synced with onSettle when using cryptget 8 years ago
yflory fadddb297c Readonly mode in /pad had contenteditable set to true 8 years ago
ansuz de5a21fe57 add a simple feedback api and text explaining what it is 8 years ago
yflory 2ad9debe58 Remove the placeholders in /code and /slide 8 years ago
yflory 38893fb8e5 Remove the 'Bootstart tooltips require Tether' error 8 years ago
yflory 88b29e8bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 5303e76ece Make sure the content is correctly applied in onReady 8 years ago
ansuz cc829d51f8 jshint compliance 8 years ago
yflory 42b6cca18d Fix new pad not working 8 years ago
yflory 3fd5669647 Hide the trash icon for read-only pads if we have the edit link in drive 8 years ago
yflory 02cc9c8344 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory e040c00557 Fix blocker issue when creating an account without migrating 8 years ago
yflory e15a6a347f Fix the forget pad button 8 years ago
ansuz 89bee8cf6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz ba3e24b595 media tag experiments 8 years ago
yflory 54b0a86c2e Make sure we redirect to the drive if we access the login page from the homepage 8 years ago
yflory 55fb0f03ae Fix the path in the drive overriding the content area 8 years ago
yflory d7d7165dc4 Login page was using a wrong translation key 8 years ago
yflory ba0b314f5e Fix the 'new' button in drive which was broken in non root categories 8 years ago
yflory d8cc2903cc Display context menu actions in the toolbar when an element is selected 8 years ago
yflory a0340f1419 Open link in a new tab in /pad 8 years ago
yflory 2d30393243 Add support for updated translation key 8 years ago
yflory cc174f3bee Fix typo 8 years ago
yflory bdc00a2413 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 8 years ago
yflory e73b4a1131 Don't display 'All files' in the menu 8 years ago
ansuz 89f3577058 remove old poll 8 years ago
ansuz 7e77c6828a more correct pluralization 8 years ago
ansuz 3d0e7cb9a7 pull ckeditor config out of main.js 8 years ago
yflory 328e5c6f03 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory c72bbd4c37 Use the file name as initial title 8 years ago
Pierre Bondoerffer 4cbb3b2ed2
Ensure we use English for reference 8 years ago
Pierre Bondoerffer ffe17a6bc9
Use JSON.stringify instead and fix linter 8 years ago
Pierre Bondoerffer a84f8e2808
Assert translation now outputs JavaScript which is easier to edit for translators 8 years ago
yflory 47b8fefd9e Load messages.js only once, in cryptpad-common 8 years ago
yflory 11d9c9e813 Merge branch 'master' into staging 8 years ago
yflory 2103f0afa8 Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
yflory 0bdf59c1dd Fix broken link in the 'New' button on cryptpad.fr 8 years ago
yflory 454d1c2052 Do not load all the translations anymore, only the needed one 8 years ago
yflory 434c3a220c Remove old translation keys #2 8 years ago
yflory d81d17b86c Remove old translations keys no longer used 8 years ago
yflory 9702305abc Use better translation keys in settings 8 years ago
yflory a6497f7a52 Add a way to show the drive tips again 8 years ago
yflory c17f28e5fe Fix race condition #2 8 years ago
yflory 239e2bcc1f Fix issue with null entries in Cryptpad_RECENTPADS 8 years ago
yflory 1540ae3f6f Fix issue with null entries in Cryptpad_RECENTPADS 8 years ago
yflory dd014f6ef2 Fix race conditon 8 years ago
ansuz 94417d9a8b jshint compliance 8 years ago
ansuz 8167ed9048 implement cache-busting everywhere 8 years ago
ansuz 34b6507fa3 implement cache-busting everywhere 8 years ago
ansuz c9b8889380 add cache-busting to chainpad-crypto 8 years ago
ansuz 09fade6127 add cache-busting to chainpad-crypto 8 years ago
yflory 2daa9f8658 Link to main page was opened in the inner iframe 8 years ago
yflory deda40375a Use the new onSettle from chainpad to determine if the realtime is synced 8 years ago
yflory 550c65aae0 Add a default pad in CryptDrive after signing up 8 years ago
yflory 92d50ded64 Merge branch 'soon' into staging 8 years ago
yflory 97762f9f9a Make sure all the elements in RECENTPADS are non-null objects 8 years ago
yflory e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 8 years ago
yflory 7762ffcbff Ability to use Ctrl+click on the cryptpad logo in apps 8 years ago
yflory 7497e0d1c5 Add a dropdown user menu to the top bar in static pages 8 years ago
yflory 0e76b18278 Hide the links in the html topbar on small screens 8 years ago
yflory 7758d056fa Ability to import/export a user realtime object 8 years ago
yflory 0a43570990 Add the new files for the settings app 8 years ago
yflory cd9cea8fa4 Create a settings app to manage user objects 8 years ago
yflory 71b84afdb2 Redirect to the pad when logging in or signing up from a pad 8 years ago
yflory 92050eb04f Fix the trash button in toolbar not always working 8 years ago
yflory aae3fba284 Fix the storage when the hash is invalid 8 years ago
yflory 25dd103f6f Reduce font-size for register explanations 8 years ago
ansuz 7d0c29513c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 7d21206cae add registration introductory text 8 years ago
yflory 2851ceb95a Merge branch 'soon' into staging 8 years ago
yflory 2807ad9dc3 Add spinner and translate the register page 8 years ago
ansuz 562e5b8c70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 5d4d530c89 switch registration text to an explanation of how login works 8 years ago