Commit Graph

141 Commits

Author SHA1 Message Date
Claire
f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Matt Jankowski
b231c3c1bf
Drop support for ruby 3.1 (#32363) 2024-10-31 15:12:08 +00:00
Claire
677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Sujay
a5a1584675
Update README.md (#30626) 2024-06-12 13:48:30 +00:00
Claire
be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
Matt Jankowski
28921a12fe
Update macOS local dev setup instructions (#30641) 2024-06-10 15:22:26 +00:00
Matt Jankowski
521b433933
Doc updates for Docker/devcontainers/codespace (#30582) 2024-06-07 20:18:02 +00:00
Claire
30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
Fabio Leandro Janiszevski
cd4b00810d
Clear the docker setup - Deprecate post-create.sh and use bin/setup (#30502) 2024-06-06 09:00:09 +00:00
Matt Jankowski
569b7d2f25
Clarify the purpose of separate Docker resources (#30568) 2024-06-05 23:54:59 +00:00
Nick Schonning
9ab7e66cae
Cleanup leftover Nanobox references (#30550) 2024-06-04 17:29:08 +00:00
Claire
f35ba6963d Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
Joshua Young
164b09bfcc
Update README.md setup steps (#30063) 2024-05-10 12:34:32 +00:00
Claire
946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Matt Jankowski
1549e6a9dc
Drop support for Ruby 3.0 (reaching EOL) (#29702) 2024-04-15 10:19:23 +00:00
Claire
a11151d58f
Update our README and include upstream's (#2663) 2024-03-06 22:12:57 +01:00
Matt Jankowski
64b8ba36bb
Add bin/dev script to launch foreman (#28242) 2024-03-02 18:31:43 +00:00
Matt Jankowski
844aa59bdf
Doc update about ruby version 3.0+ (#29202) 2024-02-14 16:44:27 +00:00
Dennis Kamau
ac588daf37
Update copyright year to 2024 (#28550) 2024-01-01 19:08:01 +00:00
Ken Greeff
5d97a897c8
Add note to install libidn on MacOS (#28259) 2023-12-07 12:45:55 +00:00
Renaud Chaput
757d7c73c0
Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
Matt Jankowski
4aa05d45fc
Capture minimum postgres version 12 (#27528) 2023-10-26 20:35:15 +00:00
François Hodierne
608cd66239
Update README requirements from node 14 to node 16 (#27369) 2023-10-11 16:24:28 +02:00
aaaaalbert
bb6c59a399
Fix #27010: update the copyright year in README (#27016) 2023-09-21 13:57:24 +02:00
Christian Schmidt
075cc8e8a6
Improve Codespaces port forwarding (#26400) 2023-08-29 10:20:36 +02:00
Jay Prakash Kalia
8d5d707cc1
Update README.md (#25435) 2023-07-28 23:09:19 +02:00
forsamori
55cf18b689
Add MacOS M1/2 setup steps to README (#25682)
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-18 09:02:45 +02:00
Claire
29a91b871e
Fix glitch-soc Markdown linting issues (#2168) 2023-04-08 17:23:24 +02:00
Nick Schonning
c6c03b49b2
Add Roadmap to README (#24288) 2023-03-31 19:20:11 +02:00
Nick Schonning
2115413fa1
Remove remaining CodeClimate references (#24289) 2023-03-28 02:07:06 +02:00
Renaud Chaput
f9bdaebad2
Use Github Container Registry as the official container image source (#24113) 2023-03-15 16:41:13 +01:00
Nick Schonning
e594bb7d50
Convert CircleCI to GitHub Actions (#23608) 2023-03-07 04:49:43 +01:00
Samruddhi Khandale
ade3c5d40c
Updates dev container and adds doc for getting started with GitHub Codespaces (#23872) 2023-03-05 00:35:00 +01:00
mon1kasenpai
6a71bb23c2
Update README.md (#23409)
Fixed grammatical error in first paragraph
2023-02-07 01:23:21 +01:00
Claire
bf5fc20858
Downgrade Node.js requirement to 14+ (#22342) 2023-01-05 13:47:36 +01:00
Sean
583df59df8
Add reference to mastodon/chart (#22589)
Reference mastodon/chart in the deployment section
2023-01-05 13:39:29 +01:00
Effy Elden
1e49be3328
Align everything to Node.js 16 (#22223)
* Update nvmrc to Node.js 16

* Update package.json minimum Node engine to 16

* Update README requirements to Node.js 16

* Update devcontainer Node.js version to 16

* Update devcontainer Dockerfile Node.js choices to LTS versions that are still in support/maintenance

* Pin CircleCI Node image to 16

* Fix YAML type issue

* Update CircleCI Node.js to 16.18 to match #22019
2022-12-15 17:43:26 +01:00
Claire
098ced7420
Remove support for Ruby 2.6 (#21477)
As pointed out by https://github.com/mastodon/mastodon/pull/21297#discussion_r1028372193
at least one of our dependencies already dropped support for Ruby 2.6, and we
had removed Ruby 2.6 tests from the CI over a year ago (#16861).

So stop advertising Ruby 2.6 support, bump targeted version, and drop some
compatibility code.
2022-11-27 20:41:39 +01:00
Yamagishi Kazutoshi
4e26fb0ea9
Drop support for Ruby v2.5 and Node.js v12 (#18323)
* Drop support for Ruby v2.5 and Node.js v12

* Update package.json
2022-06-16 22:09:58 +02:00
Thomas Citharel
f09a66b9a7
Typo in path to mastodon logo in README.md (#18632)
Less ass, more assets.
2022-06-10 17:37:25 +02:00
Eugen Rochko
45aa5781ce
Change brand color and logotypes (#18592)
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
2022-06-09 22:25:23 +02:00
Eugen Rochko
4bdce2c513
Bump version to 3.5.0rc1 (#17618)
* Bump version to 3.5.0rc1

* Various fixes and improvements

* Update AUTHORS.md

* Various fixes and improvements

* Update README.md
2022-03-15 08:16:45 +01:00
Claire
462bc65112
Add line about using vagrant-hostsupdater in the Vagrant short guide (#17243)
This is documented in the Vagrantfile, but not in the README. As far as I know,
following the short guide without installing this plugin will not make the
container accessible at mastodon.local, thus breaking the last step of the
guide.
2022-01-16 16:55:41 +01:00
Claire
07cb948f39 Remove reference to dev.glitch.social from README
Fixes #1584

It's been down for a while.
2022-01-10 20:59:26 +01:00
Zach Neill
d78ddb1cea
Modify Readme syntax (#17112)
* Modify syntax

* Change ** bold to ### header

* Revert license edit
2021-12-25 22:55:31 +01:00
Даниил Пронин
32db7e4df6
add Vagrant short guide to readme (#13009) 2021-10-14 21:06:19 +02:00
Claire
fc500a6062 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
2021-07-13 17:57:15 +02:00
Eugen Rochko
31593d1426
Update CodeClimate badge in README (#16501) 2021-07-13 16:02:15 +02:00
Claire
5a1e072517
Change references to tootsuite/mastodon to mastodon/mastodon (#16491)
* Change references to tootsuite/mastodon to mastodon/mastodon

* Remove obsolete test fixture

* Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG

And a few other places
2021-07-13 15:46:20 +02:00
Valentin Lorentz
16b524feb6
Change IRC channel to LiberaChat in README (#16279)
Freenode was taken over by a different entity, and former Freenode
staff created LiberaChat.

Short summary of the situation: https://blog.bofh.it/debian/id_461

With more details:

* https://gist.github.com/joepie91/df80d8d36cd9d1bde46ba018af497409
* https://gist.github.com/aaronmdjones/1a9a93ded5b7d162c3f58bdd66b8f491
2021-05-24 05:16:45 +02:00