Commit graph

3969 commits

Author SHA1 Message Date
ThatOneCalculator
8cbfcedf92
old patrons method 2023-06-08 12:40:47 -07:00
ThatOneCalculator
f2d8882fd5
Merge branch 'patron-labels' into develop 2023-06-08 12:33:51 -07:00
ThatOneCalculator
fb71b7beff
Revert "fix logic"
This reverts commit 8734de13f1.
2023-06-08 11:35:31 -07:00
ThatOneCalculator
2945f25268
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-08 11:22:16 -07:00
ThatOneCalculator
8734de13f1
fix logic 2023-06-08 11:22:11 -07:00
Freeplay
63255b5641 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-08 14:16:06 -04:00
Freeplay
449a75319a allow scrolling from body again, keep scrollbar in widgets 2023-06-08 14:16:00 -04:00
ThatOneCalculator
9f931e6e8b
fix: unread message bgcolor 2023-06-08 11:13:45 -07:00
ThatOneCalculator
5769bdcc69
chore: formatting 2023-06-08 11:01:00 -07:00
Kainoa Kanter
1186969ee6 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
db37f2f8e0
change style 2023-06-08 17:47:21 +00:00
Kainoa Kanter
d7b3813c9a 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
4dbe74a6bd 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
cfa339a51b 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
6aa3c301e3
Attempt to split column scrolling 2023-06-08 10:06:22 -05:00
naskya
f4bf5cc447
feat: channel column in deck view 2023-06-08 13:29:19 +00:00
naskya
91190244fb
change note menu order 2023-06-08 19:02:50 +09:00
Konni (im Schloss)
2d8ad9389c fixes #10284, fixes #10208; passing in all pugVariables needed in base.pug, fixes csp 2023-06-07 20:35:24 +02:00
Namekuji
ab9b9e5bff
fix inbox stall 2023-06-07 10:01:16 -04:00
ThatOneCalculator
e13af49118
dont lint in format 2023-06-06 21:02:02 -07:00
ThatOneCalculator
ca5ae3a4c9
chore: lint sw 2023-06-06 21:01:28 -07:00
ThatOneCalculator
90c0e4e9ed
allow iframes for notes 2023-06-06 21:00:16 -07:00
ThatOneCalculator
abe8474883
fix server metric iteration 2023-06-06 19:10:43 -07:00
ThatOneCalculator
23d59b634b
fix: only show meili in metrics if available 2023-06-06 19:08:41 -07:00
ThatOneCalculator
0c5be99d77
perf: limit number of antennas 2023-06-06 18:47:06 -07:00
ThatOneCalculator
6825595bdc
feat: patron labels 2023-06-06 18:43:05 -07:00
ThatOneCalculator
eda82780de
feat: searchFilters meta property 2023-06-06 16:19:13 -07:00
ThatOneCalculator
047e923660
refactor: client assets 2023-06-06 13:03:15 -07:00
ThatOneCalculator
349411ac76
typo 2023-06-06 12:16:49 -07:00
ThatOneCalculator
f621e58efa
fix: post editing meta 2023-06-06 12:11:15 -07:00
CaffeeLake
cb8f1617c7
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
c5a0c01e4e
Revert "chore: formatting"
This reverts commit 36283b9a35.
2023-06-05 21:15:49 -07:00
ThatOneCalculator
9bd03cc92e
update cargo.lock 2023-06-05 18:55:27 -07:00
ThatOneCalculator
5483dd567f
Don't ignore Cargo.lock 2023-06-05 18:49:27 -07:00
Freeplay
bea409b4fa Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 20:54:25 -04:00
Freeplay
747a71ddc4 fix cw button pos... oops 2023-06-05 20:54:21 -04:00
ThatOneCalculator
ed674f2dac
chore: format 2023-06-05 17:27:40 -07:00
Freeplay
96b6c433c8 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 20:15:21 -04:00
Freeplay
6bddeac975 fix 2023-06-05 20:15:17 -04:00
ThatOneCalculator
36283b9a35
chore: formatting 2023-06-05 16:40:48 -07:00
Kainoa Kanter
5b73351e80 Merge pull request '[PR]: Add delay to MFM' (#10248) from Freeplay/calckey:mfm into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10248
2023-06-05 22:38:33 +00:00
ThatOneCalculator
c664d7da08
fix 2023-06-05 15:08:35 -07:00
Freeplay
035d6660be Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 18:07:53 -04:00
Freeplay
63798dd4b7 remove invalid css 2023-06-05 18:07:42 -04:00
ThatOneCalculator
a018bfca9a
dep: down typeorm 2023-06-05 15:02:59 -07:00
ThatOneCalculator
4f16bdea78
chore: ⬆️ up deps 2023-06-05 14:54:43 -07:00
Kainoa Kanter
a60cb874c1 Merge pull request '[PR]: Meilisearch Stop-Words' (#10261) from PrivateGER/calckey:feat/meilisearch-stop-words into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10261
2023-06-05 21:39:31 +00:00
Kainoa Kanter
c32d26e6c7 Merge pull request '[PR]: Fix database connection URL' (#10263) from nmkj/calckey:fix-database-url into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10263
2023-06-05 21:36:48 +00:00
Freeplay
9382afeb5e comment out easing part for now 2023-06-05 15:28:42 -04:00
Freeplay
6f1bdf79cd fix collapsed height 2023-06-05 15:07:04 -04:00