Commit Graph

5006 Commits (3ba0ad3cf1c42f7714d008e419f7a7fd2bf9b79c)

Author SHA1 Message Date
yflory 52712c4bb9 Use the network from the async store for pads 2017-12-04 19:16:38 +01:00
ansuz 087eee55f6 update 404 page 2017-12-04 18:31:07 +01:00
ansuz f95669a27a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 17:33:13 +01:00
ansuz fc4fea9c54 update 404 messages and show actual text faster 2017-12-04 17:33:06 +01:00
yflory e397f66b56 lint compliance 2017-12-04 15:27:48 +01:00
yflory de7806504b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 15:03:57 +01:00
yflory f52d987515 Ability to resize avatars before uploading them 2017-12-04 15:03:43 +01:00
ansuz 34223e4b78 remove accidental inclusion 2017-12-04 13:59:57 +01:00
ansuz 0b54a76211 lint compliance 2017-12-04 13:58:33 +01:00
ansuz cd29208267 fix toolbar's incorrect gotoDrive title 2017-12-04 11:46:15 +01:00
ansuz e85e2dcabd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 11:41:45 +01:00
ansuz d3d9e2e771 WIP: refactoring rpc code 2017-12-04 11:10:25 +01:00
ansuz afcc888a8b make flat dom quiet again 2017-12-04 10:16:17 +01:00
yflory e164edec03 Fix the webworker app 2017-12-01 18:29:59 +01:00
yflory b14228da18 Merge branch 'staging' into refactor 2017-12-01 17:04:03 +01:00
yflory c59c6072f3 Remove jquery from outer 2017-12-01 16:05:23 +01:00
yflory fc027ba00b Test webworker app 2017-12-01 15:03:01 +01:00
yflory c6b8bbea59 Fix tests 2017-12-01 14:56:34 +01:00
yflory 04e02871bc Merge branch 'refactor2' into staging 2017-12-01 14:50:19 +01:00
yflory 4903bd0757 Enable messenger in async store 2017-12-01 14:49:21 +01:00
ansuz 5acbaef28f tweak animation parameters for faster 'decryption' 2017-12-01 14:03:13 +01:00
ansuz c80c97d7db lint compliance 2017-12-01 13:23:23 +01:00
ansuz 82cd822b29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-01 11:51:17 +01:00
ansuz bcdc0d810a make 404 page translateable, point to home page or drive 2017-12-01 11:51:04 +01:00
yflory bd85f1b003 Fix file upload and remove unnecessary dependencies 2017-12-01 10:16:48 +01:00
ansuz b5516ddcd0 send 404 page from server 2017-11-30 19:19:21 +01:00
ansuz 443eeaa407 fancy 404 page 2017-11-30 19:17:59 +01:00
Caleb James DeLisle 7544bb1ced Fix a few issues with RPC which I managed to verschlumbesserung 2017-11-30 18:48:19 +01:00
Caleb James DeLisle 7c8572c99d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-30 18:32:27 +01:00
Caleb James DeLisle 5187b3f26c Flow compliance and fix a few bugs in rpc.js 2017-11-30 18:32:20 +01:00
yflory 664625a6ef Fix more async store issues 2017-11-30 18:22:26 +01:00
yflory d1277d7026 Merge branch 'staging' into refactor2 2017-11-30 17:25:23 +01:00
ansuz aca83ce72a expose self as global for linter 2017-11-30 17:25:05 +01:00
ansuz 3f892e04a5 fix codemirror overflow css 2017-11-30 17:24:43 +01:00
yflory 5c3237e093 Fix issues with the async store 2017-11-30 17:21:58 +01:00
yflory b3688db202 Use async store 2017-11-30 15:01:17 +01:00
yflory 0840570fbf Async store part 1 2017-11-30 10:33:09 +01:00
ansuz 96cf83af34 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 18:26:11 +01:00
ansuz 385ac9607c pass 'self' into common-util instead of using window 2017-11-27 18:26:04 +01:00
yflory f0dca50c62 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 18:10:49 +01:00
yflory acd8ab7446 Add the markdown toolbar in profile 2017-11-27 18:10:37 +01:00
ansuz 97d56303bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 17:59:07 +01:00
ansuz 1d0da582b4 update bower.json 2017-11-27 17:58:50 +01:00
yflory b0a384e8e0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 17:55:48 +01:00
yflory 74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
ansuz 22c5ff757b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 15:05:07 +01:00
ansuz 650d26afea use unified listmap in profile app 2017-11-27 15:04:59 +01:00
yflory 68d602f74a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 14:44:57 +01:00
yflory 644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz 5eacc158d9 make tests pass again 2017-11-27 13:45:40 +01:00