Commit Graph

1040 Commits (490e2b4d0a2279b16257793dde599b7aaacddb40)

Author SHA1 Message Date
yflory b0fe04381d Merge branch 'staging' into newDrive
yflory 1c2ea04f11 Drive refactoring
ansuz fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors
ansuz da533b106a improve type checking in getFileSize
ansuz d25477e8c6 don't let tooltips interfere with DOM interaction
yflory 5641a4a839 Add the file app in the 'new' dropdown menus
yflory ac91d2f413 Fix the upgrade and donate buttons in the home page
yflory ee57458158 Remove the pin limit alert
ansuz 767793b5ca fix stuck loading tip
ansuz f631973f1f optimize file upload
ansuz 55af84cc90 lower spinner timeout interval
ansuz 07279c8dc7 export boolean Test.testing
Caleb James DeLisle 71bd808e4f Send everything through the test global function
Caleb James DeLisle 244bd7b378 ;;;
Caleb James DeLisle 7d557df74b a new and more horrible way of sniffing the logs out of the instance
Caleb James DeLisle 0d4b74cfba ;;;;;; keep these ;;; for later ;;;;;
Caleb James DeLisle 24f37ea414 Delicious testing
ansuz 7b94106bac fix inverted conditional :/
ansuz 2e03485db4 remove known bad entries from localStorage.userHash...
ansuz 936bf8df9d return falsey if userHash is junk
ansuz 105e5cdac9 fix 'undefined/' userHash
ansuz 401e908963 use media-tag with xhr error handling
ansuz 3465710237 Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
Daniel RADEAU 21c39572be Update media-tag and fix bower dependencies
ansuz ebfa228bc0 add upgrade button to all static pages
ansuz 149568689a color donate button green
ansuz ec6ad6772b send feedback on donation
Daniel RADEAU cb2efe138b Media Tag integration, image, audio, video, pdf
ansuz 9ca5bc507e add support for donate button
Caleb James DeLisle 66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place
ansuz 3f3d64992d resolve merge conflicts
ansuz 57017c68fa hacks for cross-domain safari
ansuz cf658c1b3a backport live changes
yflory df2b00122a New drive structure without file names
ansuz d9f7470f06 copy user details into sessionStorage for safari
ansuz fd83ae3e61 implement createRandomInteger
ansuz dc80b6b11f throttle markdown preview
ansuz e6c04ccb49 bump server after paying for an account
ansuz 6324d9bbb0 feedback on template feature usage
yflory c3437382fb Fix the release version in the what's new popup
ansuz 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 70cae0d2c3 safely access pin reset response
yflory d55b7e411c Display an alert in the drive when the limit is reached
ansuz 71dc0af6c7 better test for success error codes
yflory 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 538aec6ef5 Display a message when pinPads returns an error
ansuz ba5ef5157e show pretty representations of storage usage
ansuz e78299aed6 use async file decryption, listen for progress events.
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory d014fccfce Fix lint error
yflory 2082b328b4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 814c81fb13 Display an alert when CryptPad has a new version
ansuz 34606ea8ba use newest xwiki media-tag
ansuz 2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 164342920e fix inverted condition
yflory 620f4dc512 Add translations for the markdown preview button title
yflory 51bd41d4e8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 0bd4caeb7e Add the task list code to the markdown renderer
ansuz d187945e94 jshint compliance
yflory 2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory d13dde856a Add the markdown renderer file and change code's default content
ansuz 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 7befaccd88 move more rpc calls into pinpad
yflory 56bcdff890 Add a preview of the markdown content in the code editor
yflory b72415b56b Fix old hashes not working with the new parser
yflory 6b7aeb9121 Fix the text example
yflory fe0f21594a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 953e7155f0 Send only the hostname to the accounts server
ansuz afef456b18 fix undefined reference
yflory 1a7c4d5ebe Store the FS_hash in the user object after the merge
yflory 87fa28180a Display an upgrade button in the settings page
yflory c1b43db363 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 1542aa96bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory dc2cdb7c08 Add the usage bar in the settings page
ansuz 2dd04f7631 get limits from the server
yflory 8172f117a7 Fix Hash.alert not a function
yflory 0e58859393 Fix lint error
yflory 771348720b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 57979f6314 Display the public key using a href in the settings page
ansuz a9b670fdf5 don't parse trailing slash as part of encryption key in old hashes
ansuz 06f3d0eefe shim isArray if not exists. correctly report how often this occurs
yflory 50d9f72b3a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 601226115b New anonymous drive
ansuz 30f6ef3f85 handle more response codes, use metadata
ansuz 18d959ef16 handle non-200 status codes
yflory ed95bbb08f Fix lint errors
yflory 89a993be3c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 0f13198119 Move the parseHash code into parsePadUrl
ansuz 42f3a62cac handle errors with XHR
ansuz 6c68b5e6ca use new media-tag, listen for decryption events
ansuz 7dd5907ff0 Merge branch 'limit' into staging
ansuz a993ab6616 use new encrypted file encoding in media-tag
ansuz 8c49150725 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory e0293a1162 Merge branch 'master' into staging
yflory 57ee7de7d4 Update and return the storage limit
yflory 371edff943 Fix an error when moving unsorted files to root in the drive
yflory b76dcba1d6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 6d30d7f89f strip junk bytes from base64 more safely
ansuz 8f5989b6b0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory cf81b02096 Make sure the spinner is always centered in the loading screen
yflory 5c8586f8a3 Fix typo in file upload
yflory 96ccb94397 Add the share button when a file upload is complete
yflory c00158d23a Move code to common-history
ansuz 922e7803e9 remove extraneous slashes from hashes when parsing
ansuz a338b23f40 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz df47b913e3 fetch array buffers in cryptpad-common
yflory ff16084719 Fix lint errors
yflory 50c8a859e6 Move the CodeMirror cursor code to common-codemirror
yflory 9eb8e55cf6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files
yflory 63710e1ccc Move the code related to the title in another file
yflory ce5cdce917 Fix an issue where the username was lost on websocket reconnect
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere'
yflory 9206d89531 Fix lint errors
yflory bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 5a883d5a57 Use the new toolbar and move the userlist code in a separate file
yflory 6847906ac9 Move the userlist code in a separate file
ansuz 3a338e0890 fix undefined reference
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings
yflory 5a5b02b82b Don't store in the drive pads without a hash
ansuz 3e118c6a38 allow instance-wide custom salt for login
yflory 706120ae5b Display images uploaded in the File app with the Media app
yflory 28cb40d7ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 1b6fae4dd2 Update mediatag
ansuz a0c420af8e jshint compliance
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 78b11584f8 remove unused variables
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory a190c99426 Toolbar refactoring
ansuz 7573b86946 call back with error if an RPC is made while disconnected
ansuz 410a9dfb17 temporary solution for testing pin limits
yflory ef89451a83 Display the storage limit in the drive
ansuz f2672d587a fix variable redefinition
ansuz 0e7eeb285c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory f414d480a9 Add the history mode to the CryptDrive
ansuz cf4dee28f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 28e4ef1b13 WIP RPC code
yflory afb0061d7b Fix an issue with anonymous user unable to store new pads
yflory 56aaeea003 Fix the drive toolbar not displaying the displayName
ansuz 3fa0a73025 prevent using string methods on undefined variable
ansuz 1b3ce5aa96 fix typo
yflory a51a35da70 Fix an issue with hashes ending with a slash
yflory ef58120819 Prevent multiple concurrent clicks to get the history
yflory 16f6ab813c Make it clear that the number is the history represents a version
yflory c820b3485c Fix function undefined when loading a template
yflory 0ef1c14d7f Fix lint errors
yflory fc760b4820 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory a165332c15 Don't store a pad in the drive if the limit has been reached
ansuz e51c7f9cf0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory bf7c7c45d0 Add the storage limit warning in the toolbar
ansuz aedc46bdaf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz a97e7223f1 implement getBlobPathFromHex
yflory 520dabe094 Remove the unsorted files category
yflory f50aa5c29b Move the mediatag viewer into a media app
yflory 6a8274518b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 9882a3a923 Add support for the file applicaiton in the drive
ansuz 12898b3358 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 74bcec8b31 programming is hard okay
yflory 2a417ddae8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory d985b144cc Add a new hash version for the file viewer
ansuz 3309087277 send feedback if isArray is not supported
ansuz 5194677443 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory c9c7d61ad1 Media tag viewer
ansuz 729d1460b9 Merge branch 'master' into staging
ansuz a840fb9e85 add example hashes and start working on hash v2
ansuz d1fa68e30d build UCF Media Tag
yflory fdd51ec18d Don't remove a folder moved into unsorted or into itself
ansuz 4fdc5f897e only feedback migration if user had legacy store
ansuz 218f2ff76c feedback when logging in or registering
yflory 4c3e842664 Fix focus issues with the history input in ckeditor
ansuz f7e96b4e8c resolve merge conflicts and jquery errors
yflory 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable
ansuz 18e2e66b06 jshint compliance
yflory 92ea03d7d9 View and restore the history of a pad
ansuz 4c0d7bf8e8 support multiple calls to cryptpad.ready
ansuz ec041c88e2 console.log when providing feedback
also notify server if a users browser does not support proxies
ansuz c51073f211 support batch getFileSize calls
ansuz 3afaf029cb feedback about how often we migrate an old drive
ansuz e8b053e48b use bootloader in feedback.html
ansuz 347459781c show the size of your files, if you're logged in
ansuz 2b8579e8b7 add pretty-printers for byte-counts
ansuz 2a25afae5f Merge branch 'soon' into staging
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
ansuz da69c1822c ask users to sign back if signing keys are missing
ansuz 821c1a3ec6 annotate code which we hope to be able to deprecate in the future
yflory 43c045721c Get the channel history
ansuz a27cc76fc0 uppercase LOL
ansuz 402ce2db93 better validation of inputs
ansuz c7eae9675b keep exporting isArray for backwards compatibility
but prevent internal use
ansuz fbebbf0dca minor clean up
ansuz 525d35c9ec redefine alert
ansuz f694a81a5c move more interface code out of cryptpad-common
ansuz a4157b9908 remove more unused functions
ansuz e10901edb2 begin to move interface code out of cryptpad-common
ansuz 95789d3cbe expose rpc for pinned usage
ansuz 8f4dbcf4c6 remove getPadTitle
ansuz f42da4ecd8 move hashChannelList into common-hash.js
ansuz 63960bd38c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 520ae822fc correct undefined reference
yflory 633d60ccd0 Remove a TODO
yflory 81d83897ec Rename hash.js
yflory 07705cd5c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory eb2a3c1bbf Fix lint errors
ansuz 607d9652f5 jshint compliance
yflory 3ba90332bb Merge branch 'refactor' into staging
yflory daabb0b3ad Integrate and fix the new fileObject (userObject)
ansuz df4a250359 use feedback api instead of app=
ansuz 86c37bfa37 fix find+replace error
ansuz e618483395 extract all code for encoding and decoding hashes
ansuz fdd2716ad5 move constants to the top of cryptpad-common.js
yflory c1e0316d43 Refactor fileObject
ansuz 5212539a16 move standalone functions from common into their own file
ansuz 7437d6b902 remove unused function
ansuz 4e590a9dd1 remove even more dead code
ansuz 85fcaa9bbc remove more dead code
ansuz 401936a91e move singly-used css file out of /common/
ansuz 7a59183bb1 pinpad.create should always be async
ansuz 8de3610532 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 9aa0548b1f remove dead cursor code
yflory 4e61b79f9a Clean fileObject
yflory cde724399c Pin the pads
ansuz 2c8d1b8183 jshint compliance
ansuz 05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz a14bb1480a progress for implicit pinning
ansuz f82278a25c handle return of undefined hash
ansuz 1d933be5a6 make reset return the hash, not an array with containing it
yflory f34492be94 Remove duplicates uid in the user list
yflory cfc5d634f4 Merge branch 'templates' into staging
yflory bd16e0f0e7 Templates in polls and canvas, and ability to disable templates
yflory 84d8615cf1 Save and use templates in pad, code and slides
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled
ansuz a70388284d disable unnecessary messages
ansuz abd87e1322 jshint compliance
ansuz e4b15bc616 implement 'getCanonicalChannelList'
ansuz a2f692b9a3 clean up serverside and clientside pinning logic
ansuz fdede0d1fd remove some dead code
ansuz e87992c7ec implement atomic pin reset rpc
ansuz 3380cf0348 implement getTotalSize rpc
ansuz 5c292fb1fa jshint compliance
ansuz 64089c5f6b implement pad pinning
yflory 13514dff63 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 46a5eee597 Display the spinner in the toolbar for local changes
ansuz 6c7cdc90a9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 212baeb3a6 better cookie schema. expire old sessions
yflory 54d271c4e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory a9777ce560 Fix input losing focus in polls with Chrome 57
ansuz 3e47b8a38d remove dead code
ansuz 182dbfc874 implement pinning logic in pinpad.js
ansuz a5e5ddae08 rpc all the things
ansuz 04069cc7f4 fix font size
ansuz 6e9968f989 add 'lol' code theme
ansuz 9b4b642d4a protect against subtly corrupted user objects
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long
ansuz 3cfd0a4326 commit some garbage
ansuz ed89a13fe6 progress on adding version string to some css
ansuz 76990ac1b2 version toolbar.css for cache-busting
ansuz a0c17d7c9b latest rpc code
ansuz 59a80d5fde remove silly TODO
yflory a8ffac5dcd Remove old code
ansuz fa9249ef29 don't notify for userlist changes if a user joins twice
ansuz 40f5e1706f add a unique id to user objects, define a getter
yflory 994d640f8b Fix an issue causing the lag icon to lose its color
yflory 6fbd1f0028 Store the dates as number and not strings to avoid ot issues
yflory 51033ab70a Remove useless links in the context menu and properties for readonly pads in the drive
yflory 7afde2309d Add properties to the files not in the trash
ansuz b542245086 fix lint error
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 98027dad27 jshint compliance
ansuz 4a173e30dc set user's cursor to either the beginning or end of the document
yflory 29174b2922 Update the lag icon
yflory 26edb77cf0 Fix style and usability issues in slides
ansuz d422c7e165 support old hashes in getUserChannelList
ansuz 5ed6223313 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz c9c9dd0999 use userChannelList if a list is not supplied to pinpad
ansuz e8c3cf6aa5 implement rpc message signing
ansuz d85a42c776 include User_hash in user channel list
yflory 7761aaa89f Add search UI
ansuz c3c866fa2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory d19bbcb001 Add support for search in the drive
ansuz 5eb32b33ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 298725b3c2 don't show usage tips on error screens
ansuz 0a6373852e add signing keys to user object at login and register time
yflory b9c64a526a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings
ansuz 8129b8cdc1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 15a67afc75 jshint compliance
yflory 13d7b3cadc Merge branch 'd' into staging
ansuz 7187d3c550 implement getUserChannelList
ansuz 306f6ce806 resolve merge-conflict with accounting branch
yflory f10149db1c Make sure the tip is always visible when the loading screen is removed
ansuz 71db08eac2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 09afba80db add support for logging in from register page
yflory 16e5788011 Call the callback if we can't parse the local Drive to import it
ansuz 413d9a6f0b add a style-callback to confirm
ansuz 803e57c958 add more parameters to confirm dialogs
yflory ceaf757680 Allow right click on the CryptPad logo/link in the top left corner
ansuz f2aa531f27 apply styles to confirm buttons if provided
ansuz df6298eeb6 apply styles to confirm buttons if provided
ansuz 07a2d8e189 apply translations on feedback page
yflory b7986ff6b1 Replace the spinner code with a font awesome spinner