glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Claire	551820cbd9	Merge pull request #1704 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	3 years ago
Claire	57814a98a9	Fix remote reports with comments revealing remote reporter (#17652 ) * Display username rather than display name in report comment For consistency with report notes and appeals * Fix remote reports with comments revealing remote reporter * Display instance name in placeholder * Make instance name in report comment a link to the federation admin page * Normalize i18n file	3 years ago
Eugen Rochko	0dc57ab6ed	Fix status updates not being forwarded like deletes through ActivityPub (#17648 ) Fix #17521	3 years ago
Claire	67c6f37e26	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
LinAGKar	48caeb9d65	Also compress SVG and ICO images in nginx (#17651 )	3 years ago
Claire	6aef76b5cd	Fix error when a MX is shared across blocked domains (#17650 )	3 years ago
Claire	3d60708508	Fix crash in EmailDomainBlockRefreshScheduler (#17649 )	3 years ago
Claire	756f1b6615	Add option (on by default) to allow toots with content warnings to trend	3 years ago
Claire	c6df6686af	Disable notifications for trending links and trending statuses by default	3 years ago
Claire	4eed5019a2	[Glitch] Fix media modal footer's “external link” not being a link Port `255748dff4` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	8e04ba87b7	[Glitch] Fix reply button on media modal not giving focus to compose form Port `2cd31b3177` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Eugen Rochko	2e2b8a9a40	[Glitch] Add trending statuses Port SCSS changes from `27965ce5ed` Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	59824aadcd	Adapt view for glitch-soc's theming system	3 years ago
Claire	be493b6c0d	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.	3 years ago
MitarashiDango	a5c24d5c4d	Fix unable to unpin follower-only posts (#17647 )	3 years ago
dependabot[bot]	0f75490b49	Bump pg from 1.3.2 to 1.3.3 (#17643 ) Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.2 to 1.3.3. - [Release notes](https://github.com/ged/ruby-pg/releases) - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc) - [Commits](https://github.com/ged/ruby-pg/compare/v1.3.2...v1.3.3) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	85f6a960f9	Bump aws-sdk-s3 from 1.112.0 to 1.113.0 (#17642 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.112.0 to 1.113.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) --- updated-dependencies: - dependency-name: aws-sdk-s3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	50452064b3	Bump nokogiri from 1.13.2 to 1.13.3 (#17641 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.2 to 1.13.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.2...v1.13.3) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
Claire	255748dff4	Fix media modal footer's “external link” not being a link (#17561 )	3 years ago
dependabot[bot]	e884f7dfbd	Bump nokogiri from 1.13.1 to 1.13.2 (#17604 ) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.1 to 1.13.2. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.1...v1.13.2) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
sasanquaneuf	21e80a9792	Escape database passwords in config/database.yml (#17627 ) * Add double quotes for using passwords that start with a comma * Escape database password in yml	3 years ago
Claire	2cd31b3177	Fix reply button on media modal not giving focus to compose form (#17626 ) * Avoid compose form and modal management fighting for focus * Fix reply button on media modal footer not giving focus to compose form	3 years ago
Eugen Rochko	d4592bbfcd	Add explore page to web UI (#17123 ) * Add explore page to web UI * Fix not removing loaded statuses from trends on mute/block action	3 years ago
Eugen Rochko	27965ce5ed	Add trending statuses (#17431 ) * Add trending statuses * Fix dangling items with stale scores in localized sets * Various fixes and improvements - Change approve_all/reject_all to approve_accounts/reject_accounts - Change Trends::Query methods to not mutate the original query - Change Trends::Query#skip to offset - Change follow recommendations to be refreshed in a transaction * Add tests for trending statuses filtering behaviour * Fix not applying filtering scope in controller	3 years ago
Eugen Rochko	a29a982eaa	Change e-mail domain blocks to block IPs dynamically (#17635 ) * Change e-mail domain blocks to block IPs dynamically * Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> * Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
Sumak	91cc8d1e63	fix #17601 change `:keys` to `:attribute_names` (#17637 )	3 years ago
Claire	e48eaf64cc	Merge pull request #1701 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	3 years ago
Claire	41ef41b900	Fix publish buttons styling	3 years ago
Claire	ae3cd3b84c	[Glitch] Fix reporting from profile Port `b7cf11d5a9` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	fc2c65d79f	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	b7cf11d5a9	Fix reporting from profile (#17632 ) * Fix reporting from profile * Clean up dead code	3 years ago
Claire	aafe91259a	Fetch relationships when opening report modal Relationship with the reported account affect which actions are proposed in the “thanks” part. Upstream fetches relationships when opening dropdown menus, but we don't.	3 years ago
Eugen Rochko	470c0a8002	[Glitch] Change report modal to include category selection in web UI Port `a9a43de6d1` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	9dd62c95c5	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	8c9c05d579	Merge pull request #1700 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	3 years ago
Eugen Rochko	a9a43de6d1	Change report modal to include category selection in web UI (#17565 ) * Change report modal to include category selection in web UI * Various fixes and improvements - Change thank you text to be different based on category - Change starting headline to be different for account and status reports - Change toggle components to have a checkmark when checked - Fix report dialog being cut off on small screens - Fix thank you screen offering mute or block if already muted or blocked - Refactor toggle components in report dialog into one component * Change wording on final screen * Change checkboxes to be square when multiple options are possible	3 years ago
Claire	55692978ec	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	1c3e5e44e2	Fix new sign-up notification not working because of incorrect type name (#17629 )	3 years ago
Eugen Rochko	f99943cd74	[Glitch] Add notifications for new sign-ups Port `7b816eb5ae` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	3d25fe0426	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.	3 years ago
noiob	0db101ede2	Fix link in new hashtag notification email (#17624 ) It's currently https://example.org/admin/trends/tags?pending_review=1 but should be https://example.org/admin/trends/tags?status=pending_review	3 years ago
Eugen Rochko	7b816eb5ae	Add notifications for new sign-ups (#16953 )	3 years ago
Jeong Arm	3e12abc1fe	Calculate max_id without random vector (#17623 )	3 years ago
Yamagishi Kazutoshi	b950807fd2	Skip Docker Hub login for pull requests (#17625 ) * Skip Docker Hub login for pull requests * Add support pr tag	3 years ago
Eugen Rochko	d21bedc492	New Crowdin updates (#17593 ) * New translations en.json (Catalan) * New translations en.json (Turkish) * New translations en.json (Macedonian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Ukrainian) * New translations en.json (Korean) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Vietnamese) * New translations en.json (Galician) * New translations en.json (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Indonesian) * New translations en.json (Tamil) * New translations en.json (Spanish, Argentina) * New translations en.json (Lithuanian) * New translations en.json (Georgian) * New translations en.json (Slovenian) * New translations en.json (French) * New translations en.json (Persian) * New translations en.json (Occitan) * New translations en.json (Arabic) * New translations en.json (Thai) * New translations en.json (Norwegian Nynorsk) * New translations en.json (Norwegian) * New translations en.json (Hebrew) * New translations en.json (Greek) * New translations en.json (Dutch) * New translations en.json (Romanian) * New translations en.json (Spanish) * New translations en.json (Japanese) * New translations en.json (Afrikaans) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Spanish, Mexico) * New translations en.json (Bengali) * New translations en.json (Cornish) * New translations en.json (Silesian) * New translations en.json (Taigi) * New translations en.json (Ido) * New translations en.json (Kabyle) * New translations en.json (Sanskrit) * New translations en.json (Sardinian) * New translations en.json (Corsican) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Serbian (Latin)) * New translations en.json (Asturian) * New translations en.json (Scottish Gaelic) * New translations en.json (Kannada) * New translations en.json (Sinhala) * New translations en.json (Marathi) * New translations en.json (Breton) * New translations en.json (Malayalam) * New translations en.json (Tatar) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Uyghur) * New translations en.json (Esperanto) * New translations en.json (Welsh) * New translations en.json (Telugu) * New translations en.json (Malay) * New translations en.json (Hindi) * New translations en.json (Latvian) * New translations en.json (Estonian) * New translations en.json (Kazakh) * New translations en.json (Croatian) * New translations en.json (Standard Moroccan Tamazight) * New translations en.yml (Japanese) * New translations en.json (Japanese) * New translations en.json (Chinese Traditional) * New translations en.json (Danish) * New translations en.json (Thai) * New translations en.yml (Thai) * New translations en.json (Korean) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Chinese Simplified) * New translations en.yml (Thai) * New translations devise.en.yml (Thai) * New translations en.yml (Thai) * New translations en.yml (Thai) * New translations en.json (Catalan) * New translations simple_form.en.yml (Thai) * New translations en.json (Galician) * New translations en.json (Greek) * New translations en.json (Polish) * New translations en.json (Hebrew) * New translations en.json (Icelandic) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Chinese Traditional) * New translations en.yml (Russian) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.yml (Russian) * New translations en.json (Swedish) * New translations simple_form.en.yml (Russian) * New translations en.json (Turkish) * New translations en.json (Chinese Traditional) * New translations en.json (Albanian) * New translations en.json (Vietnamese) * New translations en.json (Latvian) * New translations en.json (Hungarian) * New translations en.json (Spanish, Argentina) * New translations en.json (Italian) * New translations en.yml (Japanese) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.yml (Finnish) * New translations simple_form.en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.json (Finnish) * New translations en.yml (Japanese) * New translations en.yml (Japanese) * New translations en.yml (Hebrew) * New translations en.yml (Hebrew) * New translations en.json (Spanish) * New translations en.json (Basque) * New translations en.yml (Basque) * New translations en.json (Basque) * New translations en.yml (Basque) * New translations en.yml (Basque) * New translations en.json (Ukrainian) * New translations en.yml (Indonesian) * New translations en.json (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Russian) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.json (Hungarian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations simple_form.en.yml (Indonesian) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations simple_form.en.yml (French) * New translations en.json (French) * New translations simple_form.en.yml (French) * New translations en.json (French) * New translations simple_form.en.yml (Galician) * New translations en.json (French) * New translations en.json (Russian) * New translations activerecord.en.yml (Latvian) * New translations en.yml (French) * New translations en.yml (French) * Run `yarn manage:translations` * Run `bundle exec i18n-tasks normalize` Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	3 years ago
luzpaz	73f5e4a1d9	Fix various typos (#17621 ) Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro`	3 years ago
Claire	2c8615fbf8	Merge pull request #1699 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	3 years ago
Eugen Rochko	5169a9f9d9	[Glitch] Fix link colors in report and strike details Port SCSS changes from `51e67f3243` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Eugen Rochko	e07f2efc9f	[Glitch] Fix wrong styles on strike page Port SCSS changes from `8338826963` Signed-off-by: Claire <claire.github-309c@sitedethib.com>	3 years ago
Claire	954e052b07	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/models/media_attachment.rb`: Upstream moved hardcoded values around, while in glitch-soc they are configurable. Moved them like upstream, but keeping glitch-soc's ability to configure them through env vars.	3 years ago

1 2 3 4 5 ...

14960 Commits (8eb3146487e27f31478943cbe706d43a6c7a6d25) All Branches Search

14960 Commits (8eb3146487e27f31478943cbe706d43a6c7a6d25)

All Branches