Compare commits

...

64 Commits

Author SHA1 Message Date
Rho Oof f0145bdf23 Add yarn packave cache files and use them in the Dockerfile build
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-26 00:28:28 -07:00
kouhai dev 560b69f26a temporarily remove "Get the app" link"
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-25 22:19:10 -06:00
kouhai dev f547a94ef4 quick status hover hack 2022-11-25 22:19:10 -06:00
kouhai dev 5a92324303 update upstream glitch README/CONTRIBUTING
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-25 22:03:21 -06:00
kouhai dev d2d168cd57 fix REDIS_URL unix socket path parsing for relative paths
ci/woodpecker/push/woodpecker Pipeline was successful Details
ci/woodpecker/pr/woodpecker Pipeline was successful Details
2022-11-25 21:31:39 -06:00
kouhai dev bd0da3a499 fix redis conf
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-24 23:01:20 -06:00
Rin e60d7e3c43
Add dir for redis data
ci/woodpecker/push/woodpecker Pipeline was successful Details
ci/woodpecker/pr/woodpecker Pipeline was successful Details
2022-11-25 14:24:44 +11:00
kouhai dev ea44d46ca9 update gitignore
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-24 18:58:23 -06:00
kouhai dev 17ba99b157 rewrite instructions for a self-contained dev env
ci/woodpecker/pr/woodpecker Pipeline failed Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-24 18:57:24 -06:00
Rin f4b48ca5ee
Command style consistency
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-23 19:35:13 +11:00
Rin 8e4da8677c
Fix headings
ci/woodpecker/push/woodpecker Pipeline was successful Details
ci/woodpecker/pr/woodpecker Pipeline was successful Details
2022-11-23 19:34:20 +11:00
Rin 401a51b67b
Update instructions - make everything self contained
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-23 19:31:19 +11:00
Rin 842498649d
Moderately curse the env file to contain everything in the project 2022-11-23 19:25:17 +11:00
Rin 17e49cf098
rename env file to conform 2022-11-23 19:22:32 +11:00
Rin ca98b0da84
Add .env.ENV.local to .gitignore 2022-11-23 19:10:31 +11:00
Rin 8a701c5ac3 Fix numbering <_<
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-23 07:25:24 +00:00
Rin 2790045c7e Reduce .env file to minimal config 2022-11-23 07:25:24 +00:00
Rin 74c54af904 update gitignore to ignore the pg db we created 2022-11-23 07:25:24 +00:00
Rin 59b831de9b use local pg cluster instead 2022-11-23 07:25:24 +00:00
Rin 4172c91de0 fix typo 2022-11-23 07:25:24 +00:00
Rin ced99149d6 Add SETUP instructions 2022-11-23 07:25:24 +00:00
Rin d25d8d2c07
fix no-style links in admin panel
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-21 18:34:21 +11:00
kouhai dev b247829276 Merge remote-tracking branch 'glitch/main'
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-15 12:03:46 -08:00
Ariadne Conill bb4ed39673 woodpecker: only do push when branch is main
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-13 03:34:08 +00:00
Ariadne Conill c4b8dfae32 Merge pull request 'logo-fix' (#12) from logo-fix into main
ci/woodpecker/push/woodpecker Pipeline was successful Details
Reviewed-on: #12
2022-11-13 03:18:16 +00:00
Rin 4a18d8e642 Fix non-rendering on certain engines
ci/woodpecker/pr/woodpecker Pipeline was successful Details
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-13 02:12:17 +00:00
Rin c048f832c1 Change Safari bookmark colour to match treehouse 2022-11-13 02:12:17 +00:00
Rin bd6a63ebed Add small icon assets 2022-11-13 02:12:17 +00:00
Ariadne Conill b0dc619c56 woodpecker: add registry secret
ci/woodpecker/push/woodpecker Pipeline was successful Details
2022-11-12 14:08:48 +00:00
Ariadne Conill d51636a24d woodpecker: remove separate login step
ci/woodpecker/push/woodpecker Pipeline failed Details
2022-11-12 11:18:48 +00:00
Ariadne Conill 5650b7a785 woodpecker: expose host docker socket for now until i have time to make docker-in-docker work
ci/woodpecker/push/woodpecker Pipeline failed Details
2022-11-12 10:55:53 +00:00
Ariadne Conill 1678011556 add woodpecker CI
ci/woodpecker/push/woodpecker Pipeline failed Details
2022-11-12 10:50:24 +00:00
Ariadne Conill 946388f02e Merge gitea.treehouse.systems:mirrors/mastodon-glitch 2022-11-10 07:11:03 +00:00
Ariadne Conill c515158c09 Revert "Add prefers-color-scheme based theme"
This reverts commit 652882a81b.
2022-11-10 07:05:56 +00:00
Ariadne Conill 8d1fe49d81 try to fix compile 2022-11-10 06:41:02 +00:00
Ariadne Conill ce30dbc2f9 Merge pull request 'Add prefers-color-scheme based theme' (#6) from hamptonmoore/mastodon:system-theme into main
Reviewed-on: #6
2022-11-10 06:10:04 +00:00
Ariadne Conill b1955b69eb Merge pull request 'Replace default mastodon icons with treehouse icons' (#5) from favicon-fix into main
Reviewed-on: #5
2022-11-10 06:06:10 +00:00
Hampton Moore 652882a81b Add prefers-color-scheme based theme 2022-11-09 14:33:12 -05:00
Rin da2445d301
Update favicons to use proper rounded-rect 2022-11-09 19:12:14 +11:00
Rin c4785a1e2e
Update favicons to treehouse favicons 2022-11-09 19:11:36 +11:00
Rin e5e061cdfc restore treehouse favicon 2022-11-09 17:24:22 +11:00
Ariadne Conill 1e00edfc35 config: production: traefik does not support sendfile mode 2022-11-08 09:59:32 +00:00
Ariadne Conill 8d07052d6d version: change to +glitch+th for client compatibility 2022-11-08 07:16:56 +00:00
Ariadne Conill 2c4738f592 version: change +glitch suffix to +th, since we have local modifications 2022-11-07 23:24:11 +00:00
Ariadne Conill 2bee8024c2 Merge https://gitea.treehouse.systems/treehouse/mastodon-glitch into rebase/4.0.0rc2 2022-11-07 23:20:04 +00:00
Ariadne Conill 10c928a72e fix autocomplete 2022-11-07 17:32:46 +00:00
Ariadne Conill d0e2d7df37 config: CSP: add unsafe-eval for scripts 2022-11-07 17:30:16 +00:00
Ariadne Conill 152f5c7983 app: api: base_controller: allow API access to be configurable 2022-11-06 19:13:50 +00:00
Ariadne Conill 7ceda772e4 locales: fix YAML quoting issue
Psych::SyntaxError: (/opt/mastodon/config/locales/simple_form.en.yml): mapping values are not allowed in this context at line 102 column 103
2022-11-06 18:43:54 +00:00
Ariadne Conill 8fb8a2667a Merge branch 'rebase/4.0.0rc1' 2022-11-06 18:23:41 +00:00
kouhai dev 6b7b80a892 update account request question prompt 2022-11-06 18:22:00 +00:00
Ariadne Conill a82113dbd9 vanilla: emoji: use 63x63 grid for emoji 2022-11-06 18:21:57 +00:00
Ariadne Conill 728ed66f8a glitch: emoji: set sprite sheet to 63x63 2022-11-06 18:21:52 +00:00
Ariadne Conill 117d2ed9c7 dockerfile: implement emoji-mart patch 2022-11-06 18:20:15 +00:00
Ariadne Conill 4c38a2d32c update emoji-mart sprite sheet for emoji 13.1 2022-11-06 18:20:15 +00:00
Ariadne Conill c01750a3dd add emoji 13.1 data for emoji-mart 2022-11-06 18:20:15 +00:00
kouhai dev 0ae6ca72de update account request question prompt 2022-11-06 01:36:06 -07:00
Ariadne Conill 47493323fa fixup! 2022-06-12 01:07:56 +00:00
Ariadne Conill 5f634378a2 glitch: fixup! 2022-06-12 01:07:52 +00:00
Ariadne Conill 2298d5b3ce vanilla: emoji: use 63x63 grid for emoji 2022-06-12 00:45:41 +00:00
Ariadne Conill 2ccc011e3f glitch: emoji: set sprite sheet to 63x63 2022-06-12 00:43:28 +00:00
Ariadne Conill 39f42334c2 dockerfile: implement emoji-mart patch 2022-06-11 23:57:03 +00:00
Ariadne Conill 648cad5619 update emoji-mart sprite sheet for emoji 13.1 2022-06-11 23:52:40 +00:00
Ariadne Conill a0479b5d4c add emoji 13.1 data for emoji-mart 2022-06-11 23:51:31 +00:00
1721 changed files with 17967 additions and 12303 deletions

7
.env.development Normal file
View File

@ -0,0 +1,7 @@
LOCAL_DOMAIN=localhost
ALTERNATE_DOMAINS=mastodon.internal
DB_HOST=$(pwd)/data/postgres
DB_USER=mastodon
DB_NAME=mastodon_dev
REDIS_URL=unix://./data/redis/redis-dev.sock

View File

@ -3,3 +3,8 @@ NODE_ENV=tests
# Federation
LOCAL_DOMAIN=cb6e6126.ngrok.io
LOCAL_HTTPS=true
DB_HOST=$(pwd)/data/postgres
DB_USER=mastodon
DB_NAME=mastodon_dev
REDIS_URL=unix://./data/redis/redis-dev.sock

6
.gitignore vendored
View File

@ -4,6 +4,9 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'
# Ignore local dotenv overrides
.env.*.local
# Ignore bundler config and downloaded libraries.
/.bundle
/vendor/bundle
@ -12,6 +15,9 @@
/db/*.sqlite3
/db/*.sqlite3-journal
# Ignore local data directory
/data
# Ignore all logfiles and tempfiles.
.eslintcache
/log/*

19
.woodpecker.yml Normal file
View File

@ -0,0 +1,19 @@
pipeline:
build:
image: docker
volumes:
- /var/run/docker.sock:/var/run/docker.sock
commands:
- docker image build -f Dockerfile . -t gitea.treehouse.systems/treehouse/mastodon:latest
push:
image: docker
volumes:
- /var/run/docker.sock:/var/run/docker.sock
commands:
- echo $REGISTRY_SECRET | docker login -u ariadne --password-stdin gitea.treehouse.systems
- docker image push --all-tags gitea.treehouse.systems/treehouse/mastodon
when:
event: [push, tag]
branch: main
secrets: [REGISTRY_SECRET]

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More