1668 Commits (538aec6ef5639f583a7ed9ce9b5cbf085c846537)

Author SHA1 Message Date
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
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
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
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