Jeremy Kescher 1661561640 Merge branch 'reactions' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/es.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/flavours/glitch/locales/ja.js # app/javascript/flavours/glitch/locales/ko.js # app/javascript/flavours/glitch/locales/pl.js # app/javascript/flavours/glitch/locales/zh-CN.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # db/migrate/20221124114030_create_status_reactions.rb		2022-12-22 00:18:36 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
initializers	Merge remote-tracking branch 'upstream/main' into develop	2022-12-16 17:53:33 +01:00
locales	Merge branch 'reactions' into develop	2022-12-22 00:18:36 +01:00
locales-glitch	Merge remote-tracking branch 'upstream/main' into reactions	2022-12-21 23:45:28 +01:00
webpack	Change locales file generation to use JSON sources (#2028)	2022-12-21 22:13:14 +01:00
application.rb	Add Western Frisian support (#18602)	2022-12-15 19:03:44 +01:00
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	2021-09-19 14:42:32 +09:00
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
database.yml	Change postgres connection timeout (#21790)	2022-12-07 00:39:36 +01:00
deploy.rb	Change master branch to main branch (#20290)	2022-11-10 04:02:05 +01:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml	Change i18n-tasks config to consider glitch-soc translation files (#2027)	2022-12-21 22:13:04 +01:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	2020-05-04 13:52:41 +02:00
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	support reacting with foreign custom emojis	2022-12-20 18:27:56 +01:00
secrets.yml
settings.yml	make number of visible reactions a vanilla setting	2022-12-20 18:27:46 +01:00
sidekiq.yml	Merge remote-tracking branch 'upstream/main' into develop	2022-12-16 17:53:33 +01:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	Do not try to parse gif files as CSS or JS	2019-03-16 14:23:50 +01:00