1432 Commits (402ce2db93fb56b4f2e7874b7231e94fdbb24958)

Author SHA1 Message Date
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
yflory bff9d05210 Make sure the login_name is in the object 8 years ago
yflory b1b294aade Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 20083264b2 load fontawesome icons on register page 8 years ago
yflory 3aa03225c9 Add a spinner when hashing the password and translate homepage 8 years ago
ansuz fbcf4ccec4 force usernames to be lowercase 8 years ago
ansuz 5614bea271 redirect users to login and register from toolbar 8 years ago
ansuz f723585758 add api to check whether the realtime has synced with the server 8 years ago
ansuz 3b1bd2f720 use additional translation keys for registration 8 years ago
ansuz b5b2454f0b use bootstrap for login and register pages 8 years ago
ansuz c556f78562 log in directly from home page, sign up at /register/ 8 years ago
ansuz d0edf75c89 signup link directs users to register page, not user 8 years ago
ansuz 1232aa8a79 jshint compliance 8 years ago
yflory 8eec7ec7c8 Fix typo 8 years ago
ansuz 88af104ce8 basic registration page to replace user page 8 years ago
ansuz a995df25f6 disable new OT in pad and code app 8 years ago
ansuz f92ba193c3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz e100110741 implement log in as an api 8 years ago
yflory d54262c8df Use the same disconnecter error translation key for all the apps 8 years ago
yflory f8366e0cfc Remove support for legacy store and add a way to import legacy pads 8 years ago
yflory 342cb44cf7 Ability to migrate a anon drive directly from the drive 8 years ago
ansuz c642bce984 restore disabled listener 8 years ago
yflory 67d881b2cf Remove the drive entry from the user menu if already in drive 8 years ago
yflory e865b89f43 Add the contextmenu button in the drive dynamically 8 years ago
yflory 3af7c9cff8 Replace the expand/collapse ckeditor button by our own to save space 8 years ago
yflory 914c442615 Do not redirect to home page when logging out from another tab 8 years ago
yflory 702798f65a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1e2cc6bea4 Fix race condition with the iframe store 8 years ago
ansuz dae17588c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 32a5c5ff62 better integration between /user/ and home 8 years ago
ansuz fe7ba98338 remove dead code from /user/ 8 years ago
ansuz 9b047bfb53 don't autocorrect usernames. add trailing slash to /drive 8 years ago
ansuz 6e97082ff9 remove dead code from login function 8 years ago
yflory b3e73b0f0b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 367a02c031 Add mobile support for the code app 8 years ago
yflory 628148d001 Display the contextmenu button only if contextmenu exists 8 years ago
ansuz 8a1acc3c37 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 6f07a3b7b4 erase lingering sessionStorage values when logging out 8 years ago
yflory ac79fbb5a2 Improve mobile support for the toolbar and the drive 8 years ago
yflory 9f1789b2d2 Fix creation of pads from non-root category in the drive 8 years ago
yflory 7e7d1f7a16 Display the error when opening a document with the wrong app 8 years ago
yflory 6f0d33dc1d Fix missing placeholder in the Slide app 8 years ago
yflory 7d6e15e465 Throw an error when trying to open a document with the wrong app 8 years ago