mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-11-24 23:26:07 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,811 Commits 15 Branches 30 Tags 1.3 GiB
8a6a5cdeb3
Commit Graph

3974 Commits

Author SHA1 Message Date
Essem
8a6a5cdeb3 Fix CSP 2023-06-09 11:15:49 -05:00
ThatOneCalculator
73b2ce6f21 revert method 2023-06-08 13:27:28 -07:00
Hosted Weblate
6ca45eb6b2 chore: Merge branch 'origin/develop' into Weblate. 2023-06-08 22:20:42 +02:00
ThatOneCalculator
5f92a98596 perf: set patrons in redis 2023-06-08 13:19:46 -07:00
ThatOneCalculator
10f18f6b6b patron async computed 2023-06-08 12:51:05 -07:00
ThatOneCalculator
a527d3da1b old patrons method 2023-06-08 12:40:47 -07:00
ThatOneCalculator
141084d56c Merge branch 'patron-labels' into develop 2023-06-08 12:33:51 -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
87f17ac292 fix: unread message bgcolor 2023-06-08 11:13:45 -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
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
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
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
0fa6a40f92 feat: ✨ searchFilters meta property 2023-06-06 16:19:13 -07:00
ThatOneCalculator
755cbdee01 refactor: client assets 2023-06-06 13:03:15 -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
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
Freeplay
942f8cfded fix cw button pos... oops 2023-06-05 20:54:21 -04:00
ThatOneCalculator
6c0c0a63a8 chore: format 2023-06-05 17:27:40 -07:00
Freeplay
9424ea416b Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 20:15:21 -04:00
Freeplay
39cec25da6 fix 2023-06-05 20:15:17 -04:00
ThatOneCalculator
115f92c8d0 chore: formatting 2023-06-05 16:40:48 -07:00
Kainoa Kanter
7eeb375d6d 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
75c0b0853d fix 2023-06-05 15:08:35 -07:00
Freeplay
52c80067b2 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 18:07:53 -04:00
Freeplay
4274b7ab8c remove invalid css 2023-06-05 18:07:42 -04:00
ThatOneCalculator
1a0efbecda dep: down typeorm 2023-06-05 15:02:59 -07:00