e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity
24800 commits 4 branches 0 tags 373 MiB
Commit graph

24800 commits

This branch
This branch
All branches
Author SHA1 Message Date
ThatOneCalculator c980920094
chore: update patrons 2023-06-08 12:33:16 -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 73ff326ca9
dev46 2023-06-08 11:14:01 -07:00
ThatOneCalculator 9f931e6e8b
fix: unread message bgcolor 2023-06-08 11:13:45 -07:00
ThatOneCalculator 5d3abfcb98
Close #10280 2023-06-08 11:03:39 -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
Hosted Weblate 2c39e99875
chore: Merge branch 'origin/develop' into Weblate. 2023-06-08 18:52:59 +02:00
Namekuji 6ab48c947e
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 ed34d62eff
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 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
Kainoa Kanter bf78733da4 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) 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
Kainoa Kanter f49f8bf8f7 chore: update patrons 2023-06-07 06:55:24 +00:00
Kainoa Kanter 4d9457ec6a chore: update patrons 2023-06-07 04:46:35 +00: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 71d4f5d516
chore: update patrons 2023-06-06 16:54:41 -07:00
ThatOneCalculator eda82780de
feat: ✨ searchFilters meta property 2023-06-06 16:19:13 -07:00
ThatOneCalculator 8bd8c7532b
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-06 13:27:53 -07:00
ThatOneCalculator 75f9831d46
Merge remote-tracking branch 'weblate/develop' into develop 2023-06-06 13:27:30 -07:00
Kainoa Kanter 7dfc94b2c1 Update 'issue_template/bug.yaml' 2023-06-06 20:17:56 +00:00
Kainoa Kanter 7e9abc9b1c Update 'issue_template/feature.yaml' 2023-06-06 20:17:31 +00:00
ThatOneCalculator 047e923660
refactor: client assets 2023-06-06 13:03:15 -07:00
ThatOneCalculator 1e58e4ce69
fix: editing caption accuracy 2023-06-06 13:03:09 -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
Namekuji 3ca1f31c82
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 84506b606d 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 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