Commit Graph
100 Commits
Author SHA1 Message Date
ansuz b630fb95e2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-12 17:39:43 +01:00
ansuz a018b7db9e only show availablePadTypes on the home page 2018-01-12 17:39:36 +01:00
ansuz 844d04df87 allow custom logout hooks defined in app config 2018-01-12 15:49:01 +01:00
ansuz 5b4e5480cb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-12 14:51:53 +01:00
ansuz 9b78580d8e make usage-bar display optional 2018-01-12 14:50:56 +01:00
ansuzandCaleb James DeLisle 05ad38cfe1 add more config parameters to share menu extension 2018-01-11 15:55:57 +01:00
ansuzandCaleb James DeLisle c31b5aa6c0 make extension point cover share menu for files 2018-01-11 15:55:57 +01:00
ansuzandCaleb James DeLisle ca3697ae3a implement extension point for share menu 2018-01-11 15:55:57 +01:00
ansuzandCaleb James DeLisle 5346afe51f step towards customizable login functionality 2018-01-11 15:55:57 +01:00
ansuzandCaleb James DeLisle 1fba82540a remove example code from todo app 2018-01-11 15:55:57 +01:00
ansuzandCaleb James DeLisle ae2517fcc6 remove dead code from home page 2018-01-11 15:55:56 +01:00
ansuz 3075840e6c add more config parameters to share menu extension 2018-01-10 12:52:18 +01:00
ansuz 480ba32d78 make extension point cover share menu for files 2018-01-10 11:59:06 +01:00
ansuz 18ed463a85 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-10 11:49:23 +01:00
ansuz 1ab1f71871 implement extension point for share menu 2018-01-10 11:49:16 +01:00
ansuz 65a1decd73 step towards customizable login functionality 2018-01-10 10:14:49 +01:00
ansuz a91124e21c remove example code from todo app 2018-01-10 10:00:11 +01:00
ansuz 7ced4baf07 remove dead code from home page 2018-01-10 09:54:10 +01:00
ansuz e06cb29c4f bump version 2018-01-08 18:40:51 +01:00
ansuz 63899c94f3 bump bower again 2018-01-03 11:56:58 +01:00
ansuz 33e3c6a0c0 update dependency versions 2018-01-03 11:53:14 +01:00
ansuz 875035a41a Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-01-02 12:15:08 +01:00
ansuz 65e66dea08 resolve bad merge 2018-01-02 12:13:43 +01:00
ansuz e3c7e96d71 Merge branch 'master' of github.com:koulaxizis/cryptpad into merge-greek 2018-01-02 12:11:07 +01:00
ansuz e460d9c36c bump version 2018-01-02 10:38:49 +01:00
ansuz 869909b101 implement more reliable check for whether a channel on the server is new 2017-12-22 16:24:17 +01:00
ansuz b6430d640e temporary measure to address infinite reload loop due to inaccurate inNewFile condition 2017-12-22 14:59:41 +01:00
ansuz 26f5a1fe74 signal that onLocal is called by onRemote 2017-12-22 13:16:15 +01:00
ansuz b0fe323a4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 18:09:55 +01:00
ansuz c0b5dc7536 make loading screen tip presence configurable 2017-12-21 18:09:49 +01:00
ansuz 892dfb18f7 check if users have service workers 2017-12-21 17:30:54 +01:00
ansuz 5f42a9749f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 17:23:58 +01:00
ansuz 4aa8d92a53 handle errors when constructing thumbnails from file metadata 2017-12-21 17:18:10 +01:00
ansuz d1d75f2f25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 15:53:16 +01:00
ansuz 3177fd7857 hide whiteboard palette in view mode 2017-12-20 11:01:23 +01:00
ansuz 4cf3e0edf8 Merge branch 'soon' 2017-12-19 11:07:23 +01:00
ansuz c448c9035e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-19 11:03:43 +01:00
ansuz 127f30df72 bump CryptPad version 2017-12-19 10:56:22 +01:00
ansuz 9615c3a411 update customLimits example for more than one user 2017-12-19 10:30:03 +01:00
ansuz 38e28ebc9a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-15 19:12:00 +01:00
ansuz 3c2d6af4f0 save pending tags when clicking OK on tagPrompt 2017-12-15 19:11:53 +01:00
ansuz 39d8e2dd81 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 16:00:12 +01:00
ansuz afcf3d06b3 unpin pads when they are removed from your drive 2017-12-12 16:00:05 +01:00
ansuz 1a0ac9830a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 14:53:17 +01:00
ansuz c0e49211c4 eat errors related to cursors 2017-12-12 14:51:51 +01:00
ansuz 50b6a23067 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 13:47:35 +01:00
ansuz 76af3b90a7 stub createUnpinnedWarning0 2017-12-12 13:47:24 +01:00
ansuz 7b8321c263 make a test fail so we don't forget to fix the bug 2017-12-12 13:43:55 +01:00
ansuz 16388a839c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-11 15:46:38 +01:00
ansuz 230f9524be new less linter rules and compliance 2017-12-11 15:05:58 +01:00
ansuz 5f0a865028 implement 'FRESH MODE' 2017-12-11 11:13:06 +01:00
ansuz 06422e6d5a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-08 11:47:55 +01:00
ansuz 38bd27303b WIP rpc framework 2017-12-08 11:47:07 +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
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
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
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
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
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
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
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
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
ansuz 5eacc158d9 make tests pass again 2017-11-27 13:45:40 +01:00
ansuz 812df7de6f Merge branch 'merge-staging' into staging 2017-11-27 12:18:34 +01:00
ansuz be5c5831dd lint compliance 2017-11-27 12:18:04 +01:00
ansuz 77c81f2426 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging 2017-11-27 12:16:47 +01:00
ansuz 4ff4ccd1d3 use faster and more correct 'find' implementation 2017-11-27 11:30:50 +01:00
ansuz e3f04ef076 Merge branch 'soon' into staging 2017-11-27 11:11:49 +01:00
ansuz 71cf3a4ddf fix creation of personal todo list 2017-11-27 11:09:28 +01:00
ansuz 701af29192 fix broken register/login process 2017-11-24 15:12:00 +01:00
ansuz a3c093838c merge latest staging and resolve conflicts 2017-11-24 13:46:59 +01:00
ansuz 56102d3689 use unified listmap 2017-11-24 13:40:21 +01:00
ansuz 661db129b2 lint compliance 2017-11-24 10:32:58 +01:00
ansuz 80978377f2 return transformed cursor value 2017-11-24 10:03:45 +01:00
ansuz 2e00214783 drop unreachable code 2017-11-23 16:57:01 +01:00
ansuz ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
ansuz 1e9856647e lint compliance 2017-11-22 17:40:00 +01:00
ansuz 98c2b0c802 Merge branch 'soon' into staging 2017-11-22 17:38:49 +01:00
ansuz 3ff0eb116b don't let search interfere with renaming 2017-11-22 17:23:14 +01:00
ansuz eac6afba24 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-21 18:22:08 +01:00
ansuz c196b98eb2 add a script to check accounts server for registered users 2017-11-21 18:22:01 +01:00
ansuz 60c4973d62 resolve merge conflicts 2017-11-21 17:22:06 +01:00