mirrors
/
catstodon
mirror of https://git.kescher.at/CatCatNya/catstodon.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity
22,266 Commits
5 Branches
114 Tags
270 MiB
develop
main
essem/emoji-reactions-plus-upstream
merge/emoji-reactions
merge/filtering
v4.3.0-alpha.3+glitch+cat+1.2.2
v4.3.0-alpha.3+glitch+cat+1.2.1
v4.3.0-alpha.3+glitch+cat+1.2.0
v4.3.0-alpha.3+glitch+cat+1.1.3
v4.3.0-alpha.3+glitch+cat+1.1.2
v4.3.0-alpha.3+glitch+cat+1.1.1
v4.3.0-alpha.3+glitch+cat+1.1.0
v4.3.0-alpha.3+glitch+cat+1.0.9
v4.3.0-alpha.3+glitch+cat+1.0.8
v4.3.0-alpha.3+glitch+cat+1.0.7
v4.3.0-alpha.3+glitch+cat+1.0.6
v4.3.0-alpha.3+glitch+cat+1.0.5
v4.3.0-alpha.3+glitch+cat+1.0.4
v4.3.0-alpha.3+glitch+cat+1.0.3
v4.3.0-alpha.3+glitch+cat+1.0.2
v4.3.0-alpha.3+glitch+cat+1.0.1
v4.3.0-alpha.3+glitch+cat+1.0.0
v4.3.0-alpha.2+glitch+cat+1.0.18
v4.3.0-alpha.1+glitch+cat+1.0.17
v4.3.0-alpha.1+glitch+cat+1.0.16
v4.3.0-alpha.1+glitch+cat+1.0.15
v4.3.0-alpha.0+glitch+cat+1.0.14
v4.3.0-alpha.0+glitch+cat+1.0.13
v4.3.0-alpha.0+glitch+cat+1.0.12
v4.3.0-alpha.0+glitch+cat+1.0.11
v4.3.0-alpha.0+glitch+cat+1.0.10
v4.3.0-alpha.0+glitch+cat+1.0.9
v4.3.0-alpha.0+glitch+cat+1.0.8
v4.3.0-alpha.0+glitch+cat+1.0.7
v4.3.0-alpha.0+glitch+cat+1.0.6
v4.3.0-alpha.0+glitch+cat+1.0.5
v4.3.0-alpha.0+glitch+cat+1.0.4
v4.3.0-alpha.0+glitch+cat+1.0.3
v4.3.0-alpha.0+glitch+cat+1.0.2
v4.3.0+1.0.1
v4.3.0+1.0.0
4.0.1+1.0.0
4.0.1+1.0.1
4.0.1+1.0.2
4.0.1+1.0.3
4.0.1+1.0.4
v3.5.3+1.0.0
v3.5.3+1.0.1
v3.5.3+1.0.3
v3.5.3+1.0.4
v3.5.3+1.0.5
v3.5.3+1.0.6
v3.5.3+1.0.7
v3.5.3+1.0.8
v3.5.3+1.0.9
v3.5.3+1.1.0
v3.5.3+1.1.1
v3.5.3+1.1.2
v3.5.3+1.1.3
v3.5.3+1.1.4
v3.5.3+1.1.5
v3.5.3+1.1.6
v3.5.3+1.2.1
v3.5.3+1.2.2
v3.5.3+1.2.3
v4.0.0+1.0.0
v4.0.2+1.0.0
v4.0.2+1.0.1
v4.0.2+1.0.10
v4.0.2+1.0.11
v4.0.2+1.0.12
v4.0.2+1.0.13
v4.0.2+1.0.2
v4.0.2+1.0.3
v4.0.2+1.0.4
v4.0.2+1.0.5
v4.0.2+1.0.6
v4.0.2+1.0.7
v4.0.2+1.0.8
v4.0.2+1.0.9
v4.0.2+1.1.0
v4.0.2+1.1.1
v4.0.2+1.1.2
v4.0.2+1.1.3
v4.0.2+1.1.4
v4.0.2+1.1.5
v4.0.2+1.1.6
v4.0.2+1.1.7
v4.0.2+1.1.8
v4.0.2+1.1.9
v4.1.0+1.0.0
v4.1.0+1.0.1
v4.1.0+2.0.0
v4.1.0+2.0.1
v4.1.0+2.0.2
v4.1.0+2.0.4
v4.1.0+2.0.5
v4.1.0+2.1.0
v4.1.0+2.1.1
v4.1.1+1.0.0
v4.1.1+1.0.1
v4.1.1+1.0.2
v4.1.1+1.0.3
v4.1.1+1.0.4
v4.1.1+1.0.5
v4.1.1+1.0.6
v4.1.1+1.0.7
v4.1.2+1.0.0
v4.1.2+1.0.1
v4.1.2+1.0.2
v4.1.2+1.0.3
v4.1.2+1.0.4
v4.1.2+1.1.0
v4.1.2+1.1.1
v4.1.2+1.1.2
v4.1.2+1.1.3
v4.1.2+1.1.4
v4.1.3+1.0.0
v4.1.4+1.0.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
Commit Graph

16 Commits (main)

Author SHA1 Message Date
Claire bceb45adda Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.

Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
 2 weeks ago
Matt Jankowski 3f6887557b
Move JS source from `packs` to `entrypoints` (#30037) 4 weeks ago
Claire afc3b12217 Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
 9 months ago
Christian Schmidt 286a21afdc
Support webpacker live-reloading on Docker (#26419) 9 months ago
Claire 4d5b4dacd6 Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
fusagiko / takayamaki 4520e6473a
[Proposal] Make able to write React in Typescript (#16210) 
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
 1 year ago
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
 1 year ago
Nick Schonning e594bb7d50
Convert CircleCI to GitHub Actions (#23608) 1 year ago
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
 1 year ago
Renaud Chaput 44a7d87cb1
Rename JSX files with proper `.jsx` extension (#23733) 1 year ago
Thibaut Girka 3960a9d605 Do not try to parse gif files as CSS or JS 5 years ago
Yamagishi Kazutoshi 8347479f5d Bump webpacker from 3.5.5 to 4.0.2 (#10277) 
Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 5 years ago
ThibG 7fa4144d48 Fix building assets in test environment (#8691) 
Webpacker (Ruby wrapper to webpack) uses RAILS_ENV-based environments while
the javascript configuration for webpack re-reads this configuration file using
the NODE_ENV environment variable. This means that when RAILS_ENV=test, running
“assets:precompile” compiled the production packs in “public/packs” while
webpacker expects them in “public/packs-test”. This causes Ruby to recompile
them on-the-fly, possibly leading to race conditions in parallel_tests.

This changes:
- Disables on-the-fly compilation in test environment
- Changes the javascript part to read the correct environment
 6 years ago
Yamagishi Kazutoshi 901fc48aae Upgrade Webpacker to version 3.0.1 (#5122) 7 years ago
Nolan Lawson 968354923e Fix webpack-dev-server on Windows (#4000) 
* Fix webpack-dev-server on Windows

* Serve webpack from 0.0.0.0, access at 127.0.0.1
 7 years ago
Yamagishi Kazutoshi 53e42bf91e Upgrade Webpacker to version 2.0 (#3729) 7 years ago