Jeremy Kescher
9b59f9c652
Bump Catstodon rev to 1.0.6
2024-02-25 18:16:38 +01:00
Jeremy Kescher
8f8cb0fad3
Merge branch 'glitch-soc' into develop
2024-02-24 17:51:18 +01:00
Jeremy Kescher
78b0f1c6cb
Bump version
2024-02-24 14:06:52 +01:00
Jeremy Kescher
206de12616
Bump Catstodon version
2024-02-24 11:17:01 +01:00
Jeremy Kescher
c2721d5129
Bump Catstodon revision to 1.0.2
2024-02-17 18:56:19 +01:00
Jeremy Kescher
05a5c20681
Merge branch 'glitch-soc' into develop
2024-02-17 18:16:14 +01:00
Jeremy Kescher
6d6a5561f8
Catstodon rev reset due to upstream version bump
2024-02-16 14:49:21 +01:00
Jeremy Kescher
ce878a78bb
Merge branch 'glitch-soc' into develop
2024-02-16 14:48:08 +01:00
Claire
d7d477047e
Bump version to v4.3.0-alpha.3 ( #29241 )
2024-02-16 12:17:15 +01:00
Jeremy Kescher
f044841a6e
Catstodon rev +1.0.18
2024-02-14 18:03:42 +01:00
Jeremy Kescher
1c9291adcd
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
2024-02-14 18:02:38 +01:00
Claire
40439399c6
Bump version to v4.3.0-alpha.2 ( #29200 )
2024-02-14 15:26:18 +01:00
Jeremy Kescher
924912bf9b
Catstodon rev +1.0.17
2024-02-11 17:26:45 +01:00
Jeremy Kescher
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +01:00
Jeremy Kescher
c7e37c256e
Merge branch 'glitch-soc' into develop
2024-02-01 18:18:19 +01:00
Claire
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:57:08 +01:00
Jeremy Kescher
2609f2bcbd
Bump to +1.0.14
2024-01-28 17:58:28 +01:00
Essem
ae854b8027
Port three new emoji reaction PR commits to Catstodon:
...
"Update reaction emails
Reaction icon made by @t3rminus@calamity.world"
"Simplify reactions API controller"
"Refactor status reactions query
This was done to announcement reactions in 1b0cb3b54d
2024-01-28 02:22:43 +01:00
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
