heartles
/
egirlskey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity
25,978 Commits 2 Branches 0 Tags 153 MiB
Commit Graph

25978 Commits

Author SHA1 Message Date
Amelia Yukii 15f3c046d1 Update docker-compose_example.yml 2024-02-01 14:42:19 +00:00
Amelia Yukii 01d695428a Revert "build stable with stable tag" 
This reverts commit acf3e3460f
 2024-02-01 14:15:10 +00:00
Amelia Yukii acf3e3460f build stable with stable tag 2024-02-01 14:00:56 +00:00
Amelia Yukii 4c8116859c Revert "Merge branch 'cherry-pick-3b2d47b1' into 'stable'" 
This reverts merge request !386
 2024-02-01 13:55:44 +00:00
Amelia Yukii 0e13397db7 Merge branch 'cherry-pick-3b2d47b1' into 'stable' 
build stable with stable tag

See merge request TransFem-org/Sharkey!386
 2024-02-01 13:41:34 +00:00
Amelia Yukii ad8818508f Update file .gitlab-ci.yml 
(cherry picked from commit 3b2d47b1e39f9ff5a3bb47ca5f4abbc85fee7944)
 2024-02-01 13:38:19 +00:00
Amelia Yukii d444ee662f Merge branch 'cherry-pick-522ab39d' into 'stable' 
Merge branch 'gitlab-ci' into 'develop'

See merge request TransFem-org/Sharkey!383
 2024-02-01 10:23:23 +00:00
Amelia Yukii 4c354fff2d Merge branch 'gitlab-ci' into 'develop' 2024-02-01 10:23:23 +00:00
Marie b81448edf6 merge: release 2023.12.0 2023-12-31 23:19:41 +01:00
Marie 134d2895f0 fix: merge conflict 2023-12-31 23:11:15 +01:00
Marie 7ba8fde9b9 chore: change version 2023-12-31 22:49:43 +01:00
Marie 1805150533 fix: visibility check on masto import 
Originally from PR #288
 2023-12-31 22:41:35 +01:00
Marie 6a46e30f67
chore: fix icons 2023-12-31 22:26:46 +01:00
Marie ce6fadf767 fix: broken icon in emoji picker 2023-12-31 22:17:40 +01:00
Marie 57e9359e5d merge: (probably) fix line length between note and 1st reply (#287) 
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/287
 2023-12-31 22:08:38 +01:00
dakkar f42e2bacd4 (probably) fix line length between note and 1st reply 2023-12-31 20:56:16 +00:00
Marie 8e02d7f364
upd: add rosepine and rosepine dawn as preinstalle themes 2023-12-31 20:14:22 +01:00
Marie 049129fabe
chore: translate some japanese to english 2023-12-31 20:02:31 +01:00
Marie 49885504b9 merge: fix: sort multiple config files (#285) 2023-12-31 19:49:06 +01:00
dakkar 8bc77072cb fix: sort multiple config files 
`globSync` doesn't guarantee the order in which it returns the
matching paths, so without the `sort()`, the config files may be
merged differently each time the server is started
 2023-12-31 18:44:53 +00:00
Marie 7b04c6ade4
fix: make real-time update work with new notes/show changes 2023-12-31 19:29:26 +01:00
Marie 4f2fa60a72 merge: bugfix auth-fetch ask to never cache responses (#284) 
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/284
 2023-12-31 19:24:29 +01:00
Marie 3ec00398a3
fix: security with notes/show endpoint 2023-12-31 19:21:59 +01:00
Marie 233eff48f3 merge: pleroma note import - Use hashed filename for exists check (#283) 
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/283
 2023-12-31 18:43:38 +01:00
Marie 8336b6c6b4
upd: check for replies length 2023-12-31 18:41:29 +01:00
Marie b1c26201ca
upd: Note Length customization 
note length is now configurable through the config file

Closes #281

falls back to 3000 (misskey default) if not used/included in config
 2023-12-31 18:22:02 +01:00
Marie 031d748d0c fix: /oauth/oauth to /oauth 2023-12-31 17:25:38 +01:00
dakkar 61c193c08f lint 2023-12-31 16:17:45 +00:00
smitten 8d6d5923da
Simplify hash steps 2023-12-31 11:14:41 -05:00
Insert5StarName 2b06b822ac
fix: detailed view being dashed 2023-12-31 15:55:00 +01:00
smitten 327694d4cf
Use base64url digest 2023-12-31 09:13:51 -05:00
smitten e9428a5a05
Use hex digest 2023-12-31 09:03:46 -05:00
dakkar 6d5d3d9ea1 auth-fetch: ask to never cache responses 
I could have factored out all the lines that set cache headers, but
that would have made future merges even more complicated ☹

thanks ShittyCopper for reporting the problem!
 2023-12-31 13:27:38 +00:00
Marie 97dea59e49 merge: enhance module player hide pattern when not needed (#282) 2023-12-31 06:42:13 +01:00
Marie b700fadbe3 upd: add home as a visibility for mastodon imports 2023-12-31 06:32:39 +01:00
Marie 07f06d7ed6 fix: if condition 2023-12-31 04:09:44 +01:00
Marie fc6581b948 fix: correct followers visibility on import 2023-12-31 03:50:05 +01:00
Marie 667daebb79 upd: prevent vanilla mastodon imports from importing DMs 
Also adds the visibility function to mastodon imports
 2023-12-31 03:48:51 +01:00
smitten 0bb0d69543
Use hashed filename for exists check 2023-12-30 20:44:31 -05:00
Marie 265bcf54b0
upd: remove collapsed mentions 
Glitchy/Broken CSS - Won't get any fixes by free so it is best to just undo the change

Closes #279
Closes #278
 2023-12-30 23:14:00 +01:00
Vavency 386e4f2665 fix: lint MkModPlayer 2023-12-30 21:07:24 +02:00
Marie 8d28c16ee1
fix: bring back default like setting 
Seems like due to misskey deleting reaction.vue and making it a new file called emoji-picker.vue caused the default like setting to vanish
 2023-12-30 18:05:09 +01:00
Vavency 4856b019ce enhance (frontend): hide module player pattern display 2023-12-30 16:09:46 +02:00
vavency 1cf52ca894 Merge pull request 'develop' (#1) from Sharkey/Sharkey:develop into develop 
Reviewed-on: https://git.joinsharkey.org/vavency/Sharkey/pulls/1
 2023-12-30 09:33:41 +01:00
Marie 276f4967bc chore: fix title on feature issue template 2023-12-30 04:42:42 +01:00
Marie 4a729a7f08 chore: add title to bug report template 2023-12-30 04:42:28 +01:00
Marie 9653a6acea chore: change feature request to yml 
Closes #271
 2023-12-30 04:41:56 +01:00
Marie adf4e9b0b8 chore: remove extra letter on "boosts" 2023-12-30 04:33:14 +01:00
Marie b1194f98d9 merge: change all "renote" to "boost" (#276) 
Closes #272
Closes #273
Closes #274
 2023-12-30 04:32:13 +01:00
Marie 947823f6ec merge: Add support for glob-syntax in the config file environment variables (#257) 
Reviewed-on: https://git.joinsharkey.org/Sharkey/Sharkey/pulls/257
 2023-12-29 22:35:05 +01:00