Squashed commit of the following:
commitf31e7ae2c1Author: joenepraat <joenepraat@posteo.org> Date: Thu Mar 30 13:17:01 2023 +0000 Translated using Weblate (Dutch) Currently translated at 94.5% (297 of 314 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/nl/ commit96486b5945Author: lesion <lesion@autistici.org> Date: Thu Mar 30 11:18:39 2023 +0200 minor commit9524fd52f3Author: lesion <lesion@autistici.org> Date: Thu Mar 30 00:08:27 2023 +0200 update changelog, releasing v1.6.8 commitdf4ec69128Author: lesion <lesion@autistici.org> Date: Wed Mar 29 12:41:52 2023 +0200 force vuetify to not use google fonts commite35595df82Author: lesion <lesion@autistici.org> Date: Tue Mar 28 21:54:06 2023 +0200 layout commitee8a9843b3Author: lesion <lesion@autistici.org> Date: Tue Mar 28 21:48:26 2023 +0200 minor commit2608761a44Author: lesion <lesion@autistici.org> Date: Tue Mar 28 19:04:49 2023 +0200 update deps commitd7c8de7580Author: lesion <lesion@autistici.org> Date: Tue Mar 28 19:04:41 2023 +0200 minor commit6b55ba1708Author: lesion <lesion@autistici.org> Date: Tue Mar 28 19:04:16 2023 +0200 use new luxon in rss template, fixing locale and timezone #254 commitfc52107bd9Author: lesion <lesion@autistici.org> Date: Tue Mar 28 19:02:08 2023 +0200 use luxon instead of dayjs server side too commitf5604a03bcAuthor: lesion <lesion@autistici.org> Date: Tue Mar 28 18:55:57 2023 +0200 unit test for recurrent events commit3e81d1dfb3Merge:f960400e750fc8Author: lesion <lesion@autistici.org> Date: Tue Mar 28 18:51:34 2023 +0200 Merge remote-tracking branch 'weblate/master' commitf960400085Author: lesion <lesion@autistici.org> Date: Mon Mar 27 17:19:27 2023 +0200 improve index/tag/place layout commit0682feaaf8Author: lesion <lesion@autistici.org> Date: Mon Mar 27 17:18:57 2023 +0200 minor with theme admin colors commite750fc8e81Author: josé m <correoxm@disroot.org> Date: Sun Mar 26 07:48:06 2023 +0000 Translated using Weblate (Galician) Currently translated at 100.0% (314 of 314 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/gl/ commit4c74fd3227Author: gallegonovato <fran-carro@hotmail.es> Date: Sat Mar 25 11:23:48 2023 +0000 Translated using Weblate (Spanish) Currently translated at 100.0% (314 of 314 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/es/ commit428a94290fAuthor: joenepraat <joenepraat@posteo.org> Date: Thu Mar 23 15:15:58 2023 +0000 Translated using Weblate (Dutch) Currently translated at 95.5% (299 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/nl/ commit373f78cd4eAuthor: joenepraat <joenepraat@posteo.org> Date: Thu Mar 23 17:47:21 2023 +0000 Translated using Weblate (Dutch) Currently translated at 7.6% (1 of 13 strings) Translation: Gancio/Email Translate-URL: https://hosted.weblate.org/projects/gancio/email/nl/ commit2d11d88e8fMerge:ea3066ce2fd5f8Author: lesion <lesion@autistici.org> Date: Sat Mar 25 09:34:44 2023 +0100 Merge remote-tracking branch 'weblate/master' commite2fd5f8b93Author: joenepraat <joenepraat@posteo.org> Date: Thu Mar 23 15:15:58 2023 +0000 Translated using Weblate (Dutch) Currently translated at 95.5% (299 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/nl/ commit8280eb7c7aAuthor: joenepraat <joenepraat@posteo.org> Date: Thu Mar 23 17:47:21 2023 +0000 Translated using Weblate (Dutch) Currently translated at 7.6% (1 of 13 strings) Translation: Gancio/Email Translate-URL: https://hosted.weblate.org/projects/gancio/email/nl/ commitea3066c34eAuthor: lesion <lesion@autistici.org> Date: Fri Mar 24 16:03:08 2023 +0100 people could choose custom colors commit8149ea23daAuthor: lesion <lesion@autistici.org> Date: Wed Mar 22 15:39:02 2023 +0100 moving vuetify configuration to "middleware" commit7e6130155aAuthor: lesion <lesion@autistici.org> Date: Fri Mar 10 21:58:02 2023 +0100 start with custom color commite2b07a06bdAuthor: lesion <lesion@autistici.org> Date: Thu Mar 23 13:11:15 2023 +0100 release WPGancio 1.7 commitb91774ac39Author: lesion <lesion@autistici.org> Date: Thu Mar 23 13:09:10 2023 +0100 fix tags merge in wp plugin and end_datetime commitc8493d0810Author: lesion <lesion@autistici.org> Date: Wed Mar 22 18:45:48 2023 +0100 use new $time plugin instead of filters, fix #252 commit780938ef91Author: lesion <lesion@autistici.org> Date: Wed Mar 22 16:51:02 2023 +0100 v1.6.7 commit442f88f322Author: lesion <lesion@autistici.org> Date: Wed Mar 22 16:49:37 2023 +0100 minor commit9f90df2bfcAuthor: lesion <lesion@autistici.org> Date: Wed Mar 22 16:24:08 2023 +0100 v.1.6.6 commit71fdeb6ff8Author: lesion <lesion@autistici.org> Date: Wed Mar 22 16:17:02 2023 +0100 some old event was flagged has multidate but without an end_datetime? fix #245 commite6977368c5Author: lesion <lesion@autistici.org> Date: Wed Mar 22 13:41:50 2023 +0100 revert Intl, node is not ready, fix #250 commiteb2bf32162Author: lesion <lesion@autistici.org> Date: Tue Mar 21 16:47:47 2023 +0100 release v1.6.5 commit0ebb467630Author: lesion <lesion@autistici.org> Date: Tue Mar 21 01:15:35 2023 +0100 minor commit934466b2ecAuthor: lesion <lesion@autistici.org> Date: Mon Mar 20 21:09:58 2023 +0100 add modules in package commitec62ad9ba8Author: lesion <lesion@autistici.org> Date: Mon Mar 20 21:09:43 2023 +0100 v-lazy in collection page too commitd9f093fdbbAuthor: lesion <lesion@autistici.org> Date: Mon Mar 20 12:55:17 2023 +0100 releasing v1.6.5 commit2ffd2aff82Author: lesion <lesion@autistici.org> Date: Mon Mar 20 12:53:41 2023 +0100 enable task manager in dev mode commit02f138e0f2Author: lesion <lesion@autistici.org> Date: Mon Mar 20 12:40:39 2023 +0100 update CHANGELOG commitb8e096ee39Author: lesion <lesion@autistici.org> Date: Mon Mar 20 12:40:19 2023 +0100 minor with 2w recurrent event frequency commit8f221fb69cAuthor: lesion <lesion@autistici.org> Date: Sun Mar 19 23:33:55 2023 +0100 minor commit079bcd4af2Merge:99d78e2ae990fcAuthor: lesion <lesion@autistici.org> Date: Sun Mar 19 23:28:44 2023 +0100 Merge remote-tracking branch 'sedum/feat/ssr-proxy' commit99d78e2492Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:26:57 2023 +0100 Squashed commit of the following: commit 5c0d380740c24e0467cef916fd0560cb26409f9f Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:22:25 2023 +0100 update yarn.lock commit 909ee71ecb8f27e4fba72430aecc92bf527e6cd4 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:22:09 2023 +0100 Squashed commit of the following: commitfc8a9f4506Author: lesion <lesion@autistici.org> Date: Tue Mar 14 16:42:24 2023 +0100 address some issues with recurrent events, fix #247 commitf7357666caAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 16:16:52 2023 +0100 fix event import from URL commite1bca6f46aAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 16:15:42 2023 +0100 add Duch (nl) locale (thanks @jeoenepraat) commit5f8afdbc12Merge:57a052a92ca5abAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 11:39:50 2023 +0100 Merge remote-tracking branch 'weblate/master' commit57a052a7faMerge:63d1d2e55137d2Author: lesion <lesion@autistici.org> Date: Tue Mar 14 11:39:33 2023 +0100 Merge commit '55137d2ac23549e633f36ad10139fd4168c2645f' commit92ca5abf5eAuthor: joenepraat <joenepraat@posteo.org> Date: Fri Mar 10 23:16:32 2023 +0000 Translated using Weblate (Dutch) Currently translated at 68.3% (214 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/nl/ commit63d1d2ee53Author: lesion <lesion@autistici.org> Date: Thu Mar 9 21:41:06 2023 +0100 minor commitd2759a55a5Author: lesion <lesion@autistici.org> Date: Thu Mar 9 21:38:39 2023 +0100 wrong user / admin merge dark theme settings - fix #244 commitb401d829dbAuthor: lesion <lesion@autistici.org> Date: Thu Mar 9 21:24:45 2023 +0100 remove a small warning commitccffe5f7b0Author: lesion <lesion@autistici.org> Date: Fri Feb 24 11:40:36 2023 +0100 push tags on release commit55137d2ac2Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Feb 23 23:56:16 2023 +0000 Bump sequelize from 6.28.0 to 6.29.0 Bumps [sequelize](https://github.com/sequelize/sequelize) from 6.28.0 to 6.29.0. - [Release notes](https://github.com/sequelize/sequelize/releases) - [Commits](https://github.com/sequelize/sequelize/compare/v6.28.0...v6.29.0) --- updated-dependencies: - dependency-name: sequelize dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> commitb654f29d8bAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 13:21:17 2023 +0100 update changelog commit0cd1ee9d89Author: lesion <lesion@autistici.org> Date: Wed Feb 22 13:17:29 2023 +0100 increase rate limit max requests per minutes commitb6dafc082eAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:45:39 2023 +0100 minor commit0fa7769844Author: lesion <lesion@autistici.org> Date: Wed Feb 22 08:45:18 2023 +0100 location saving is not working when geocoding is disabled, fix #238 commit07f9e2d9eeAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:33:40 2023 +0100 really fix #232 commitbae930799eAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:33:09 2023 +0100 downgrade mariadb (sequelize is not ready) commitd733d7fef1Author: lesion <lesion@autistici.org> Date: Wed Feb 22 00:16:28 2023 +0100 aargh commit98b22aad70Author: lesion <lesion@autistici.org> Date: Tue Feb 21 00:56:06 2023 +0100 minor commitfc098b603dAuthor: lesion <lesion@autistici.org> Date: Tue Feb 21 00:55:44 2023 +0100 missing i18n in setup, fix #239 commit3eaf72af19Merge:bba196bd6c6034Author: lesion <lesion@autistici.org> Date: Mon Feb 20 21:17:37 2023 +0100 Merge remote-tracking branch 'weblate/master' commitbba196b068Author: lesion <lesion@autistici.org> Date: Sat Feb 18 00:05:52 2023 +0100 update changelog, v1.6.3 commitbb9f7cca47Author: lesion <lesion@autistici.org> Date: Sat Feb 18 00:04:28 2023 +0100 minor commit80d2dbd06bAuthor: lesion <lesion@autistici.org> Date: Fri Feb 17 23:40:28 2023 +0100 minor commitd6c6034630Author: fadelkon <fadelkon@posteo.net> Date: Thu Feb 16 22:09:23 2023 +0000 Translated using Weblate (Catalan) Currently translated at 100.0% (313 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/ca/ commitd125cf1506Author: lesion <lesion@autistici.org> Date: Fri Feb 17 21:56:31 2023 +0100 set a default user_locale path commit4367960a62Merge:c8cc5c687dd179Author: lesion <lesion@autistici.org> Date: Tue Feb 7 17:46:58 2023 +0100 Merge branch 'master' into gh commitc8cc5c6c97Merge:88e0c90550e221Author: lesion <lesion@autistici.org> Date: Mon Jan 9 17:15:21 2023 +0100 Merge branch 'master' into gh commit88e0c90a66Merge:421aa12f212ac1Author: lesion <lesion@autistici.org> Date: Thu Dec 15 09:54:41 2022 +0100 Merge branch 'master' into gh commit421aa12781Merge:5f6cc46b3488e7Author: lesion <lesion@autistici.org> Date: Wed Sep 28 12:26:08 2022 +0200 Merge branch 'master' into gh commit5f6cc46cdcMerge:b66feb9171d968Author: lesion <lesion@autistici.org> Date: Mon Aug 8 00:08:12 2022 +0200 Merge branch 'master' into gh commitb66feb92e2Merge:80c55d505d068fAuthor: lesion <lesion@autistici.org> Date: Tue Jun 21 23:48:40 2022 +0200 Merge branch 'master' into gh commit80c55d5601Merge:814090ea154fdfAuthor: lesion <lesion@autistici.org> Date: Mon Jun 6 17:27:00 2022 +0200 Merge branch 'master' into gh commit814090e9b6Merge:616c5422e3aba9Author: lesion <lesion@autistici.org> Date: Mon Jun 6 17:19:31 2022 +0200 Merge branch 'master' into gh commit616c54229aMerge:e4cb22e82dcaf9Author: lesion <lesion@autistici.org> Date: Mon Jun 6 16:57:05 2022 +0200 Merge branch 'master' into gh commite4cb22ee33Merge:5dddfbd8657937Author: lesion <lesion@autistici.org> Date: Fri Mar 11 23:41:22 2022 +0100 Merge branch 'master' into gh commit5dddfbd29eMerge:60e9d9510c6b0dAuthor: lesion <lesion@autistici.org> Date: Fri Mar 11 23:22:12 2022 +0100 Merge branch 'master' into gh commit60e9d95ba8Merge:79445caad93f83Author: lesion <lesion@autistici.org> Date: Tue Dec 7 01:35:18 2021 +0100 Merge branch 'master' into gh commit79445ca8a7Merge:9472d8dcd313efAuthor: les <lesion@autistici.org> Date: Thu Jun 24 21:52:25 2021 +0200 Merge branch 'master' into gh commit9472d8d919Merge:f9601499e9643eAuthor: les <lesion@autistici.org> Date: Fri Mar 26 22:27:41 2021 +0100 Merge branch 'dev' into gh commitf9601492dcAuthor: les <lesion@autistici.org> Date: Fri Dec 6 11:30:41 2019 +0100 update dependencies commitf8c7fa2b45Author: les <lesion@autistici.org> Date: Fri Dec 6 11:41:13 2019 +0100 minor commit33ca266535Author: les <lesion@autistici.org> Date: Fri Dec 6 11:38:15 2019 +0100 prepare gh as a mirror commit 5c8875411631048210eb50030e83cb272a40d54a Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:18:40 2023 +0100 update deps commit 7eac4fce324a6e75cdda296d672317cf2497c005 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:18:25 2023 +0100 refactoring event detail page commit dc9ca88bc62708b869be3f3efe51d9155fe17830 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:17:35 2023 +0100 show hide boosts/bookmarks, fix #241 commit d4a25b1dd0b9404e0de7ca5cf546f0d29bc8943e Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:13:58 2023 +0100 minor with unixFormat commit 239d6bcab19ef3cf53d1b2544a5c9a36ba8dd25b Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:12:25 2023 +0100 minor commit b149f980db8245c12a6940997be6d5657bddf829 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:12:05 2023 +0100 minor commit 6f2955c584ec9da2c10991fb09ab57735a31385d Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:49 2023 +0100 minor commit dd586c38c9ef2f0b408ef90eb27dffe53355305a Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:31 2023 +0100 minor on style commit 544823717b9801e63bef15394b25bfbcd842c10f Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:15 2023 +0100 fix multidate issue, go to event on save commit 9ef0c75d03ee2d69f89034b28d6991f85ffefb06 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:09:47 2023 +0100 use v-lazy, improve search, full tag/place events commit ac91072b79960815e0535e63ac45e0b5c6100764 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:47:51 2023 +0100 increase DDOS limiter to 250 req/min commit d0ca92efb4afe48d2fd236083d9e290ab8d49704 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:47:14 2023 +0100 update changelog commit 2d54f19225acc4118d60ef8c9d12f9495e6776ca Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:46:51 2023 +0100 use luxon instead of dayjs, new $time plugin commitae990fc370Author: sedum <sedum@oziosi.org> Date: Thu Mar 16 17:29:48 2023 +0100 add support for server side http proxy, close #240 commitfc8a9f4506Author: lesion <lesion@autistici.org> Date: Tue Mar 14 16:42:24 2023 +0100 address some issues with recurrent events, fix #247 commitf7357666caAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 16:16:52 2023 +0100 fix event import from URL commite1bca6f46aAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 16:15:42 2023 +0100 add Duch (nl) locale (thanks @jeoenepraat) commit5f8afdbc12Merge:57a052a92ca5abAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 11:39:50 2023 +0100 Merge remote-tracking branch 'weblate/master' commit57a052a7faMerge:63d1d2e55137d2Author: lesion <lesion@autistici.org> Date: Tue Mar 14 11:39:33 2023 +0100 Merge commit '55137d2ac23549e633f36ad10139fd4168c2645f' commit92ca5abf5eAuthor: joenepraat <joenepraat@posteo.org> Date: Fri Mar 10 23:16:32 2023 +0000 Translated using Weblate (Dutch) Currently translated at 68.3% (214 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/nl/ commit63d1d2ee53Author: lesion <lesion@autistici.org> Date: Thu Mar 9 21:41:06 2023 +0100 minor commitd2759a55a5Author: lesion <lesion@autistici.org> Date: Thu Mar 9 21:38:39 2023 +0100 wrong user / admin merge dark theme settings - fix #244 commitb401d829dbAuthor: lesion <lesion@autistici.org> Date: Thu Mar 9 21:24:45 2023 +0100 remove a small warning commit55137d2ac2Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Feb 23 23:56:16 2023 +0000 Bump sequelize from 6.28.0 to 6.29.0 Bumps [sequelize](https://github.com/sequelize/sequelize) from 6.28.0 to 6.29.0. - [Release notes](https://github.com/sequelize/sequelize/releases) - [Commits](https://github.com/sequelize/sequelize/compare/v6.28.0...v6.29.0) --- updated-dependencies: - dependency-name: sequelize dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> commit4367960a62Merge:c8cc5c687dd179Author: lesion <lesion@autistici.org> Date: Tue Feb 7 17:46:58 2023 +0100 Merge branch 'master' into gh commitc8cc5c6c97Merge:88e0c90550e221Author: lesion <lesion@autistici.org> Date: Mon Jan 9 17:15:21 2023 +0100 Merge branch 'master' into gh commit88e0c90a66Merge:421aa12f212ac1Author: lesion <lesion@autistici.org> Date: Thu Dec 15 09:54:41 2022 +0100 Merge branch 'master' into gh commit421aa12781Merge:5f6cc46b3488e7Author: lesion <lesion@autistici.org> Date: Wed Sep 28 12:26:08 2022 +0200 Merge branch 'master' into gh commit5f6cc46cdcMerge:b66feb9171d968Author: lesion <lesion@autistici.org> Date: Mon Aug 8 00:08:12 2022 +0200 Merge branch 'master' into gh commitb66feb92e2Merge:80c55d505d068fAuthor: lesion <lesion@autistici.org> Date: Tue Jun 21 23:48:40 2022 +0200 Merge branch 'master' into gh commit80c55d5601Merge:814090ea154fdfAuthor: lesion <lesion@autistici.org> Date: Mon Jun 6 17:27:00 2022 +0200 Merge branch 'master' into gh commit814090e9b6Merge:616c5422e3aba9Author: lesion <lesion@autistici.org> Date: Mon Jun 6 17:19:31 2022 +0200 Merge branch 'master' into gh commit616c54229aMerge:e4cb22e82dcaf9Author: lesion <lesion@autistici.org> Date: Mon Jun 6 16:57:05 2022 +0200 Merge branch 'master' into gh commite4cb22ee33Merge:5dddfbd8657937Author: lesion <lesion@autistici.org> Date: Fri Mar 11 23:41:22 2022 +0100 Merge branch 'master' into gh commit5dddfbd29eMerge:60e9d9510c6b0dAuthor: lesion <lesion@autistici.org> Date: Fri Mar 11 23:22:12 2022 +0100 Merge branch 'master' into gh commit60e9d95ba8Merge:79445caad93f83Author: lesion <lesion@autistici.org> Date: Tue Dec 7 01:35:18 2021 +0100 Merge branch 'master' into gh commit79445ca8a7Merge:9472d8dcd313efAuthor: les <lesion@autistici.org> Date: Thu Jun 24 21:52:25 2021 +0200 Merge branch 'master' into gh commit9472d8d919Merge:f9601499e9643eAuthor: les <lesion@autistici.org> Date: Fri Mar 26 22:27:41 2021 +0100 Merge branch 'dev' into gh commitf9601492dcAuthor: les <lesion@autistici.org> Date: Fri Dec 6 11:30:41 2019 +0100 update dependencies commitf8c7fa2b45Author: les <lesion@autistici.org> Date: Fri Dec 6 11:41:13 2019 +0100 minor commit33ca266535Author: les <lesion@autistici.org> Date: Fri Dec 6 11:38:15 2019 +0100 prepare gh as a mirror
This commit is contained in:
@@ -9,7 +9,7 @@ v-container
|
||||
:footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }'
|
||||
:items='unconfirmedEvents'
|
||||
:headers='headers')
|
||||
template(v-slot:item.when='{ item }') {{item|when}}
|
||||
template(v-slot:item.when='{ item }') {{$time.when(item)}}
|
||||
template(v-slot:item.actions='{ item }')
|
||||
v-btn(text small @click='confirm(item)' color='success') {{$t('common.confirm')}}
|
||||
v-btn(text small :to='`/event/${item.slug || item.id}`' color='success') {{$t('common.preview')}}
|
||||
|
||||
@@ -41,7 +41,7 @@ v-container
|
||||
template(v-slot:item.content='{ item }')
|
||||
span(v-html='item.data.content')
|
||||
template(v-slot:item.created='{ item }')
|
||||
span {{item.created | dateFormat('lll')}}
|
||||
span {{$time.format(item.created, 'ff')}}
|
||||
template(v-slot:item.user='{ item }')
|
||||
a(:href='item.ap_user.url || item.ap_user.ap_id' target='_blank') {{item.ap_user.preferredUsername}}
|
||||
template(v-slot:item.event='{ item }')
|
||||
|
||||
@@ -28,7 +28,7 @@ v-container
|
||||
:disable='!valid || loading') {{ $t('common.save') }}
|
||||
|
||||
v-card-text
|
||||
v-card(v-for='plugin in plugins' :key='plugin.name' max-width="400" elevation='10' color='secondary' dark)
|
||||
v-card(v-for='plugin in plugins' :key='plugin.name' max-width="400" elevation='10')
|
||||
v-card-title {{ plugin.name }}
|
||||
v-card-text
|
||||
p {{ plugin.description }}
|
||||
|
||||
@@ -79,7 +79,7 @@ v-container
|
||||
import SMTP from './SMTP.vue'
|
||||
import Geolocation from './Geolocation.vue'
|
||||
import { mapActions, mapState } from 'vuex'
|
||||
import moment from 'dayjs'
|
||||
import { DateTime } from 'luxon'
|
||||
import tzNames from './tz.json'
|
||||
import { mdiAlert, mdiArrowRight, mdiMap } from '@mdi/js'
|
||||
const locales = require('../../locales/index')
|
||||
@@ -147,7 +147,7 @@ export default {
|
||||
}
|
||||
},
|
||||
filteredTimezones () {
|
||||
const current_timezone = moment.tz.guess()
|
||||
const current_timezone = DateTime.local().zoneName
|
||||
tzNames.unshift(current_timezone)
|
||||
return tzNames
|
||||
}
|
||||
|
||||
@@ -52,38 +52,55 @@ v-container
|
||||
v-img.mt-2(:src='`/headerimage.png?${headerImageKey}`' max-height="150px" contain)
|
||||
|
||||
|
||||
|
||||
//- TODO choose theme colors
|
||||
//- v-row
|
||||
//- v-col(v-for='(color, i) in colors' :key='i')
|
||||
//- v-menu(v-model='menu[i]'
|
||||
//- :close-on-content-click="false"
|
||||
//- transition="slide-x-transition"
|
||||
//- offset-y
|
||||
//- absolute
|
||||
//- bottom
|
||||
//- max-width="290px"
|
||||
//- min-width="290px")
|
||||
//- template(v-slot:activator='{ on }')
|
||||
//- v-btn(:color='i' small
|
||||
//- v-on='on') {{i}}
|
||||
//- v-color-picker(light @update:color='c => updateColor(i, c)')
|
||||
|
||||
v-dialog(v-model='linkModal' width='500' :fullscreen='$vuetify.breakpoint.xsOnly')
|
||||
v-card
|
||||
v-card-title {{$t('admin.footer_links')}}
|
||||
v-card-title {{$t('admin.colors')}}
|
||||
//- choose theme colors
|
||||
v-card-text
|
||||
v-theme-provider(dark)
|
||||
v-card(max-width='465')
|
||||
v-card-text
|
||||
v-form(v-model='valid' ref='linkModalForm')
|
||||
v-text-field(v-model='link.label'
|
||||
:rules="[$validators.required('common.label')]"
|
||||
label='Label')
|
||||
v-text-field(v-model='link.href'
|
||||
:rules="[$validators.required('common.url')]"
|
||||
:label="$t('common.url')")
|
||||
v-card-actions
|
||||
v-spacer
|
||||
v-btn(outlined @click='linkModal=false' color='error') {{$t('common.cancel')}}
|
||||
v-btn(outlined @click='addFooterLink' color='primary' :disabled='!valid') {{$t('common.add')}}
|
||||
span.mr-2(v-for='(color, i) in settings.dark_colors' :key='i')
|
||||
v-menu(v-model='dark_menu[i]'
|
||||
:close-on-content-click="false"
|
||||
transition="slide-y-transition"
|
||||
offset-y
|
||||
top right
|
||||
max-width="290px"
|
||||
min-width="290px")
|
||||
template(v-slot:activator='{ on }')
|
||||
v-btn(:color='color' dark small v-on='on') {{i}}
|
||||
v-color-picker(mode='hexa' :value='color' @update:color='c => updateColor("dark", i, c)')
|
||||
|
||||
v-theme-provider(light)
|
||||
v-card.mt-4(max-width='465')
|
||||
v-card-text
|
||||
span.mr-2(v-for='(color, i) in settings.light_colors' :key='i')
|
||||
v-menu(v-model='light_menu[i]'
|
||||
:close-on-content-click="false"
|
||||
transition="slide-y-transition"
|
||||
offset-y
|
||||
top right
|
||||
max-width="290px"
|
||||
min-width="290px")
|
||||
template(v-slot:activator='{ on }')
|
||||
v-btn(:color='color' small v-on='on') {{i}}
|
||||
v-color-picker(mode='hexa' :value='color' @update:color='c => updateColor("light", i, c)')
|
||||
|
||||
|
||||
v-dialog(v-model='linkModal' width='500' :fullscreen='$vuetify.breakpoint.xsOnly')
|
||||
v-card
|
||||
v-card-title {{$t('admin.footer_links')}}
|
||||
v-card-text
|
||||
v-form(v-model='valid' ref='linkModalForm')
|
||||
v-text-field(v-model='link.label'
|
||||
:rules="[$validators.required('common.label')]"
|
||||
label='Label')
|
||||
v-text-field(v-model='link.href'
|
||||
:rules="[$validators.required('common.url')]"
|
||||
:label="$t('common.url')")
|
||||
v-card-actions
|
||||
v-spacer
|
||||
v-btn(outlined @click='linkModal=false' color='error') {{$t('common.cancel')}}
|
||||
v-btn(outlined @click='addFooterLink' color='primary' :disabled='!valid') {{$t('common.add')}}
|
||||
|
||||
v-card-title {{$t('admin.footer_links')}}
|
||||
v-card-text
|
||||
@@ -106,10 +123,11 @@ v-container
|
||||
<script>
|
||||
import { mapActions, mapState } from 'vuex'
|
||||
import { mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp } from '@mdi/js'
|
||||
import debounce from 'lodash/debounce'
|
||||
|
||||
export default {
|
||||
name: 'Theme',
|
||||
data () {
|
||||
data ({ $store }) {
|
||||
const t = new Date().getMilliseconds()
|
||||
return {
|
||||
mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp,
|
||||
@@ -118,24 +136,19 @@ export default {
|
||||
fallbackImageKey: t,
|
||||
headerImageKey: t,
|
||||
link: { href: '', label: '' },
|
||||
linkModal: false
|
||||
// menu: [false, false, false, false]
|
||||
// colors: { primary: '', secondary: '', accent: '', error: '', info: '', success: '', warning: '' }
|
||||
// primary: {},
|
||||
// secondary: {}
|
||||
// }
|
||||
linkModal: false,
|
||||
dark_menu: [false, false, false, false],
|
||||
light_menu: [false, false, false, false],
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState(['settings']),
|
||||
// 'colors.primary': this.color('primary'),
|
||||
// 'colors.secondary': this.color('primary'),
|
||||
// 'colors.tertiary': this.color('primary'),
|
||||
is_dark: {
|
||||
get () { return this.settings['theme.is_dark'] },
|
||||
set (value) {
|
||||
this.$vuetify.theme.dark = value
|
||||
this.setSetting({ key: 'theme.is_dark', value })
|
||||
this.setLocalSetting({ key: 'theme.is_dark', value })
|
||||
}
|
||||
},
|
||||
hide_thumbs: {
|
||||
@@ -145,25 +158,10 @@ export default {
|
||||
hide_calendar: {
|
||||
get () { return this.settings.hide_calendar },
|
||||
set (value) { this.setSetting({ key: 'hide_calendar', value }) }
|
||||
},
|
||||
// 'colors[0]': {
|
||||
// get () {
|
||||
// return this.settings['theme.colors'] || [0, 0]
|
||||
// },
|
||||
// set (value) {
|
||||
// console.error(value)
|
||||
// if (!value) { return }
|
||||
// this.setSetting({ key: 'theme.primary', value })
|
||||
// if (this.settings['theme.is_dark']) {
|
||||
// this.$vuetify.theme.themes.dark.primary = value
|
||||
// } else {
|
||||
// this.$vuetify.theme.themes.light.primary = value
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['setSetting']),
|
||||
...mapActions(['setSetting', 'setLocalSetting']),
|
||||
reset () {
|
||||
this.setSetting({
|
||||
key: 'footerLinks',
|
||||
@@ -196,13 +194,16 @@ export default {
|
||||
this.setSetting({ key: 'header_image', value: null })
|
||||
.then(this.forceHeaderImageReload)
|
||||
e.stopPropagation()
|
||||
},
|
||||
updateColor (i, v) {
|
||||
this.colors[i] = v.hex
|
||||
this.$vuetify.theme.themes.dark[i] = v.hex
|
||||
},
|
||||
updateSettingColor: debounce( async function (theme, color, value) {
|
||||
const key = `${theme}_colors`
|
||||
this.setSetting({ key, value: { ...this.settings[key], [color]: value.hex } })
|
||||
}, 200),
|
||||
updateColor (theme, color, value) {
|
||||
this.$vuetify.theme.themes[theme][color] = value.hex
|
||||
this.updateSettingColor(theme, color, value)
|
||||
},
|
||||
openLinkModal () {
|
||||
// this.link = { href: '', label: '' }
|
||||
this.linkModal = true
|
||||
this.$nextTick(() => this.$refs.linkModalForm.reset())
|
||||
},
|
||||
|
||||
@@ -12,7 +12,7 @@ v-container
|
||||
//- ADD NEW USER
|
||||
v-dialog(v-model='newUserDialog' :fullscreen='$vuetify.breakpoint.xsOnly')
|
||||
|
||||
v-card(color='secondary')
|
||||
v-card
|
||||
v-card-title {{$t('common.new_user')}}
|
||||
v-card-text
|
||||
v-form(v-model='valid' ref='user_form' lazy-validation @submit.prevent='createUser')
|
||||
|
||||
Reference in New Issue
Block a user