7465 Commits (4dd208f482dcfec949df439870ecc3ef899bf7ee)

 

All Branches   

Search

Author	SHA1	Message	Date
Thibaut Girka	34ecec8c85	Add admin links to status and account menus (fixes #673) ... If the current logged-in user is an admin, add quick links to the admin interface in account and toot dropdown menu. Suggestion by @ashkitten	6 years ago
Thibaut Girka	63fe7a2d7a	Allow to show a specific status in the admin interface	6 years ago
Thibaut Girka	d937c65f2c	Let the front-end know the current account is a moderator	6 years ago
Thibaut Girka	c50c4d4a8f	[Glitch] Skip VS15 (Emoji textual presentation) ... Port f21c1c58ce to glitch-soc	6 years ago
Thibaut Girka	c11159af5f	[Glitch] Add aria-label to floatingActionButton ... Port e84ae0d8a2 to glitch-soc	6 years ago
Thibaut Girka	ea2054e2f5	[Glitch] Inactive header in main profile to match column ... Port 2903971e04 to glitch-soc	6 years ago
Thibaut Girka	725735af14	Fix CI badge, as we have switched from Travis to CircleCI	6 years ago
ThibG	b71e4161f4	Merge pull request #702 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
Thibaut Girka	7134c1f522	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.	6 years ago
Thibaut Girka	7ed6f60a74	Fixes columns scrolling to top when opening media modal ... Fixes #700	6 years ago
Eugen Rochko	b7ec70d486	Redirect from old authorize_follow path (#8584) ... To avoid error due to nginx proxy caching the webfinger response	6 years ago
Eugen Rochko	e3fdf02943	Bump version to 2.5.0	6 years ago
Eugen Rochko	9768e9f6ab	Enable ro and ta locales in Rails (#8583) ... * Enable ro and ta locales in Rails * Add Tamil and Romanian to language dropdown	6 years ago
Eugen Rochko	64f01b2e7d	Weblate translations (2018-09-02) (#8582) ... * Translated using Weblate (Serbian) Currently translated at 72.4% (499 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Serbian) Currently translated at 77.6% (535 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Corsican) Currently translated at 99.7% (687 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Dutch) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Korean) Currently translated at 100.0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Dutch) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Serbian) Currently translated at 72.3% (60 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (German) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Serbian) Currently translated at 92.8% (77 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ Језик писања? Нисам сигуран * Translated using Weblate (Corsican) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Serbian) Currently translated at 98.8% (330 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод. * Translated using Weblate (Occitan) Currently translated at 100,0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 100,0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод. * Translated using Weblate (German) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.7% (687 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Serbian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Serbian) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * i18n-tasks noramlize && yarn manage:translations	6 years ago
Marcin Mikołajczak	fb9fc05f0c	i18n: Update Polish translation (#8581) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
Eugen Rochko	696d73931c	Fix nil error in admin_account_link_to helper (#8578) ... Fix #8573	6 years ago
Eugen Rochko	2b99bba92c	Update README.md ... Add link to quick start guide, link to general documentation, fix link to list of servers, remove Liberapay	6 years ago
Eugen Rochko	9f4618d7a6	Weblate translations (2018-09-02) (#8577) ... * Translated using Weblate (Polish) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Korean) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Czech) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Added translation using Weblate (Tamil) * Translated using Weblate (Greek) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (Corsican) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Persian) Currently translated at 100.0% (83 of 83 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Romanian) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Added translation using Weblate (Romanian) * Added translation using Weblate (Romanian) * Added translation using Weblate (Romanian) * i18n-tasks normalize && yarn manage:translations * Fix ro YML files	6 years ago
ThibG	56caf50db7	Update docker config and move some workers to different queues (#8345) ... * Reorder docker-compose's sidekiq queues to match config/sidekiq.yml * Make the ̀“mailers” queue higher priority than “pull”	6 years ago
Frederic Hemberger	e84ae0d8a2	Add aria-label to floatingActionButton (#8574)	6 years ago
Eugen Rochko	5facd13c76	Add weblate widget to README	6 years ago
Alix R	d21e46bba6	Add Corsican locale data (#8566)	6 years ago
Evgeny Petrov	6997fe6d8a	[RU] Added translation for the following sections: (#8570) ... * Added translation for the following sections: • Empty followers, mutes, boosts etc. lists • Keyboard shortcuts • "About" • Plurals for statuses, users and subscribers counters • Relays, Custom CSS and suspensions settings. • Remote interactions • Other misc stuff * i18n-tasks normalize	6 years ago
Eugen Rochko	b59191cf68	Weblate translations (2018-09-01) (#8561) ... * Translated using Weblate (German) Currently translated at 99.9% (687 of 688 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100,0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Japanese) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 100,0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Greek) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Catalan) Currently translated at 100,0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100,0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 98.1% (676 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (French) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Catalan) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 99.7% (687 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Welsh) Currently translated at 7.3% (6 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Welsh) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 15.5% (107 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 1.6% (1 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ * Translated using Weblate (Welsh) Currently translated at 15.8% (109 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (French) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Occitan) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Danish) Currently translated at 100,0% (689 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Occitan) Currently translated at 99.7% (333 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Slovak) Currently translated at 100.0% (334 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (688 of 689 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Added translation using Weblate (Romanian) * Translated using Weblate (Romanian) Currently translated at 47.9% (160 of 334 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * i18n-tasks normalize && yarn manage:translations	6 years ago
Eugen Rochko	00d1699a96	Whitelist report notification param in Settings::NotificationsController (#8560) ... Bug in #8559	6 years ago
Eugen Rochko	601a0dc6cc	Add preference for report notification e-mails, skip for duplicates (#8559) ... If an unresolved report for the same target account already exists, no new notification is generated	6 years ago
M Somerville	f21c1c58ce	Skip VS15 (Emoji textual presentation). (#8553) ... Mastodon converts all Emoji to images, whether they have a VS15 after them or not, but leaves the VS15 in the string, which is displayed as a black box in Safari.	6 years ago
Yamagishi Kazutoshi	8a0670a54e	Integrating `:one` and `:other` in ar.yml (#8555)	6 years ago
ThibG	82cbf325c2	Merge pull request #699 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
Thibaut Girka	65e4345a48	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Yamagishi Kazutoshi	35beafabe9	Fix static URL when disable autoplay (#8548)	6 years ago
Thibaut Girka	b72cc57175	Fix composer not displaying on chrome mobile (fixes #696)	6 years ago
Eugen Rochko	894e01163b	Bump version to 2.5.0rc2	6 years ago
trwnh	150ec66461	Fix the display of missing lists (#8523) ... * Fix the display of missing lists See #6786 -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions. * import ColumnBackButton missed the import with the first commit	6 years ago
Eugen Rochko	32d3152852	Fix wrong string being used on login failure when using LDAP (#8534) ... Fix #8527	6 years ago
ThibG	abc03a3b9d	Merge pull request #694 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
ThibG	b13f1d470a	Do not show follow button on moved or memorial accounts (#8546) ... This restores the logic from before the public profile redesign. Fixes #8503	6 years ago
Thibaut Girka	daa6110ce7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml	6 years ago
Thibaut Girka	ff18ba0d2b	Add option to not automatically unfold content warnings matching a regexp ... Fixes #678	6 years ago
Thibaut Girka	2fbebd89fb	Allow text inputs in local settings dialog	6 years ago
Thibaut Girka	02c32ad7af	Add a setting to automatically unfold all content warnings	6 years ago
Thibaut Girka	a3afd0791d	[Glitch] Show compose form on delete & redraft when in mobile layout ... Port 97a2958ba1 to glitch-soc	6 years ago
Thibaut Girka	f485e2ced3	Fix search results on compose box	6 years ago
Thibaut Girka	923a7f3f11	Fix account header showing on search page	6 years ago
Thibaut Girka	deb14b957a	[Glitch] On the mobile UI, move the search column to the right ... Port 5f0b9c5d36 to glitch-soc	6 years ago
Thibaut Girka	89b50796ba	[Glitch] Hide search from Compose on mobile devices ... Port f48902e6e6 to glitch-soc	6 years ago
Thibaut Girka	fb195f37bb	[Glitch] Add search item to tab bar for mobile devices ... Port 0e5e60a84b to glitch-soc	6 years ago
Thibaut Girka	042b5212cd	[Glitch] Use withRouter for TabsBar ... Port 2040094568 to glitch-soc	6 years ago
Thibaut Girka	e88fe59712	[Glitch] Move "compose" on mobile to floating action button ... Port 1237c34997 to glitch-soc	6 years ago
Thibaut Girka	000b9f7b03	[Glitch] When search enabled, display hint in search popout ... Port a91ef56e80 to glitch-soc	6 years ago