Commit Graph

519 Commits (a5f11d0d0dabb9097a9cc287fc7536a94a81e3fe)

Author SHA1 Message Date
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