Commit Graph

2673 Commits (8738b428617a6bb92170e4f9f1e2a5f53969597c)

Author SHA1 Message Date
ansuz eeecb1baab Make Canvas Work Again 2017-03-20 18:01:13 +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
yflory 85105a1382 Active folder in drive is not underlined anymore 2017-03-20 14:16:44 +01:00
yflory cd77f50717 Fix transitions in slides, add swipe event handlers, and fix print in firefox 2017-03-20 12:50:46 +01:00
yflory e139295d7e Add transitions in present mode 2017-03-17 18:39:39 +01:00
Pierre Bondoerffer 0efb3c993c
fixed lint :( 2017-03-17 18:10:37 +01:00
yflory 45ac3e40a2 Copy print options to present mode 2017-03-17 18:03:00 +01:00
Pierre Bondoerffer 3c60ebcc97
Update Spanish 2017-03-17 18:02:48 +01:00
yflory a5f11d0d0d Uniform the slides rendering in present and print mode 2017-03-17 15:30:27 +01:00
ansuz 2add39ee40 fix default config 2017-03-16 17:29:12 +01:00
ansuz 25a2215846 reconcile merge conflict from master 2017-03-16 17:24:36 +01:00
ansuz d422c7e165 support old hashes in getUserChannelList 2017-03-16 17:14:54 +01:00
ansuz 7d5ff27900 better rpc tests, sum up your channel usage 2017-03-16 17:03:45 +01:00
ansuz 7ab65367c5 don't try to verify messages if you can't decode base64 2017-03-16 17:01:53 +01:00
yflory ecd3f68265 Add chainpad-server to the npm dependencies 2017-03-16 16:24:30 +01:00
yflory 646ed8f6b1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into newServer 2017-03-16 15:57:26 +01:00
yflory 7c9adfbcb6 Replace the websocket server by the one in the chainpad-server repo 2017-03-16 15:57:13 +01:00
ansuz e8fbbf9984 fix default config to be very permissive with CSP headers 2017-03-16 15:40:16 +01:00
ansuz 3185e2a4cc comment out config lines which break local usage of cryptpad 2017-03-16 15:18:57 +01:00
ansuz 737ffe8430 comment out config lines which break local usage of cryptpad 2017-03-16 15:18:29 +01:00
ansuz e207895ffc Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-03-16 15:17:49 +01:00
ansuz b38ba6dbec comment out config lines which break local usage of cryptpad 2017-03-16 15:17:40 +01:00
ansuz 5ed6223313 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-16 14:47:03 +01:00
ansuz 7f2f1f7191 correctly initialize RPC object 2017-03-16 14:46:55 +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
ansuz dc350caff7 return NOT_IMPLEMENTED for all planned rpc calls 2017-03-16 14:43:05 +01:00
yflory f98c825dc3 Fix keyboard shortcuts not working in CryptDrive 2017-03-16 14:43:00 +01:00
yflory 7b27f1dc2c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-16 14:16:54 +01:00
yflory 7761aaa89f Add search UI 2017-03-16 14:16:42 +01:00
ansuz ac08c9f3d9 rpc should only respond to signed messages 2017-03-16 13:07:42 +01:00
ansuz d585fce67b suppress RPC errors if configured to do so 2017-03-16 13:07:01 +01:00
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