Commit Graph

4273 Commits (617c4b60440313610cfdfff06781d7f34ac5449a)

Author SHA1 Message Date
Caleb James DeLisle 617c4b6044 CSS refactorings and pad-is-not-pinned work 2017-12-07 19:00:13 +01:00
Caleb James DeLisle 67f8031beb Wrong usage of colortheme.less, fixed 2017-12-07 14:57:24 +01:00
yflory 4377f2cee7 Fix missing translations in the drive 2017-12-07 12:20:26 +01:00
yflory 203c5d64c1 Focus codemirror after using the markdown toolbar 2017-12-07 12:18:14 +01:00
yflory e72270d4a4 Add feedback when sharedworker is defined 2017-12-07 10:50:45 +01:00
yflory 1ac4abc482 Remove old code 2017-12-07 10:35:48 +01:00
yflory 64303b4090 Merge branch 'refactor' into staging 2017-12-07 10:34:15 +01:00
yflory 3e064e6638 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-06 18:33:16 +01:00
yflory 604ea1c95f Feedback about webworkers 2017-12-06 18:32:48 +01:00
Caleb James DeLisle ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-05 18:32:29 +01:00
Caleb James DeLisle 1dabea84d9 Overrides to colortheme.less will nolonger block the adding of new keys to the original file 2017-12-05 18:32:23 +01:00
yflory 61935500f4 Lint compliance 2017-12-05 18:10:53 +01:00
yflory 9eb33e39e6 Enable change events in the drive 2017-12-05 18:09:43 +01:00
Caleb James DeLisle c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
yflory 17636769e4 Remove the second network created for the drive 2017-12-05 16:40:04 +01:00
ansuz 1613b1c086 flow compliance 2017-12-05 15:15:49 +01:00
ansuz 6e80dce9d4 check for invalid typeof checks 2017-12-05 15:08:01 +01:00
ansuz 291eb57027 fix auth app 2017-12-05 15:07:35 +01:00
ansuz c3e3da4948 allow administrators to increase limits for friends 2017-12-05 15:07:09 +01:00
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