Commit Graph

646 Commits (c820b3485c2c3c4cedbbbcca35d424fcd044ccf3)

Author SHA1 Message Date
yflory 54d271c4e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 12:04:18 +02:00
yflory a9777ce560 Fix input losing focus in polls with Chrome 57 2017-04-05 12:04:01 +02:00
ansuz 3e47b8a38d remove dead code 2017-04-05 10:42:24 +02:00
ansuz 182dbfc874 implement pinning logic in pinpad.js 2017-04-04 12:13:31 +02:00
ansuz a5e5ddae08 rpc all the things 2017-04-03 19:24:57 +02:00
ansuz 04069cc7f4 fix font size 2017-03-31 13:28:30 +02:00
ansuz 6e9968f989 add 'lol' code theme 2017-03-31 09:19:45 +02:00
ansuz 9b4b642d4a protect against subtly corrupted user objects 2017-03-30 17:19:49 +02:00
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long 2017-03-29 16:02:04 +02:00
ansuz 3cfd0a4326 commit some garbage 2017-03-29 15:40:34 +02:00
ansuz ed89a13fe6 progress on adding version string to some css 2017-03-29 12:55:36 +02:00
ansuz 76990ac1b2 version toolbar.css for cache-busting 2017-03-29 11:56:03 +02:00
ansuz a0c17d7c9b latest rpc code 2017-03-27 18:15:15 +02:00
ansuz 59a80d5fde remove silly TODO 2017-03-27 12:08:19 +02:00
yflory a8ffac5dcd Remove old code 2017-03-27 11:30:09 +02:00
ansuz fa9249ef29 don't notify for userlist changes if a user joins twice 2017-03-24 13:17:51 +01:00
ansuz 40f5e1706f add a unique id to user objects, define a getter 2017-03-24 12:17:49 +01:00
yflory 994d640f8b Fix an issue causing the lag icon to lose its color 2017-03-21 14:52:49 +01:00
yflory 6fbd1f0028 Store the dates as number and not strings to avoid ot issues 2017-03-21 14:46:40 +01:00
yflory 51033ab70a Remove useless links in the context menu and properties for readonly pads in the drive 2017-03-21 12:09:07 +01:00
yflory 7afde2309d Add properties to the files not in the trash 2017-03-21 11:34:18 +01:00
ansuz b542245086 fix lint error 2017-03-20 18:11:26 +01:00
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-20 18:05:39 +01:00
ansuz 98027dad27 jshint compliance 2017-03-20 18:02:11 +01:00
ansuz 4a173e30dc set user's cursor to either the beginning or end of the document 2017-03-20 17:51:56 +01:00
yflory 29174b2922 Update the lag icon 2017-03-20 16:39:33 +01:00
yflory 26edb77cf0 Fix style and usability issues in slides 2017-03-20 15:20:42 +01:00
ansuz d422c7e165 support old hashes in getUserChannelList 2017-03-16 17:14:54 +01:00
ansuz 5ed6223313 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-16 14:47:03 +01:00
ansuz c9c9dd0999 use userChannelList if a list is not supplied to pinpad 2017-03-16 14:46:17 +01:00
ansuz e8c3cf6aa5 implement rpc message signing 2017-03-16 14:45:38 +01:00
ansuz d85a42c776 include User_hash in user channel list 2017-03-16 14:43:57 +01:00
yflory 7761aaa89f Add search UI 2017-03-16 14:16:42 +01:00
ansuz c3c866fa2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 18:59:53 +01:00
yflory d19bbcb001 Add support for search in the drive 2017-03-15 18:59:55 +01:00
ansuz 5eb32b33ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 18:59:38 +01:00
ansuz 298725b3c2 don't show usage tips on error screens 2017-03-15 18:58:39 +01:00
ansuz 0a6373852e add signing keys to user object at login and register time 2017-03-15 18:57:13 +01:00
yflory b9c64a526a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 17:15:03 +01:00
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
ansuz 8129b8cdc1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 16:05:05 +01:00
ansuz 15a67afc75 jshint compliance 2017-03-15 16:04:52 +01:00
yflory 13d7b3cadc Merge branch 'd' into staging 2017-03-15 16:01:29 +01:00
ansuz 7187d3c550 implement getUserChannelList 2017-03-15 15:55:55 +01:00
ansuz 306f6ce806 resolve merge-conflict with accounting branch 2017-03-14 15:52:04 +01:00
yflory f10149db1c Make sure the tip is always visible when the loading screen is removed 2017-03-14 12:49:22 +01:00
ansuz 71db08eac2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-14 12:40:25 +01:00
ansuz 09afba80db add support for logging in from register page 2017-03-14 12:39:50 +01:00
yflory 16e5788011 Call the callback if we can't parse the local Drive to import it 2017-03-14 12:09:52 +01:00
ansuz 413d9a6f0b add a style-callback to confirm 2017-03-14 12:01:42 +01:00
ansuz 803e57c958 add more parameters to confirm dialogs 2017-03-13 19:30:56 +01:00
yflory ceaf757680 Allow right click on the CryptPad logo/link in the top left corner 2017-03-13 18:49:30 +01:00
ansuz f2aa531f27 apply styles to confirm buttons if provided 2017-03-13 18:18:38 +01:00
ansuz df6298eeb6 apply styles to confirm buttons if provided 2017-03-13 18:18:17 +01:00
ansuz 07a2d8e189 apply translations on feedback page 2017-03-13 12:56:49 +01:00
yflory b7986ff6b1 Replace the spinner code with a font awesome spinner 2017-03-13 11:52:39 +01:00
ansuz d9996cc874 current work for pinning 2017-03-13 10:56:08 +01:00
ansuz b3cc8da315 implement basic clientside RPC infrastructure
and provide a basic example for testing it
2017-03-10 18:03:52 +01:00
ansuz 81027b4200 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting 2017-03-10 10:49:33 +01:00
yflory 459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded 2017-03-08 18:05:15 +01:00
yflory 404fa378e6 Move the store to the 'common' folder, it is not customizable anymore 2017-03-08 16:47:38 +01:00
yflory 0c1efd361b Make sure the href is updated everywhere when importing a stronger link 2017-03-08 15:49:02 +01:00
yflory b701e3cc85 Fix lint errors 2017-03-08 14:59:51 +01:00
yflory 4206382865 Fix the settings app to allow backup for unregistered users 2017-03-08 14:45:39 +01:00
yflory f62267f8a1 Ability to import local pads in the user object 2017-03-07 18:39:21 +01:00
ansuz e2418a6be2 sketch of how pinning rpc will look 2017-03-07 17:33:31 +01:00
ansuz dc567fa7f3 signing keys are stored in hex so encode and decode them 2017-03-07 17:30:32 +01:00
yflory 9ad33574e9 Fix the function returning the pads list in the drive 2017-03-07 14:30:07 +01:00
yflory d93a270336 Ability to display tips in the loading screen 2017-03-06 17:20:09 +01:00
yflory 77d09f64e1 Display anonymous users in the user list 2017-03-06 14:56:41 +01:00
yflory cb88227e2b Autocomplete on key press in some dropdown menus 2017-03-06 12:20:23 +01:00
yflory 2a1b241592 Display a button to open the editing link while in read-only mode if we know it 2017-03-03 18:14:53 +01:00
yflory ed9bcca96f Close the websocket network when CryptGet/CryptPut is done 2017-03-03 12:48:00 +01:00
ansuz 0bb10a8a0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-02 17:59:35 +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
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 9a7c2dd5e2 Add a 'settings' link to the user menu in static pages 2017-03-02 16:38:22 +01:00
yflory c5f983ecd7 Convert read-only link to editing link in the drive 2017-03-02 16:01:34 +01:00
ansuz a9afa24428 return empty string instead of blowing up when fixing HTML 2017-03-02 11:38:20 +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
ansuz cb5e01815c validate all alertify strings by default. require 'force' argument to bypass 2017-03-01 15:07:34 +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 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
ansuz 12aec60a12 hack around onSettle not doing its job 2017-02-28 11:05:59 +01:00
ansuz 1a259bb3aa check if user has disallowed feedback api 2017-02-27 20:02:54 +01:00
yflory 498f4065cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 14:29:55 +01:00
yflory 66dc166936 Make sure the realtime is synced with onSettle when using cryptget 2017-02-27 14:28:12 +01:00
ansuz de5a21fe57 add a simple feedback api and text explaining what it is 2017-02-27 12:06:49 +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 e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +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 ba0b314f5e Fix the 'new' button in drive which was broken in non root categories 2017-02-23 18:15:44 +01:00
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 2017-02-22 12:25:29 +01:00
ansuz 7e77c6828a more correct pluralization 2017-02-21 18:55:48 +01:00
yflory c72bbd4c37 Use the file name as initial title 2017-02-21 17:42: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 d81d17b86c Remove old translations keys no longer used 2017-02-17 17:39:27 +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
ansuz 94417d9a8b jshint compliance 2017-02-17 14:28:18 +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 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 7758d056fa Ability to import/export a user realtime object 2017-02-15 12:40:28 +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 b1b294aade Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 11:10:40 +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 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 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 f8366e0cfc Remove support for legacy store and add a way to import legacy pads 2017-02-09 15:23:09 +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 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 6e97082ff9 remove dead code from login function 2017-02-07 17:27:36 +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 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