mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-22 18:48:06 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,806 Commits 15 Branches 30 Tags 1.3 GiB
08d2be6839
Commit Graph

3957 Commits

Author SHA1 Message Date
ThatOneCalculator
28b33022e7 Merge branch 'develop' into beta 2023-06-06 12:17:30 -07:00
ThatOneCalculator
042780993c typo 2023-06-06 12:16:49 -07:00
ThatOneCalculator
b87b90ec40 Merge branch 'develop' into beta 2023-06-06 12:11:37 -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
ccfa52c2b3 Merge branch 'develop' into beta 2023-06-05 21:20:41 -07:00
ThatOneCalculator
a3415159be Revert "chore: formatting" 
This reverts commit 36283b9a358886bfcf6f40c04b5bed1fe6088ff5.
 2023-06-05 21:15:49 -07:00
ThatOneCalculator
6b375de276 Merge branch 'develop' into beta 2023-06-05 18:56:05 -07:00
ThatOneCalculator
67db43e721 update cargo.lock 2023-06-05 18:55:27 -07:00
ThatOneCalculator
377f541912 Merge branch 'develop' into beta 2023-06-05 18:51:10 -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
7f5f4b91a1 Merge branch 'develop' into beta 2023-06-05 17:34:27 -07: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
35ebb712ec Merge branch 'develop' into beta 2023-06-05 17:11:55 -07: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
ThatOneCalculator
f4ad58984b chore: ⬆️ up deps 2023-06-05 14:54:43 -07:00
Kainoa Kanter
18b5c3f902 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
67e3d5de79 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
da5b199e6c comment out easing part for now 2023-06-05 15:28:42 -04:00
Freeplay
8eb589a377 fix collapsed height 2023-06-05 15:07:04 -04:00
Freeplay
60914d8d26 Better post clipping 2023-06-05 13:11:14 -04:00
Namekuji
e2d4aaa002 escape database password as it may contain special characters 2023-06-05 11:59:45 -04:00
Freeplay
9cda7e8a71 the better way of doing advanced MFM™ 2023-06-05 11:55:21 -04:00
Freeplay
39a496b838 fix in cheat sheet also, I've realized I will need to do it a different at some point but this works for now. 2023-06-05 11:41:56 -04:00
Freeplay
fbaade84f4 Fix animated MFM not playing in posting form preview 2023-06-05 11:33:48 -04:00
Freeplay
b42805d51a center-align navbar icons 2023-06-04 18:16:54 -04:00
Freeplay
8bc7cb358c Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-04 17:52:49 -04:00
Freeplay
37156d236f Prevent newly-made unlisted posts from showing in antennas 2023-06-04 17:52:44 -04:00
Kainoa Kanter
b8e30e4885 Merge pull request '[PR]: Fix docker' (#10259) from nmkj/calckey:fix-docker into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10259
 2023-06-04 21:48:39 +00:00
ThatOneCalculator
cb3649eef5 chore: formatting 2023-06-04 14:42:22 -07:00
ThatOneCalculator
aca3416e12 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-04 14:41:30 -07:00
ThatOneCalculator
9b60d30bc4 fix: 🐛 prevent null date insertion 
https://calckey.aokaga.work/notes/9f6ksv2oov
 2023-06-04 14:41:18 -07:00
Namekuji
175cb184d3 add rust to the runtime container for migrations 2023-06-04 16:29:24 -04:00
Freeplay
7b3a3f506a fix background of mentions 2023-06-04 16:29:12 -04:00
Freeplay
c9cfe9f9f8 header spacing 2023-06-04 16:05:06 -04:00
Freeplay
e23dc68ac9 i18n to more button in navbar 2023-06-04 15:46:11 -04:00
Freeplay
70e8aea389 'clip' to 'clips' #10255 2023-06-04 15:39:23 -04:00
Freeplay
2dc7d11166 preload antennas & lists 2023-06-04 15:31:42 -04:00
ThatOneCalculator
c964313d54 chore: format 2023-06-04 12:02:34 -07:00
Kainoa Kanter
1ae1400a64 Merge pull request '[PR]: Add advanced MFM toggle' (#10254) from Freeplay/calckey:advanced-mfm into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10254
 2023-06-04 18:59:56 +00:00
Talon
56b7ef35d5 Merge branch 'develop' into fix/more-accessibility 2023-06-04 12:41:40 +02:00