Commit graph

24901 commits

Author SHA1 Message Date
ThatOneCalculator
98623c2d54 chore: update patrons 2023-06-08 12:33:16 -07:00
ThatOneCalculator
8be5bfb4f7 Revert "fix logic"
This reverts commit 8734de13f12a5ad67c631b75b4b9d49ebb2e3c30.
2023-06-08 11:35:31 -07:00
ThatOneCalculator
4184768a48 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-08 11:22:16 -07:00
ThatOneCalculator
3726f6db88 fix logic 2023-06-08 11:22:11 -07:00
Freeplay
f7d70b6b52 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-08 14:16:06 -04:00
Freeplay
8d507c2de7 allow scrolling from body again, keep scrollbar in widgets 2023-06-08 14:16:00 -04:00
ThatOneCalculator
992830250f dev46 2023-06-08 11:14:01 -07:00
ThatOneCalculator
87f17ac292 fix: unread message bgcolor 2023-06-08 11:13:45 -07:00
ThatOneCalculator
d6d2a6fd78 Close #10280 2023-06-08 11:03:39 -07:00
ThatOneCalculator
ebcc50634b chore: formatting 2023-06-08 11:01:00 -07:00
Kainoa Kanter
7fdab88743 Merge pull request '[PR]: Improve the order of note menu items' (#10290) from naskya/calckey:chore/note-menu-order into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10290
2023-06-08 17:53:32 +00:00
naskya
81647316bc change style 2023-06-08 17:47:21 +00:00
Hosted Weblate
48f305f4c1 chore: Merge branch 'origin/develop' into Weblate. 2023-06-08 18:52:59 +02:00
Namekuji
6339ba5eb6 chore: Translated using Weblate (Japanese)
Currently translated at 100.0% (1770 of 1770 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/
2023-06-08 18:52:58 +02:00
jolupa
1f8eefee6b chore: Translated using Weblate (Catalan)
Currently translated at 100.0% (1770 of 1770 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
2023-06-08 18:52:56 +02:00
Kainoa Kanter
774acab36c Merge pull request '[PR]: feat: channel column in deck view' (#10291) from naskya/calckey:feat/deck-channel-column into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10291
2023-06-08 16:52:43 +00:00
Kainoa Kanter
c34118eaf8 Merge pull request '[PR]: Split content/sidebar scrolling on default/centered views' (#10292) from esm/calckey:fix/column-scroll-split into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10292
2023-06-08 16:46:42 +00:00
Kainoa Kanter
d769a1fc23 Merge pull request '[PR]: fix: take invalid expiresAt of polls as null' (#10279) from nmkj/calckey:fix-poll-expire into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10279
2023-06-08 16:46:14 +00:00
Essem
6c447c94e8 Attempt to split column scrolling 2023-06-08 10:06:22 -05:00
naskya
175d727629 feat: channel column in deck view 2023-06-08 13:29:19 +00:00
naskya
37d5d98710 change note menu order 2023-06-08 19:02:50 +09:00
Kainoa Kanter
71ca665aba Merge pull request '[PR]: Fixes #10284 and Fixes #10208; Allows Custom MOTD and Splash Icons on all pages, by passing in variables more consistantly - fixes a CSP issue preventing the site from loading' (#10285) from kartonrad/calckey:fix-motd-and-csp into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10285
2023-06-07 18:50:55 +00:00
Konni (im Schloss)
1e54de1cba fixes #10284, fixes #10208; passing in all pugVariables needed in base.pug, fixes csp 2023-06-07 20:35:24 +02:00
Namekuji
40267c1116 fix inbox stall 2023-06-07 10:01:16 -04:00
Kainoa Kanter
3f4edef901 chore: update patrons 2023-06-07 06:55:24 +00:00
Kainoa Kanter
572f729145 chore: update patrons 2023-06-07 04:46:35 +00:00
ThatOneCalculator
d190df6dbd dont lint in format 2023-06-06 21:02:02 -07:00
ThatOneCalculator
fb19cea0ba chore: lint sw 2023-06-06 21:01:28 -07:00
ThatOneCalculator
aae5190186 allow iframes for notes 2023-06-06 21:00:16 -07:00
ThatOneCalculator
eddc051d9f fix server metric iteration 2023-06-06 19:10:43 -07:00
ThatOneCalculator
f2d9db74c2 fix: only show meili in metrics if available 2023-06-06 19:08:41 -07:00
ThatOneCalculator
dae4461402 perf: limit number of antennas 2023-06-06 18:47:06 -07:00
ThatOneCalculator
9c9a9ee261 feat: patron labels 2023-06-06 18:43:05 -07:00
ThatOneCalculator
788d54af6f chore: update patrons 2023-06-06 16:54:41 -07:00
ThatOneCalculator
0fa6a40f92 feat: searchFilters meta property 2023-06-06 16:19:13 -07:00
ThatOneCalculator
398eede55d Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-06 13:27:53 -07:00
ThatOneCalculator
915540c4f3 Merge remote-tracking branch 'weblate/develop' into develop 2023-06-06 13:27:30 -07:00
Kainoa Kanter
1d09a06605 Update 'issue_template/bug.yaml' 2023-06-06 20:17:56 +00:00
Kainoa Kanter
bd91c771c7 Update 'issue_template/feature.yaml' 2023-06-06 20:17:31 +00:00
ThatOneCalculator
755cbdee01 refactor: client assets 2023-06-06 13:03:15 -07:00
ThatOneCalculator
a0671d47a8 fix: editing caption accuracy 2023-06-06 13:03:09 -07:00
ThatOneCalculator
042780993c typo 2023-06-06 12:16:49 -07:00
ThatOneCalculator
95bb9e1f73 fix: post editing meta 2023-06-06 12:11:15 -07:00
Namekuji
34fab127f2 chore: Translated using Weblate (Japanese)
Currently translated at 100.0% (1753 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/
2023-06-06 18:41:10 +02:00
Kainoa Kanter
198b3b66ef Merge pull request '[PR]: fix: JSON5.parse error' (#10272) from nmkj/calckey:fix-json5 into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10272
2023-06-06 16:39:51 +00:00
CaffeeLake
26aff7a651 Fix: #10955 TypeError: JSON5.parse is not a function (#10956)
* Fix: JSON5.parse is not a function

* update changelog

* update chglog

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2023-06-06 04:32:22 -04:00
ThatOneCalculator
a3415159be Revert "chore: formatting"
This reverts commit 36283b9a358886bfcf6f40c04b5bed1fe6088ff5.
2023-06-05 21:15:49 -07:00
ThatOneCalculator
67db43e721 update cargo.lock 2023-06-05 18:55:27 -07:00
ThatOneCalculator
b4d5b13e6e Don't ignore Cargo.lock 2023-06-05 18:49:27 -07:00
Freeplay
9fa5f957de Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 20:54:25 -04:00