mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2018-01-03	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 ↵	Yamagishi Kazutoshi
	(#6167) * yarn manage:translations * Add Japanese translation for #5997 * Add Japanese translation for #6003 * Add Japanese translation for #6004 * Add Japanese translation for #6071 * Add Japanese translation for #6099 * Add Japanese translation for #6125 * Add Japanese translation for #6132
2018-01-03	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2018-01-02	Add confirmation step for email changes (#6071)	Patrick Figel
	* Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes
2018-01-02	delete X-UA-Compatible (#6068)	Otakan
	* delete X-UA-Compatible * undo * restore
2018-01-02	Adding Serbian latin translations (#6146)	Branko Kokanovic
	Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
2018-01-02	Merge remote-tracking branch 'origin/master' into merge-upstream	David Yip
	Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
2018-01-02	Show mastodon on modal (#6129)	Akihiko Odaki

2017-12-31	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-31	Adding Serbian translation (#6133)	Branko Kokanovic
	* Adding Serbian translation * i18n-tasks normalize
2017-12-30	Merge remote-tracking branch 'origin/master' into merge-upstream	David Yip
	Conflicts: app/controllers/auth/confirmations_controller.rb
2017-12-30	keep the same filters and page when doing custom emojo stuff (fixes #6112) ↵	beatrix
	(#6114)
2017-12-29	Add more instance stats APIs (#6125)	Eugen Rochko
	* Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps
2017-12-24	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-24	Reduce motion for boost animation (#5871)	Nolan Lawson
	* Reduce motion for boost animation Fixes #5833 * Fix ternary expression
2017-12-22	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-22	Display deleted users' role as “Suspended” (#6080)	ThibG
	Deleted users are technically suspended, but the code displaying their status in the admin interface was broken and displayed a javascript object holding translations of the possible user roles instead.
2017-12-13	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-13	Add filters to admin UI for custom emojis (#6003)	Eugen Rochko

2017-12-13	Clean up admin UI for accounts (#6004)	Eugen Rochko
	* Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data
2017-12-12	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	David Yip

2017-12-12	Improve public status page title (#5985)	Eugen Rochko

2017-12-10	Added styling	kibigo!

2017-12-10	Screenshot support for themes	kibigo!

2017-12-10	Moved flavour UI into own prefs tab	kibigo!

2017-12-10	pulled master, moved locale entry to new location	cwm

2017-12-10	Only localize js when there's a theme	kibigo!

2017-12-10	Javascript intl8n flavour support	kibigo!

2017-12-10	Ruby intl8n for themes	kibigo!

2017-12-09	add initial components based off of tootsuite pr #1507	cwm

2017-12-09	Back to Web UI from tag page when signed in (#5943)	Yamagishi Kazutoshi

2017-12-09	Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)	Eugen Rochko

2017-12-06	Merge pull request #229 from glitch-soc/glitch-theme	beatrix
	Advanced Next-Level Flavours And Skins For Mastodon™
2017-12-06	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-06	Remove rabl dependency (#5894)	Eugen Rochko
	* Remove rabl dependency * Replicate old Oj configuration
2017-12-04	Various fixes	kibigo!

2017-12-04	current_theme -> current_flavour (#229)	David Yip

2017-12-04	Merge branch 'gs-master' into glitch-theme	David Yip

2017-12-04	Fixed a name + localizations	kibigo!

2017-12-03	Rename themes -> flavours ? ?	kibigo!

2017-12-02	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-01	Add invite filter (#5862)	Yamagishi Kazutoshi

2017-12-01	Fix invites form path (#5861)	Yamagishi Kazutoshi

2017-12-01	Allow admin to deactivate invite created by users (#5860)	Yamagishi Kazutoshi

2017-11-30	Skins support	kibigo!

2017-11-28	Merge remote-tracking branch 'origin/master' into gs-master	David Yip

2017-11-28	Show "expired" in invite index (#5838)	Yamagishi Kazutoshi
	* Show "expired" in invite index * "Force expire" -> "Deactivate"
2017-11-27	Merge remote-tracking branch 'tootsuite/master'	David Yip

2017-11-27	Add UI for setting up account migration (#5832)	Eugen Rochko

2017-11-27	Merge remote-tracking branch 'origin/master' into gs-master	David Yip

2017-11-27	Use account.username when display_name is empty (#5828)	Yamagishi Kazutoshi