mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2020-02-21	Fix account JSON/RSS not being cacheable due to wrong mime type comparison ↵	ThibG
	(#13116) `request.format` is not a symbol but a `Mime::Type`, so the condition actually never matched, and a session was created even for those requests, preventing caching.
2020-02-21	resolve stray merge conflict	multiple creatures

2020-02-20	port tootsuite#12054 to monsterfork: Fix RSS caching (but disable localization)	ThibG

2020-02-20	Fix featured hashtag URL being interpreted as media or with_replies (#12048)	Eugen Rochko
	Fix #12034
2020-02-20	port tootsuite#11978 to monsterfork: Fix redirecting non-functional accounts ↵	Eugen Rochko
	on public pages Fix #11969
2020-02-20	port tootsuite#11333 to monsterfork: Add (back) rails-level JSON caching	Eugen Rochko

2020-02-20	Fix ActivityPub and REST API queries setting cookies and preventing caching ↵	ThibG
	(#11539) Regression from #8657
2020-02-20	port tootsuite#10502 to monsterfork: Add an RSS feed tagged to a public ↵	Takeshi Umeda
	profile page * Add featured tag support to rss feed on public account page * fix codeing style
2020-02-18	switch to irc-like oper behavior; require mods & admins to explicitly oper ↵	multiple creatures
	up using `fangs`/`op` bangtag or toggling defang setting in profile; auto-defang after 15 mins or with `defang`/`deop` bangtag
2020-02-07	revert & revise `3631689bd`, fix broken 404 pages	multiple creatures

2020-02-04	use `raise_not_found` instead of `not_found` to avoid attempting to call ↵	multiple creatures
	multiple renderers
2020-02-04	outright throw 404 if rss is disabled	multiple creatures

2020-02-04	fix rss endpoint & add option to enable it (off by default)	multiple creatures

2020-01-20	Original upstream merge	ThibG

2020-01-17	Fix issue fetching new accts	Holly "Frinkeldoodle" Lotor

2020-01-17	Port render_with_cache, CacheConcern from upstream	Holly "Frinkeldoodle" Lotor

2019-11-19	Cleanup various controllers (#10972)	ThibG
	* Remove skip_session! as it is not supported in Rails 5 * Minor cleanup in StreamEntriesController * Remove redundant mark_cacheable! calls
2019-11-18	Filter boosts from profile pages' Roars & Growls tab.	multiple creatures

2019-08-04	restrict private pin visibility to packmates & do not include them in ↵	multiple creatures
	`featured` collection (mainline masto does not respect pin visibility)
2019-07-21	begone extra parenthesis	multiple creatures

2019-07-21	allow self & signed-in local followers to see account when `hide public ↵	multiple creatures
	profile` is set
2019-07-21	return 404 if `hide public profile` set	multiple creatures

2019-07-21	split `hide public profile` & `hide public ap outbox` into separate user ↵	multiple creatures
	options, make original `Account.hidden` prop federation-affecting `invisible mode`
2019-07-21	add more options for time range of roars visible to anonymous public profile ↵	multiple creatures
	viewers
2019-07-21	privacy - limit public profiles & public ap outboxes to last 6 days of history	multiple creatures

2019-07-21	privacy - remove rss endpoint from account controller	multiple creatures

2019-05-21	`hashtag_scope` is a method in this class - how did we even manage to ↵	multiple creatures
	break that???
2019-05-21	add missing `account_media_status_ids` method to accounts controller (oooops~)	multiple creatures

2019-05-21	Drop OStatus support. Fix some of the Rspec tests.	multiple creatures

2019-05-21	Implement scoped tags; use `local:` and `self:` scopes for community and ↵	multiple creatures
	personal tags, respectively.
2019-05-21	Split boosts/repeats off to their own tab and add to the API.	multiple creatures

2019-05-21	Add option to hide public replies from profile	multiple creatures

2019-03-18	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.
2019-03-17	Reduce server load caused by anonymous viewing. (#9059)	Ben Lubar
	Do not start a session if the current user is not logged in for public-facing pages. Mark pages that don't care about sessions as publicly cacheable. Keep the max age as 0 so proxies and browsers will still try to retrieve an updated version but can still fall back to the stale version if the site is down or too slow. Fixes #9035.
2019-03-14	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
2019-03-14	Admission-based registrations mode (#10250)	Eugen Rochko
	Fix #6856 Fix #6951
2019-03-13	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb
2019-03-13	Fix `tagged` param not being normalized before querying tags (#10249)	Eugen Rochko

2019-02-10	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.
2019-02-05	Fix it as tagged_request of accounts_controller is not addressable_uri (#9976)	Takeshi Umeda

2019-02-05	Fix pinned statuses being shown in a featured hashtag (#9971)	Eugen Rochko

2019-02-04	Add featured hashtags to profiles (#9755)	Eugen Rochko
	* Add hashtag filter to profiles GET /@:username/tagged/:hashtag GET /api/v1/accounts/:id/statuses?tagged=:hashtag * Display featured hashtags on public profile * Use separate model for featured tags * Update featured hashtag counters on-write * Limit featured tags to 10
2018-11-13	Exclude local-only toots from atom feeds	Thibaut Girka

2018-08-21	Merge branch 'master' into glitch-soc/master	Thibaut Girka
	Conflicts: config/routes.rb Added the “endorsements” route from upstream.
2018-08-19	Unuse ActiveRecord::Base#cache_key (#8185)	abcang
	* Unuse ActiveRecord::Base#cache_key * Enable cache_versioning * Call cache_collection
2018-08-10	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
2018-08-09	Public profile endorsements (accounts picked by profile owner) (#8146)	Eugen Rochko

2018-08-01	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: config/settings.yml
2018-08-01	Do not show pinned toots when min_id is set (#8111)	Yamagishi Kazutoshi

2018-08-01	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.