Commit Graph

1326 Commits (1e51f89096d0ef2e53fd73bce43e3a46bebea5f2)

Author SHA1 Message Date
ansuz 08c862b271 add FIXME notes to poll 2017-03-03 16:13:32 +01:00
yflory ed9bcca96f Close the websocket network when CryptGet/CryptPut is done 2017-03-03 12:48:00 +01:00
yflory a68acac13b Only ask for a display name once in /poll 2017-03-03 12:07:16 +01:00
yflory a978b51656 If display name is empty, use anonymous in the drive 2017-03-03 12:06:35 +01:00
yflory 153386a6e0 CSS improvements in the drive tree 2017-03-02 18:24:18 +01:00
yflory 6098f28260 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-02 18:16:20 +01:00
yflory a852112808 Fix open folder from the tree context menu 2017-03-02 18:16:16 +01:00
ansuz 2c9deed381 Merge pull request #94 from pbondoer/staging
Some CSS fixes
2017-03-02 18:15:30 +01:00
ansuz 868161a8a8 fix undefined reference in code 2017-03-02 17:59:59 +01:00
ansuz 0bb10a8a0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-02 17:59:35 +01:00
Pierre Bondoerffer 800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:44:29 +01:00
ansuz e1303a16da add support for title attributes on dropdowns 2017-03-02 17:40:29 +01:00
yflory 52793385ea Fix lint errors 2017-03-02 17:17:55 +01:00
Pierre Bondoerffer e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:09:39 +01:00
ansuz 01c4d7d4a7 Merge branch 'maybe' into staging 2017-03-02 17:09:06 +01:00
ansuz c884782d57 here are some changes 2017-03-02 17:08:50 +01:00
yflory 2b6e44189d When trying to reset the drive, tell the user if the input text is invalid 2017-03-02 17:01:27 +01:00
yflory 9a7c2dd5e2 Add a 'settings' link to the user menu in static pages 2017-03-02 16:38:22 +01:00
yflory 370ae81106 Use the display name in the backup file name if not logged in 2017-03-02 16:29:17 +01:00
Pierre Bondoerffer e0d972674f
Fix context menu in drive and rename textbox styling 2017-03-02 16:22:32 +01:00
yflory c5f983ecd7 Convert read-only link to editing link in the drive 2017-03-02 16:01:34 +01:00
Pierre Bondoerffer d26d8f53d9
(CSS) Fixed textarea being too large 2017-03-02 15:50:03 +01:00
ansuz a9afa24428 return empty string instead of blowing up when fixing HTML 2017-03-02 11:38:20 +01:00
yflory 6b8d0c8bc7 Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2 2017-03-02 10:53:48 +01:00
yflory b32d698291 Fix issue with present mode in slide (readonly) 2017-03-02 10:53:45 +01:00
yflory 8bdc8415ab Find a pad in the drive 2017-03-02 10:15:13 +01:00
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.
2017-03-01 21:06:53 +01:00
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements 2017-03-01 17:05:57 +01:00
yflory 53f4f8826e Merge branch 'staging' into staging 2017-03-01 16:32:18 +01:00
yflory 55210f17eb Clean the code to be less dependant on 'li' 2017-03-01 16:15:48 +01:00
Pierre Bondoerffer 3e9c4d0901
Add hover to file manager tree 2017-03-01 15:57:22 +01:00
Pierre Bondoerffer cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 15:53:48 +01:00
yflory c6c3e1bbb5 Don't select subfolders in the tree when drag&drop 2017-03-01 15:53:31 +01:00
Pierre Bondoerffer d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 15:46:49 +01:00
yflory a26b9d3240 Don't select subfolders in the tree when right-click on drag&drop 2017-03-01 15:46:10 +01:00
ansuz cb5e01815c validate all alertify strings by default. require 'force' argument to bypass 2017-03-01 15:07:34 +01:00
Pierre Bondoerffer b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 14:45:18 +01:00
yflory a2b5200381 Add a container for the folders in the tree in the drive 2017-03-01 14:44:43 +01:00
yflory 412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security 2017-03-01 13:10:55 +01:00
yflory 11d54256da Make sure the display name is displayed in the same way everywhere 2017-03-01 13:10:06 +01:00
yflory 2c5c6da0d9 Fix XSS in alertify logs 2017-03-01 13:09:14 +01:00
yflory 5797aab3f2 Fix XSS with display names in the user list 2017-03-01 13:08:36 +01:00
yflory 26e3971482 Fix XSS in the user dropdown menu 2017-03-01 13:08:09 +01:00
ansuz 639376f1cb don't use hyperjson.toString 2017-03-01 12:36:10 +01:00
Pierre Bondoerffer eb9a39eb68
Add hover on elements in drive and make grid slightly prettier 2017-02-28 23:15:47 +01:00
yflory f130fd0598 Fix horizontal scrollbar in edge 2017-02-28 18:02:12 +01:00
yflory 345d2faab2 Fix horizontal scrollbar in Edge #3 2017-02-28 17:13:51 +01:00
yflory d683dc499a Fix horizontal scrollbar in Edge #2 2017-02-28 17:03:23 +01:00
yflory 7a0a87bf6c Fix horizontal scrollbar in Edge 2017-02-28 16:38:51 +01:00
yflory f06196c261 Remove the context menu buttons when removing selection 2017-02-28 15:48:49 +01:00
yflory c0278ba77f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 13:12:53 +01:00
yflory efb7380a12 Fix default pad not created after registration 2017-02-28 13:12:27 +01:00
ansuz 5d39125004 Make onSettle Async Again 2017-02-28 13:12:04 +01:00
yflory 4f4075ed6e Make the settings app available to anonymous users 2017-02-28 11:23:50 +01:00
yflory 0224d6489b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 11:06:50 +01:00
ansuz 12aec60a12 hack around onSettle not doing its job 2017-02-28 11:05:59 +01:00
yflory 0ae7f94184 Remove the pointer and text underline on icon:hover in drive 2017-02-28 10:50:52 +01:00
ansuz 69b6f80e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 10:47:23 +01:00
ansuz 86adfbf27d update cache-busting directive in all supported apps 2017-02-28 10:47:18 +01:00
ansuz cfc9f2e622 remove code for 'user' app, now that we have login and register 2017-02-28 10:46:21 +01:00
yflory ec7761eeb8 Make sure we don't use a wrong title for a new pad 2017-02-28 10:43:36 +01:00
yflory 8e7e1d336e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 10:39:53 +01:00
yflory 96f6b5755d Add the blog link in the header and footer 2017-02-28 10:39:48 +01:00
ansuz d49a7d7ec4 fix undefined reference 2017-02-28 10:30:24 +01:00
ansuz 9a2ed5741a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 20:11:26 +01:00
ansuz a4913f2f4b provide UI for disabling the user feedback api 2017-02-27 20:11:18 +01:00
ansuz 1a259bb3aa check if user has disallowed feedback api 2017-02-27 20:02:54 +01:00
yflory 4f7a05ead2 Fix issue with the path for the trash in the drive's topbar 2017-02-27 18:37:44 +01:00
yflory 8741b50f5b Set the file name as default title if a pad is created from the drive 2017-02-27 18:15:18 +01:00
yflory e8c73f35ce In the tree, display the rename input only once 2017-02-27 17:50:58 +01:00
yflory e38df7ce47 Fix creation of new pads in /pad 2017-02-27 17:47:11 +01:00
yflory 20518a3e88 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 17:23:40 +01:00
yflory f8d653406a Add the new content for the default pad and add french translation 2017-02-27 17:23:28 +01:00
ansuz d15a08830e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 14:32:04 +01:00
ansuz 06f0891d21 add allowUserFeedback toggle to settigs page 2017-02-27 14:31:56 +01:00
yflory 498f4065cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 14:29:55 +01:00
yflory 95853debf9 Update the default pad #1 2017-02-27 14:29:48 +01:00
yflory d4bf7cf9aa Send the initial state only if it is a new pad in /pad 2017-02-27 14:29:38 +01:00
yflory 66dc166936 Make sure the realtime is synced with onSettle when using cryptget 2017-02-27 14:28:12 +01:00
yflory fadddb297c Readonly mode in /pad had contenteditable set to true 2017-02-27 12:41:29 +01:00
ansuz de5a21fe57 add a simple feedback api and text explaining what it is 2017-02-27 12:06:49 +01:00
yflory 2ad9debe58 Remove the placeholders in /code and /slide 2017-02-27 11:45:23 +01:00
yflory 38893fb8e5 Remove the 'Bootstart tooltips require Tether' error 2017-02-27 11:19:29 +01:00
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
ansuz 6e97082ff9 remove dead code from login function 2017-02-07 17:27:36 +01:00
yflory b3e73b0f0b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 16:49:31 +01:00
yflory 367a02c031 Add mobile support for the code app 2017-02-07 16:49:25 +01:00
yflory 628148d001 Display the contextmenu button only if contextmenu exists 2017-02-07 13:09:14 +01:00
ansuz 8a1acc3c37 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 10:40:03 +01:00
ansuz 6f07a3b7b4 erase lingering sessionStorage values when logging out 2017-02-07 10:39:42 +01:00
yflory ac79fbb5a2 Improve mobile support for the toolbar and the drive 2017-02-06 18:06:59 +01:00
yflory 9f1789b2d2 Fix creation of pads from non-root category in the drive 2017-02-06 14:47:37 +01:00
yflory 7e7d1f7a16 Display the error when opening a document with the wrong app 2017-02-06 12:43:56 +01:00
yflory 6f0d33dc1d Fix missing placeholder in the Slide app 2017-02-06 12:14:33 +01:00
yflory 7d6e15e465 Throw an error when trying to open a document with the wrong app 2017-02-06 12:06:39 +01:00
yflory ad82a275bc Replace the Apps button by a New button again 2017-02-06 11:39:04 +01:00
yflory fd33ffd56f Fix issue creating a patch everytime the user clicked in an app 2017-02-06 11:12:08 +01:00
yflory fbbf8a2829 Replace initialState by a placeholder in slide and code 2017-02-03 18:45:30 +01:00
yflory 87abfac5e0 Fix lint error 2017-02-03 16:53:47 +01:00
yflory 02439e0f61 Improve the homepage with new images and translations 2017-02-03 16:03:36 +01:00
yflory f57c8c0e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 18:40:45 +01:00