Commit Graph

1143 Commits (e0d972674fa4f50be4217e6ae85a8d62b2d9bb9d)

Author SHA1 Message Date
yflory 88b29e8bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-24 18:55:48 +01:00
yflory 5303e76ece Make sure the content is correctly applied in onReady 2017-02-24 18:55:41 +01:00
ansuz cc829d51f8 jshint compliance 2017-02-24 18:23:43 +01:00
yflory 42b6cca18d Fix new pad not working 2017-02-24 16:55:43 +01:00
yflory 3fd5669647 Hide the trash icon for read-only pads if we have the edit link in drive 2017-02-24 16:51:15 +01:00
yflory 02cc9c8344 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-24 16:18:54 +01:00
yflory e040c00557 Fix blocker issue when creating an account without migrating 2017-02-24 16:18:41 +01:00
yflory e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +01:00
ansuz 89bee8cf6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-24 12:08:26 +01:00
ansuz ba3e24b595 media tag experiments 2017-02-24 12:08:16 +01:00
yflory 54b0a86c2e Make sure we redirect to the drive if we access the login page from the homepage 2017-02-24 11:44:47 +01:00
yflory 55fb0f03ae Fix the path in the drive overriding the content area 2017-02-24 11:01:33 +01:00
yflory d7d7165dc4 Login page was using a wrong translation key 2017-02-23 18:19:33 +01:00
yflory ba0b314f5e Fix the 'new' button in drive which was broken in non root categories 2017-02-23 18:15:44 +01:00
yflory d8cc2903cc Display context menu actions in the toolbar when an element is selected 2017-02-23 17:25:25 +01:00
yflory a0340f1419 Open link in a new tab in /pad 2017-02-23 14:27:18 +01:00
yflory 2d30393243 Add support for updated translation key 2017-02-23 11:45:00 +01:00
yflory cc174f3bee Fix typo 2017-02-22 12:26:25 +01:00
yflory bdc00a2413 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-22 12:25:48 +01:00
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 2017-02-22 12:25:29 +01:00
yflory e73b4a1131 Don't display 'All files' in the menu 2017-02-22 11:15:29 +01:00
ansuz 89f3577058 remove old poll 2017-02-22 11:05:47 +01:00
ansuz 7e77c6828a more correct pluralization 2017-02-21 18:55:48 +01:00
ansuz 3d0e7cb9a7 pull ckeditor config out of main.js 2017-02-21 18:21:30 +01:00
yflory 328e5c6f03 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 17:43:05 +01:00
yflory c72bbd4c37 Use the file name as initial title 2017-02-21 17:42:58 +01:00
Pierre Bondoerffer 4cbb3b2ed2
Ensure we use English for reference 2017-02-21 14:53:18 +01:00
Pierre Bondoerffer ffe17a6bc9
Use JSON.stringify instead and fix linter 2017-02-21 14:37:08 +01:00
Pierre Bondoerffer a84f8e2808
Assert translation now outputs JavaScript which is easier to edit for translators 2017-02-21 14:23:58 +01:00
yflory 47b8fefd9e Load messages.js only once, in cryptpad-common 2017-02-21 14:16:23 +01:00
yflory 11d9c9e813 Merge branch 'master' into staging 2017-02-21 10:44:03 +01:00
yflory 2103f0afa8 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-02-21 10:42:35 +01:00
yflory 0bdf59c1dd Fix broken link in the 'New' button on cryptpad.fr 2017-02-21 10:42:06 +01:00
yflory 454d1c2052 Do not load all the translations anymore, only the needed one 2017-02-20 18:29:06 +01:00
yflory 434c3a220c Remove old translation keys #2 2017-02-20 16:15:13 +01:00
yflory d81d17b86c Remove old translations keys no longer used 2017-02-17 17:39:27 +01:00
yflory 9702305abc Use better translation keys in settings 2017-02-17 17:38:59 +01:00
yflory a6497f7a52 Add a way to show the drive tips again 2017-02-17 16:56:59 +01:00
yflory c17f28e5fe Fix race condition #2 2017-02-17 15:39:34 +01:00
yflory 239e2bcc1f Fix issue with null entries in Cryptpad_RECENTPADS 2017-02-17 15:18:09 +01:00
yflory 1540ae3f6f Fix issue with null entries in Cryptpad_RECENTPADS 2017-02-17 15:16:30 +01:00
yflory dd014f6ef2 Fix race conditon 2017-02-17 15:16:03 +01:00
ansuz 94417d9a8b jshint compliance 2017-02-17 14:28:18 +01:00
ansuz 8167ed9048 implement cache-busting everywhere 2017-02-17 12:39:01 +01:00
ansuz 34b6507fa3 implement cache-busting everywhere 2017-02-17 12:38:58 +01:00
ansuz c9b8889380 add cache-busting to chainpad-crypto 2017-02-17 11:26:43 +01:00
ansuz 09fade6127 add cache-busting to chainpad-crypto 2017-02-17 11:25:35 +01:00
yflory 2daa9f8658 Link to main page was opened in the inner iframe 2017-02-17 10:57:56 +01:00
yflory deda40375a Use the new onSettle from chainpad to determine if the realtime is synced 2017-02-17 10:31:07 +01:00
yflory 550c65aae0 Add a default pad in CryptDrive after signing up 2017-02-16 18:10:12 +01:00
yflory 92d50ded64 Merge branch 'soon' into staging 2017-02-16 16:48:12 +01:00
yflory 97762f9f9a Make sure all the elements in RECENTPADS are non-null objects 2017-02-16 16:07:43 +01:00
yflory e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 2017-02-16 15:35:03 +01:00
yflory 7762ffcbff Ability to use Ctrl+click on the cryptpad logo in apps 2017-02-15 18:31:36 +01:00
yflory 7497e0d1c5 Add a dropdown user menu to the top bar in static pages 2017-02-15 17:57:42 +01:00
yflory 0e76b18278 Hide the links in the html topbar on small screens 2017-02-15 14:23:56 +01:00
yflory 7758d056fa Ability to import/export a user realtime object 2017-02-15 12:40:28 +01:00
yflory 0a43570990 Add the new files for the settings app 2017-02-14 19:07:17 +01:00
yflory cd9cea8fa4 Create a settings app to manage user objects 2017-02-14 19:04:57 +01:00
yflory 71b84afdb2 Redirect to the pad when logging in or signing up from a pad 2017-02-14 11:29:08 +01:00
yflory 92050eb04f Fix the trash button in toolbar not always working 2017-02-14 10:56:38 +01:00
yflory aae3fba284 Fix the storage when the hash is invalid 2017-02-13 17:54:01 +01:00
yflory 25dd103f6f Reduce font-size for register explanations 2017-02-13 12:54:34 +01:00
ansuz 7d0c29513c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 12:42:17 +01:00
ansuz 7d21206cae add registration introductory text 2017-02-13 12:42:07 +01:00
yflory 2851ceb95a Merge branch 'soon' into staging 2017-02-13 11:59:49 +01:00
yflory 2807ad9dc3 Add spinner and translate the register page 2017-02-13 11:41:48 +01:00
ansuz 562e5b8c70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 11:17:16 +01:00
ansuz 5d4d530c89 switch registration text to an explanation of how login works 2017-02-13 11:17:00 +01:00
yflory bff9d05210 Make sure the login_name is in the object 2017-02-13 11:15:30 +01:00
yflory b1b294aade Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 11:10:40 +01:00
ansuz 20083264b2 load fontawesome icons on register page 2017-02-13 11:09:44 +01:00
yflory 3aa03225c9 Add a spinner when hashing the password and translate homepage 2017-02-13 11:09:30 +01:00
ansuz fbcf4ccec4 force usernames to be lowercase 2017-02-13 11:01:30 +01:00
ansuz 5614bea271 redirect users to login and register from toolbar 2017-02-13 10:51:54 +01:00
ansuz f723585758 add api to check whether the realtime has synced with the server 2017-02-13 10:42:17 +01:00
ansuz 3b1bd2f720 use additional translation keys for registration 2017-02-13 10:15:25 +01:00
ansuz b5b2454f0b use bootstrap for login and register pages 2017-02-10 18:29:49 +01:00
ansuz c556f78562 log in directly from home page, sign up at /register/ 2017-02-10 16:49:17 +01:00
ansuz d0edf75c89 signup link directs users to register page, not user 2017-02-10 16:48:28 +01:00
ansuz 1232aa8a79 jshint compliance 2017-02-10 14:25:02 +01:00
yflory 8eec7ec7c8 Fix typo 2017-02-10 11:00:34 +01:00
ansuz 88af104ce8 basic registration page to replace user page 2017-02-09 18:50:28 +01:00
ansuz a995df25f6 disable new OT in pad and code app 2017-02-09 17:20:13 +01:00
ansuz f92ba193c3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-09 17:16:03 +01:00
ansuz e100110741 implement log in as an api 2017-02-09 16:31:57 +01:00
yflory d54262c8df Use the same disconnecter error translation key for all the apps 2017-02-09 15:34:14 +01:00
yflory f8366e0cfc Remove support for legacy store and add a way to import legacy pads 2017-02-09 15:23:09 +01:00
yflory 342cb44cf7 Ability to migrate a anon drive directly from the drive 2017-02-09 12:58:08 +01:00
ansuz c642bce984 restore disabled listener 2017-02-09 10:31:00 +01:00
yflory 67d881b2cf Remove the drive entry from the user menu if already in drive 2017-02-08 16:25:52 +01:00
yflory e865b89f43 Add the contextmenu button in the drive dynamically 2017-02-08 15:41:50 +01:00
yflory 3af7c9cff8 Replace the expand/collapse ckeditor button by our own to save space 2017-02-08 15:32:55 +01:00
yflory 914c442615 Do not redirect to home page when logging out from another tab 2017-02-08 12:54:07 +01:00
yflory 702798f65a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 18:47:24 +01:00
yflory 1e2cc6bea4 Fix race condition with the iframe store 2017-02-07 18:47:10 +01:00
ansuz dae17588c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 18:27:28 +01:00
ansuz 32a5c5ff62 better integration between /user/ and home 2017-02-07 17:50:37 +01:00
ansuz fe7ba98338 remove dead code from /user/ 2017-02-07 17:50:02 +01:00
ansuz 9b047bfb53 don't autocorrect usernames. add trailing slash to /drive 2017-02-07 17:28:32 +01:00