Compare commits

...

109 Commits

Author SHA1 Message Date
asonix ba9c861116 Merge pull request 'v4.2.7' (#64) from asonix/changes into asonix/downstream
Reviewed-on: #64
2024-02-16 15:16:31 +00:00
asonix 69f27dc032 Merge pull request 'v4.2.6' (#61) from asonix/changes into asonix/downstream
Reviewed-on: #61
2024-02-14 16:38:21 +00:00
asonix 89cfbcdd7f Merge pull request 'v4.2.5' (#58) from asonix/changes into asonix/downstream
Reviewed-on: #58
2024-02-01 15:25:17 +00:00
asonix 294328b682 Merge pull request 'v4.2.4' (#55) from asonix/changes into asonix/downstream
Reviewed-on: #55
2024-01-29 19:44:09 +00:00
asonix 90228edc2f Merge pull request 'v4.2.3' (#53) from asonix/changes into asonix/downstream
Reviewed-on: #53
2023-12-05 18:39:31 +00:00
asonix 93c5b81807 Merge pull request 'v4.2.2' (#49) from asonix/changes into asonix/downstream
Reviewed-on: #49
2023-12-04 19:33:41 +00:00
asonix 3345fefe7f Merge branch 'asonix/changes' into asonix/downstream 2023-12-01 16:21:55 -06:00
asonix e3585c39ec Merge branch 'asonix/changes' into asonix/downstream 2023-12-01 16:13:43 -06:00
asonix 2012081e52 Merge pull request 'v4.2.1' (#44) from asonix/changes into asonix/downstream
Reviewed-on: #44
2023-10-11 17:21:26 +00:00
asonix c499a6798c Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 18:26:21 -05:00
asonix 9c6af750d6 Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 17:52:17 -05:00
asonix 98a7ed1a53 Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 16:59:03 -05:00
asonix 9f6d4a0814 Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 15:36:32 -05:00
asonix 4d82b91f87 Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 14:56:51 -05:00
asonix 51d7132aed Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 14:15:29 -05:00
asonix 8f373391b0 Merge pull request 'v4.1.9' (#38) from asonix/changes into asonix/downstream
Reviewed-on: #38
2023-09-20 16:21:36 +00:00
asonix 7dfe02d92e Merge pull request 'v4.1.8' (#35) from asonix/changes into asonix/downstream
Reviewed-on: #35
2023-09-19 15:28:24 +00:00
asonix 518aa0c2ef Merge pull request 'v4.1.7' (#32) from asonix/changes into asonix/downstream
Reviewed-on: #32
2023-09-05 20:07:08 +00:00
asonix 08c489ca61 Merge branch 'asonix/changes' into asonix/downstream 2023-08-03 17:50:44 -05:00
asonix 4d7ba6f50f Merge pull request 'v4.1.6' (#29) from asonix/changes into asonix/downstream
Reviewed-on: #29
2023-07-31 17:24:55 +00:00
asonix 5b0913e630 Merge pull request 'v4.1.5' (#26) from asonix/changes into asonix/downstream
Reviewed-on: #26
2023-07-23 23:37:37 +00:00
asonix 67e2d1f30f Merge pull request 'v4.1.4' (#23) from asonix/changes into asonix/downstream
Reviewed-on: #23
2023-07-07 19:55:20 +00:00
asonix 67dfe763e5 Merge pull request 'increase character limit to 2k' (#20) from asonix/changes into asonix/downstream
Reviewed-on: #20
2023-07-06 15:34:54 +00:00
asonix 122808125c Merge pull request 'v4.1.3' (#17) from asonix/changes into asonix/downstream
Reviewed-on: #17
2023-07-06 14:30:57 +00:00
asonix 375a6ce6e9 Merge branch 'asonix/changes' into asonix/downstream 2023-04-06 15:58:11 -05:00
asonix 6c5e3f5eeb Merge branch 'asonix/changes' into asonix/downstream 2023-02-11 12:41:36 -06:00
asonix 76ce904908 Merge branch 'asonix/changes' into asonix/downstream 2023-01-09 15:13:30 -06:00
asonix c699d525e7 Update docker stuff for testing 2022-12-20 19:32:34 -06:00
asonix 5d013631e5 Clean up languages, make them work 2022-12-20 19:32:00 -06:00
asonix 700b08a00c Merge branch 'asonix/changes' into asonix/downstream 2022-12-20 14:13:30 -06:00
asonix 5004bafbc3 Merge branch 'asonix/changes' into asonix/downstream 2022-11-29 18:34:53 -06:00
asonix 66348a04d1 Merge pull request 'asonix/changes' (#11) from asonix/changes into asonix/downstream
Reviewed-on: #11
2022-11-15 15:16:14 +00:00
asonix 7884b4bf79 Merge branch 'asonix/changes' into asonix/downstream 2022-11-14 17:15:52 -06:00
asonix 8b6361a3ec Merge branch 'asonix/changes' into asonix/downstream 2022-11-14 15:22:57 -06:00
asonix d2b7c25ff6 Merge branch 'asonix/changes' into asonix/downstream 2022-11-14 10:55:04 -06:00
asonix 6759fb86de Update branding 2022-11-13 14:21:28 -06:00
asonix f2cdf1ab92 Replace logo.svg 2022-11-13 13:11:55 -06:00
asonix 0f436aa237 Merge branch 'asonix/changes' into asonix/downstream 2022-11-13 11:25:01 -06:00
asonix 1fe6641095 Merge branch 'asonix/changes' into asonix/downstream 2022-11-11 15:36:31 -06:00
asonix 13ea32fbcd Merge branch 'asonix/changes' into asonix/downstream 2022-11-06 12:40:00 -06:00
Aode (Lion) d486ba6299 Merge branch 'asonix/changes' into asonix/downstream 2022-05-13 12:23:34 -05:00
Aode (lion) 15e41546d5 Merge branch 'asonix/changes' into asonix/downstream 2022-04-08 16:17:33 -05:00
Aode (lion) 7e70435c1e Merge branch 'asonix/changes' into asonix/downstream 2022-03-31 11:35:20 -05:00
Aode (Lion) f5922e3fbd Merge branch 'asonix/changes' into asonix/downstream 2022-03-30 18:59:56 -05:00
Aode (lion) a6077abce1 Merge branch 'asonix/changes' into asonix/downstream 2022-02-03 09:07:47 -06:00
Aode (lion) 9da48d0d4d Merge branch 'asonix/changes' into asonix/downstream 2022-01-31 17:58:23 -06:00
asonix bd7f75c92d Merge branch 'v3.4.1-branch' into asonix/downstream 2021-06-19 17:03:58 -05:00
asonix e3109aa51c Merge branch 'v3.3.0-branch' into asonix/downstream 2020-12-27 11:08:28 -06:00
asonix f2aae81832 Update locales 2020-12-27 10:55:11 -06:00
asonix 77754862f1 Merge branch 'asonix/changes' into v3.3.0-branch 2020-12-27 10:03:33 -06:00
asonix b610dc8473 Merge branch 'v3.2.0-branch' into asonix/downstream 2020-07-28 09:37:49 -05:00
asonix ccba40a390 Update translations 2020-07-28 09:29:43 -05:00
asonix 1e6525b5bc Merge branch 'asonix/changes' into v3.2.0-branch 2020-07-28 09:14:51 -05:00
asonix 646be35f8f Merge branch 'v3.1.4-branch' into asonix/downstream 2020-05-19 11:17:01 -05:00
asonix db2a862047 Merge branch 'v3.1.3-branch' into asonix/downstream 2020-04-08 19:45:23 -05:00
asonix 836c4e8588 Merge branch 'asonix/changes' into asonix/downstream 2020-03-03 15:42:46 -06:00
Aode 7fb72fcb78 Reset to upstream's docker 2020-03-03 10:51:01 -06:00
asonix cb0d176465 Merge branch 'v3.1.1-branch' into asonix/downstream 2020-02-10 21:35:35 -06:00
asonix 27b447be76 Merge branch 'v3.1.0rc1-branch' into v3.1.1-branch 2020-02-10 21:34:08 -06:00
asonix 8f40a2a7f8 Merge branch 'v3.1.0rc1-branch' into asonix/downstream 2020-01-29 09:03:06 -06:00
asonix e5a820e90b Fix issues 2020-01-29 09:02:23 -06:00
asonix 5c355cce4c Update to 19.10 2020-01-28 21:11:48 -06:00
asonix 4fdf5fc0ae missing & 2020-01-28 15:59:21 -06:00
asonix 9e8d82e5e3 Update Gemfile.lock 2020-01-28 15:47:48 -06:00
asonix cb5bb45912 Improve container build process 2020-01-28 15:08:16 -06:00
asonix 35ba1dbd96 Merge branch 'v3.1.0rc1-branch' into asonix/downstream 2020-01-28 13:58:20 -06:00
asonix d3a46da63b Update build process 2020-01-28 13:56:27 -06:00
asonix 982bc63d31 Merge branch 'asonix/changes' into v3.1.0rc1-branch 2020-01-28 13:31:59 -06:00
asonix 9b9272c1d6 Rename deps image, don't pull deps either 2020-01-07 13:45:28 -06:00
asonix 6d42b76fa9 Use docker 2020-01-07 13:44:49 -06:00
asonix f75b25628a Change UID 2019-10-19 19:10:29 -05:00
asonix 583b7239b5 Merge branch 'v3.0.1-branch' into asonix/downstream 2019-10-17 17:25:39 -05:00
asonix 940385d86a Merge branch 'asonix/changes' into asonix/downstream 2019-10-16 22:28:39 -05:00
asonix a8f34aa914 Merge branch 'asonix/changes' into asonix/downstream 2019-10-08 15:13:11 -05:00
asonix a5d79e3ca4 Merge branch 'asonix/changes' into asonix/downstream 2019-10-08 12:36:51 -05:00
asonix fd640a79bb Merge branch 'asonix/changes' into asonix/downstream 2019-08-10 11:36:13 -05:00
asonix d966bce81d Merge branch 'asonix/changes' into asonix/downstream 2019-07-06 09:42:19 -05:00
asonix 4752c2f5f9 Merge branch 'asonix/changes' into asonix/downstream 2019-06-23 11:38:19 -05:00
asonix fe0d90be10 Merge branch 'asonix/changes' into asonix/downstream 2019-06-14 16:26:46 -05:00
asonix c0adc4397d Merge branch 'asonix/changes' into asonix/downstream 2019-06-09 11:39:21 -05:00
asonix e44f958176 Merge branch 'asonix/changes' into asonix/downstream 2019-06-09 11:34:52 -05:00
asonix d3cfda5d03 Merge branch 'asonix/changes' into asonix/downstream 2019-06-09 11:23:43 -05:00
asonix 9f089ebf9c Merge branch 'asonix/changes' into asonix/downstream 2019-06-09 10:10:32 -05:00
asonix 670ee808e7 Merge branch 'asonix/changes' into asonix/downstream 2019-05-04 19:49:01 -05:00
asonix 15d524335d
Merge branch 'asonix/changes' into asonix/downstream 2019-04-10 20:49:33 -05:00
asonix 830a37be49
Merge branch 'asonix/changes' into asonix/downstream 2019-03-05 19:06:38 -06:00
asonix 5754c20436
Merge branch 'asonix/changes' into asonix/downstream 2019-03-05 18:32:07 -06:00
asonix 12ba679f77
Merge branch 'asonix/changes' into asonix/downstream 2019-01-20 13:00:36 -06:00
asonix 9f20a6183f
Merge branch 'asonix/changes' into asonix/downstream 2019-01-18 17:40:47 -06:00
asonix 66648bfc97
Merge branch 'asonix/changes' into asonix/downstream 2019-01-09 00:53:01 -06:00
asonix 3b1e723467
Set dog as default language 2019-01-09 00:22:30 -06:00
asonix 31e416fcfd
Merge branch 'asonix/changes' into asonix/downstream 2019-01-09 00:22:03 -06:00
asonix 1bef7bf6be
Merge branch 'asonix/changes' into asonix/downstream 2019-01-08 23:11:01 -06:00
asonix 951c2d623b
Merge branch 'asonix/changes' into asonix/downstream 2019-01-08 23:03:55 -06:00
asonix 84a2d6902f
Merge branch 'asonix/changes' into asonix/downstream 2018-12-06 13:16:47 -06:00
asonix 8e5294931e
Merge branch 'asonix/changes' into asonix/downstream 2018-11-29 10:23:48 -06:00
asonix 09bf09bbe7 Merge branch 'asonix/changes' into asonix/downstream 2018-10-30 21:08:54 -05:00
asonix 8b965f56c3 Merge branch 'asonix/changes' into asonix/downstream 2018-10-23 23:08:13 -05:00
asonix 16828887b8 Merge branch 'asonix/changes' into asonix/downstream 2018-10-13 19:17:37 -05:00
asonix f06461b48c Merge branch 'asonix/changes' into asonix/downstream 2018-10-07 22:53:36 -05:00
asonix f718a3f639 Merge branch 'asonix/changes' into asonix/downstream 2018-09-02 19:18:57 -05:00
asonix caf7625950 Merge branch 'asonix/changes' into asonix/downstream 2018-09-01 12:07:15 -05:00
asonix e85de1fcc4 Merge branch 'asonix/changes' into asonix/downstream 2018-08-26 19:25:07 -05:00
asonix 8e7a26c7de Merge branch 'asonix/changes' into asonix/downstream 2018-08-26 19:08:25 -05:00
asonix a9e0720450 Merge branch 'asonix/changes' into asonix/downstream 2018-08-25 13:17:18 -05:00
asonix 5c3ecef68b Fix settings 2018-08-24 18:59:42 -05:00
asonix c9c9c22db2 Merge branch 'asonix/changes' into asonix/downstream 2018-08-24 18:55:11 -05:00
asonix a3ba83a157 Merge branch 'asonix/changes' into asonix/downstream 2018-08-24 18:46:52 -05:00
asonix a06cdc6967 Update defaults 2018-08-24 17:55:57 -05:00
42 changed files with 7 additions and 43 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 950 B

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 810 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 10 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 477 B

After

Width:  |  Height:  |  Size: 817 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 693 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

View File

@ -189,7 +189,7 @@ module Mastodon
if config.i18n.available_locales.include?(custom_default_locale)
custom_default_locale
else
:en
:'en-DG'
end
end

View File

@ -58,8 +58,8 @@ services:
build: .
image: ghcr.io/mastodon/mastodon:v4.2.7
restart: always
env_file: .env.production
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
env_file: .env.development
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -b 0.0.0.0 -p 3000"
networks:
- external_network
- internal_network
@ -79,7 +79,7 @@ services:
build: .
image: ghcr.io/mastodon/mastodon:v4.2.7
restart: always
env_file: .env.production
env_file: .env.development
command: node ./streaming
networks:
- external_network
@ -97,7 +97,7 @@ services:
build: .
image: ghcr.io/mastodon/mastodon:v4.2.7
restart: always
env_file: .env.production
env_file: .env.development
command: bundle exec sidekiq
depends_on:
- db

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB