microblog

Commit Graph

Author	SHA1	Message	Date
Thor	eb8fa57261	Add more automated post deletion age thresholds	2 years ago
Thor	affab99b47	Revert to upstream translations (keep on local branch instead)	2 years ago
Thor	6b0dc8407e	Enable edit support	2 years ago
Thor	7f3114e4cb	Merge branch 'main' of https://github.com/glitch-soc/mastodon into main	2 years ago
Thor	74bb52bd7e	Fix sticker alignment bug	2 years ago
Claire	df60524b30	Merge pull request #1707 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 years ago
Claire	0a5a703a56	[Glitch] Fix remote reports with comments revealing remote reporter Port SCSS changes from `57814a98a9` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	8158b04d18	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Claire	551820cbd9	Merge pull request #1704 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 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	2 years ago
Thor	6a50920252	Remove margin on emojis in detailed statuses	2 years ago
Thor	7a325063af	Fix big emoji sizes for detailed statuses	2 years ago
Thor	e9272004de	Revert more vanilla features to upstream	2 years ago
Thor	2271f10292	Revert vanilla components.scss to upstream	2 years ago
Thor	96c9b527f6	Revert vanilla compose.js to upstream	2 years ago
Thor	ca90a99560	Revert redundant vanilla patches to upstream	2 years ago
Eugen Rochko	0dc57ab6ed	Fix status updates not being forwarded like deletes through ActivityPub (#17648 ) Fix #17521	2 years ago
Thor	775e4c4be9	Add sticker support	2 years ago
Claire	67c6f37e26	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
LinAGKar	48caeb9d65	Also compress SVG and ICO images in nginx (#17651 )	2 years ago
Claire	6aef76b5cd	Fix error when a MX is shared across blocked domains (#17650 )	2 years ago
Thor	ad6397f1bb	Bigger emojis	2 years ago
Thor	89a476f0bc	Remove duplicate JS code for media gallery	2 years ago
Claire	3d60708508	Fix crash in EmailDomainBlockRefreshScheduler (#17649 )	2 years ago
Thor	bc8d4d0c78	Merge branch 'main' of github.com:berserker-town/glitch-soc into main	2 years ago
Thor	e998b1e630	Increase media attachment limit to 20	2 years ago
Thor	c4bb82b49e	Add support for 20 media attachments	2 years ago
Claire	756f1b6615	Add option (on by default) to allow toots with content warnings to trend	2 years ago
Claire	c6df6686af	Disable notifications for trending links and trending statuses by default	2 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>	2 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>	2 years ago
Eugen Rochko	2e2b8a9a40	[Glitch] Add trending statuses Port SCSS changes from `27965ce5ed` Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago
Claire	59824aadcd	Adapt view for glitch-soc's theming system	2 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.	2 years ago
MitarashiDango	a5c24d5c4d	Fix unable to unpin follower-only posts (#17647 )	2 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>	2 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>	2 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>	2 years ago
Claire	255748dff4	Fix media modal footer's “external link” not being a link (#17561 )	2 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>	2 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	2 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	2 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	2 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	2 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>	2 years ago
Thor	655573f9c5	Merge branch 'main' of https://github.com/glitch-soc/mastodon into main	2 years ago
Sumak	91cc8d1e63	fix #17601 change `:keys` to `:attribute_names` (#17637 )	2 years ago
Claire	e48eaf64cc	Merge pull request #1701 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	2 years ago
Claire	41ef41b900	Fix publish buttons styling	2 years ago
Claire	ae3cd3b84c	[Glitch] Fix reporting from profile Port `b7cf11d5a9` to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2 years ago

1 2 3 4 5 ...

14884 Commits (eb8fa572615d05cf40e1b45b5ddd086f463e0afd) All Branches Search

14884 Commits (eb8fa572615d05cf40e1b45b5ddd086f463e0afd)

All Branches