Jeremy Kescher
93ae46fa14
Merge branch 'glitch-soc' into develop
2024-01-18 22:59:27 +01:00
Jeremy Kescher
16be9e975b
Remove local account check in like and emoji_react inbound activity handling
2024-01-18 19:46:29 +01:00
Jeremy Kescher
d06ea73a04
Bump version
2024-01-17 22:41:16 +01:00
Jeremy Kescher
777be10810
Merge branch 'glitch-soc' into develop
2024-01-14 19:46:03 +01:00
Jeremy Kescher
2047683539
v4.3.0-alpha.0+glitch+cat+1.0.8
2024-01-14 17:48:42 +01:00
Jeremy Kescher
bfda2d7bc4
v4.3.0-alpha.0+glitch+cat+1.0.7
2024-01-14 03:58:49 +01:00
Jeremy Kescher
3df2bc2caf
v4.3.0-alpha.0+glitch+cat+1.0.6
2024-01-13 17:46:55 +01:00
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5
2024-01-12 22:03:50 +01:00
Jeremy Kescher
adc45c99d7
v4.3.0+1.0.4
2024-01-07 20:11:03 +01:00
Jeremy Kescher
3b9a52aab6
Merge branch 'glitch-soc' into develop
2024-01-04 17:57:02 +01:00
Jeremy Kescher
abb21a1eab
Merge branch 'glitch-soc' into develop
2024-01-04 17:30:03 +01:00
Jeremy Kescher
42520e72c5
Remove duplicate "Number of visible reactions" setting
2024-01-03 17:55:12 +01:00
Jeremy Kescher
981fd44683
v4.3.0+1.0.0
2024-01-02 19:11:50 +01:00
Jeremy Kescher
5be3fb3d66
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
2024-01-02 12:16:35 +01:00
Claire
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
Claire
f0c720cfc9
Bump version to v4.3.0-alpha.0 ( #27022 )
2023-09-28 13:40:43 +02:00
Claire
86ec1e833e
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-21 16:56:09 +02:00
Claire
4fcc026f0f
Bump version to v4.2.0 ( #27017 )
2023-09-21 16:51:32 +02:00
Claire
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
Claire
f4b780ba22
Bump version to v4.2.0-rc2 ( #26974 )
2023-09-19 17:04:23 +02:00
Claire
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
Claire
b90383d073
Bump version to v4.2.0-rc1 ( #26916 )
2023-09-14 18:46:00 +02:00
Jeong Arm
97f3d7b662
Fix Version metadata have trailing dot ( #2403 )
2023-09-13 08:47:39 +02:00
Claire
87b5f84625
Merge commit 'f80f426c57d5a5e1d289372ef7c323741d27c768' into glitch-soc/merge-upstream
2023-09-05 08:14:52 +02:00
Claire
f80f426c57
Bump version to v4.2.0-beta3 ( #26753 )
2023-09-04 21:20:20 +02:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
3c7dbf3a16
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream changed how the version string is built from environment variables.
Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Claire
f39847476c
Change the pre-release versioning scheme and associated environment variables ( #26653 )
2023-08-25 18:26:44 +02:00
Claire
941a9df28a
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
2023-08-24 21:56:00 +02:00
Claire
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Jaehong Kang
2dbbeedc94
Fix: Workaround to load MASTODON_VERSION_* in Docker. ( #26591 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 13:07:27 +02:00
Claire
facfec1ba3
Bump version to v4.2.0-beta2 ( #26579 )
2023-08-21 20:18:49 +02:00
Claire
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
Claire
44a5f1b64a
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
Claire
dab54ccbba
Prepare v4.2.0-beta1 ( #26339 )
2023-08-08 16:12:12 +02:00
Claire
51768de16e
Bump version to v4.1.6 ( #26272 )
2023-07-31 21:11:25 +02:00
Claire
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
Claire
f2c683336b
Bump version to v4.1.5 ( #26108 )
2023-07-21 21:23:14 +02:00
Jeremy Kescher
037fcd9d31
Merge branch 'glitch-soc' into develop
2023-07-07 22:05:28 +02:00
Claire
b9aa228c54
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
2023-07-07 19:59:43 +02:00
Claire
0051128387
Bump version to v4.1.4 ( #25805 )
2023-07-07 19:42:03 +02:00
Local User
0527458f38
Merge branch 'upstream/main' into develop
2023-07-07 01:25:26 +02:00
Claire
ff7aae3037
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
Claire
5e1752ce3f
Bump version to v4.1.3 ( #25757 )
2023-07-06 15:14:42 +02:00
Jeremy Kescher
2bcce397a9
Bump version
2023-05-27 15:06:05 +02:00
Jeremy Kescher
f158fb7151
ReactionsController: Don't check for status reaction existence in destroy
...
UnreactService checks for its existence in the background anyway, so remove redundant checks.
2023-05-11 13:45:14 +02:00
Jeremy Kescher
4252c6fe1e
Revert "Redo StatusReaction set_custom_emoji to be similar to AnnouncementReaction"
...
This reverts commit b8774d3b5d
2023-05-11 12:39:24 +02:00
Jeremy Kescher
0a67076fa9
Bump version
2023-05-10 21:12:23 +02:00
Jeremy Kescher
9fe04326ea
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# config/routes.rb
# db/schema.rb
# lib/mastodon/version.rb
2023-05-09 23:26:00 +02:00
