mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2019-12-07	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-05	Remove some duplicate methods from StatusHelper and reflect changes to ↵	Takeshi Umeda
	AccountHelper (#12545)
2019-10-27	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb
2019-10-24	Split AccountsHelper from StatusesHelper (#12078)	Takeshi Umeda

2017-04-11	Pagination improvements (#1445)	Matt Jankowski
	* Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views
2016-11-15	Adding some localizations	Eugen Rochko

2016-11-15	Fix rubocop issues, introduce usage of frozen literal to improve performance	Eugen Rochko

2016-10-03	Fix most pages on small screens	Eugen Rochko

2016-03-19	Adding public following and followers pages, fix #3	Eugen Rochko

2016-02-29	Refactoring Grape API methods into normal controllers & other things	Eugen Rochko