Commit Graph

1243 Commits (ac08c9f3d91ebcde88df9b7434a21c36c1c8a364)

Author SHA1 Message Date
ansuz b578803136 clean up registration code a little bit 2017-03-16 10:37:16 +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 9a32fb1999 Fix sub-folders changing position in the tree when renaming them 2017-03-15 17:34:06 +01:00
yflory 931f7619c0 Keep the scroll position on redraw in drive 2017-03-15 17:30:52 +01:00
yflory 0607c3bbf3 Add a title to the 'new' button in drive 2017-03-15 17:20:08 +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
yflory a286599f93 Fix fast reconnect, and add support for reconnecting ws in polls 2017-03-15 16:01:00 +01:00
ansuz bd9efd7c04 provide examples of valid and invalid rpc calls 2017-03-15 15:56:32 +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 fe5e33a0ee Fix loss of presentation position when updating slides 2017-03-14 15:42:42 +01:00
ansuz 805e26bc07 add a version footer to main pages 2017-03-14 14:34:13 +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 5d88c3a436 newer registration code 2017-03-14 12:00:23 +01:00
ansuz 10bb11bff6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 19:32:15 +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
yflory 84c16c00ad Fix click events not working on inputs in the drive tree 2017-03-13 15:53:13 +01:00
ansuz 07a2d8e189 apply translations on feedback page 2017-03-13 12:56:49 +01:00
yflory ca9faa0056 Fix wrong translation keys 2017-03-13 11:52:48 +01:00
yflory b7986ff6b1 Replace the spinner code with a font awesome spinner 2017-03-13 11:52:39 +01:00
ansuz 6e733b1329 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 10:59:20 +01:00
ansuz d9996cc874 current work for pinning 2017-03-13 10:56:08 +01:00
ansuz a7d61aa562 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting 2017-03-10 18:04:07 +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
yflory f94db93897 Improve the slides layout in print mode 2017-03-10 16:46:36 +01:00
ansuz 81027b4200 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting 2017-03-10 10:49:33 +01:00
yflory 2392167996 Export slides as PDF 2017-03-09 19:05:44 +01:00
yflory 4bac8ea0c7 Draw all the slides at once to allow reference links (fix #77) 2017-03-09 12:41:23 +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 a8d200ef2e Don't redirect until realtime is synced when logging in 2017-03-08 16:15:31 +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