7348 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ThibG	cbc2e6bd40	Make some migration script more robust (fixes #8007) (#8170) ... Include a dummy Account class in the migration script containing only the attributes relevant to the migration in order to not rely as much on the codebase being in sync with the database schema.	2018-08-11 18:00:41 +02:00
ThibG	d215c43cda	Merge pull request #633 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-08-11 16:17:29 +02:00
Thibaut Girka	84a2587d44	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-11 15:45:42 +02:00
Thibaut Girka	741fb32bef	Fix statuses batch checkboxes in admin panel (fixes #411)	2018-08-11 15:45:12 +02:00
Thibaut Girka	acb3d5b7aa	Don't prevent opening links in tabs with keyboard modifiers ... Ctrl+click usually allows opening a link in a new tab. This was prevented for hashtag or user links in toots.	2018-08-11 15:29:08 +02:00
ThibG	d787bcdeb1	Merge pull request #630 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-08-11 15:28:06 +02:00
ThibG	44680c46ed	Ensure single user is a local user (fixes #8154) (#8157)	2018-08-11 11:53:10 +02:00
Mélanie Chauvel (ariasuni)	7b5ea7270d	Fix crash when clicking “Show more/less for all” when a toot is not visible (#8118)	2018-08-11 11:52:53 +02:00
Nathaniel Ekoniak	84e2446d26	i18n: fix Slovak language name (#8169)	2018-08-11 14:52:05 +09:00
Yamagishi Kazutoshi	e8b7f3f3e2	Weblate translations (2018-08-11) (#8167) ... * Translated using Weblate (Japanese) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 98.5% (657 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 98.5% (657 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (666 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Czech) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 98.5% (657 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.8% (666 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/ * Translated using Weblate (Czech) Currently translated at 61.2% (38 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ * Translated using Weblate (Ukrainian) Currently translated at 51.2% (42 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/ * Translated using Weblate (Czech) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ * Translated using Weblate (Galician) Currently translated at 99.8% (666 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (666 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (667 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Ukrainian) Currently translated at 99.6% (306 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/uk/ * Translated using Weblate (Czech) Currently translated at 67.0% (55 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Ukrainian) Currently translated at 97.0% (647 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ * Translated using Weblate (Ukrainian) Currently translated at 97.1% (648 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ * Translated using Weblate (Czech) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Czech) Currently translated at 18.3% (18 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ * Translated using Weblate (Danish) Currently translated at 79.3% (529 of 667 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Czech) Currently translated at 61.2% (60 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ * Translated using Weblate (Occitan) Currently translated at 99.7% (667 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (German) Currently translated at 96.5% (646 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Japanese) Currently translated at 99.7% (667 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (668 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Czech) Currently translated at 99.8% (668 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Corsican) Currently translated at 99.3% (305 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Corsican) Currently translated at 92.2% (617 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Telugu) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Arabic) Currently translated at 91.4% (75 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 92.9% (622 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Danish) Currently translated at 92.8% (91 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Greek) Currently translated at 99.8% (668 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Danish) Currently translated at 82.0% (549 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (668 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Korean) Currently translated at 98.2% (657 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (German) Currently translated at 97.7% (654 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Corsican) Currently translated at 98.5% (659 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/ * Translated using Weblate (French) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Basque) Currently translated at 96.2% (644 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 90.2% (74 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Czech) Currently translated at 99.8% (668 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Asturian) Currently translated at 29.8% (200 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ * Translated using Weblate (Greek) Currently translated at 99.8% (668 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Czech) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ * Translated using Weblate (German) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ * Translated using Weblate (Greek) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ * Translated using Weblate (German) Currently translated at 96.3% (79 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.7% (667 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ * Translated using Weblate (French) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (German) Currently translated at 97.5% (80 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (French) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 100.0% (307 of 307 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (German) Currently translated at 98.7% (81 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.8% (668 of 669 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 98.7% (81 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 98.7% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * i18n-tasks normalize && i18n-tasks remove-unused * yarn manage:translations * re-add simple_form.uk.yml * remove ar.simple_form.hints.defaults.*.one	2018-08-11 14:51:30 +09:00
Marcin Mikołajczak	3d7979c2ca	i18n: Update Polish translation (#8155) ... * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n-tasks normalize && yarn manage:translations	2018-08-11 07:52:36 +09:00
Evgeny Petrov	d2e0818d5a	[RU] Updated translation (#8164)	2018-08-11 06:39:52 +09:00
Thibaut Girka	03afc365d5	Introduce OAuth scopes for bookmarks	2018-08-10 16:49:06 +02:00
Thibaut Girka	7067b64de3	Implement public profile endorsements in glitch-soc ... Port WebUI changes from f2404de871 to glitch-soc	2018-08-10 16:25:46 +02:00
Thibaut Girka	4e66e0ac04	Merge upstream SCSS changes for /about, /about/more and /terms ... Port various commits to glitch-soc, mainly commits 0dcc1950d1 and 5b8603879f.	2018-08-10 16:22:49 +02:00
Thibaut Girka	16a4a333a2	Merge upstream styling for public profile endorsements ... Port the SCSS part of f2404de871 to glitch-soc	2018-08-10 16:22:49 +02:00
Thibaut Girka	e5a603206d	Merge branch 'master' into glitch-soc/merge-upstream ... 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-10 16:22:31 +02:00
Thibaut Girka	90b492143d	Introduce OAuth scopes for bookmarks	2018-08-10 15:26:52 +02:00
Eugen Rochko	5b8603879f	Adjust responsive design for /about/more and /terms (#8158) ... Follow-up to #8142	2018-08-10 06:43:02 +02:00
Aaron Brady	8c279b1648	Update docker-compose to cope with build-time assets (#8156) ... #7780 means that asset compilation happens as a build step. Having the assets and packs volumes defined in `docker-compose.yml` breaks this. For people who run under Docker Compose, I believe this will fix their CSS (which even running the asset recompilation separately did not).	2018-08-09 22:37:48 +02:00
Eugen Rochko	aff6a15061	When follow is removed, remove endorsement (#8149)	2018-08-09 15:24:29 +02:00
Eugen Rochko	0dcc1950d1	Update /terms and /about/more to use public layout (#8142)	2018-08-09 12:58:20 +02:00
Eugen Rochko	f2404de871	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
Evgeny Petrov	80176a3814	[RU] Translation update: (#8147) ... * [RU] Translation update: • Added translation to Welcome timeline • Doorkeeper: changed date format to more common in Russia • Doorkeeper: added translation to scopes • Added translation to Dashboard settings (I didn't have a chance to test it on Live server, so some strings may be a bit incorrect) • Added translation to Relays settings • Added translation to Filters settings • Some other small fixes and improvements * Quoted string for "joined" key to avoid mapping error * [RU] Changed "повторить" (repeat) to "исправить" (change, fix) for a more correct translation. * i18n-tasks normalize	2018-08-09 08:50:42 +02:00
Eugen Rochko	d974c94478	Remove protocol handler registration (#8127) ... Browser UI too confusing / scares people, protocol URIs not used much	2018-08-08 21:12:45 +02:00
Thibaut Girka	7d1dd59496	Good bye, CW rainbows ... Accessibility issues largely outweigh the joke and consistency with upstream.	2018-08-07 18:49:49 +02:00
Mozinet	58cc673882	Update fr.yml for 3 spelling mistakes and a typo (#8135)	2018-08-08 01:02:34 +09:00
Thibaut Girka	c700778922	Scroll to linked status in public status view	2018-08-07 16:58:00 +02:00
ThibG	1ab8b4b8ea	Scroll to linked status in public status view (fixes #7884) (#8130) ... When there is a single detailed status on a public page, scroll to it and replace the history state to not scroll back on refresh (simulates # anchors).	2018-08-06 15:16:02 +02:00
Thibaut Girka	617c3a8006	Restore glitch-soc's 500 characters limit for bios (fixes #625)	2018-08-06 08:20:29 +02:00
Thibaut Girka	5e6cec4a40	Import upstream's emojify function in settings.js ... This fixes updating the profile preview when changing display name.	2018-08-05 12:57:20 +02:00
ThibG	c52bcc0331	Serialize text-less statuses as '.' over OStatus (fixes #7856) (#8126)	2018-08-05 12:22:23 +02:00
Marcin Mikołajczak	23b22d0dff	i18n: Make Polish translation more gender neutral + update (#8119) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-08-03 00:09:24 +02:00
ThibG	dad8a1baf2	Render custom emoji in display name on public profile (#8115)	2018-08-02 15:08:29 +02:00
Thibaut Girka	ed69117048	Fix styling of toot prepended text on public profiles ... Fixes how “Pinned toot”, “… boosted” etc. are styled on public profiles.	2018-08-02 12:43:00 +02:00
ThibG	cf0f8eb742	Merge pull request #621 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-08-02 11:57:52 +02:00
Thibaut Girka	bf1d3ae3b8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/settings.yml	2018-08-01 22:20:25 +02:00
Yamagishi Kazutoshi	4da03a298a	Do not show pinned toots when min_id is set (#8111)	2018-08-01 17:57:02 +02:00
Thibaut Girka	71b318dedc	Delete leftovers from keyword_mutes	2018-08-01 16:49:27 +02:00
ThibG	20e75666b2	Merge pull request #619 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	2018-08-01 15:29:35 +02:00
Thibaut Girka	a0d0111979	Fix toot styling on public pages ... The public pages now use CSS from the WebUI to style toots, but the glitch-soc UI is widely different. Hack around that for now by hardcoding upstream-like values.	2018-08-01 00:18:42 +02:00
Thibaut Girka	7ab46b73bd	Reintroduce glitch-soc avatar styling in public pages	2018-08-01 00:18:42 +02:00
Thibaut Girka	a3dd2deda3	[Glitch] Do not hide hashtag timeline in mobile view, make it full-window ... Port 13ac8ca66a to glitch-soc	2018-08-01 00:18:42 +02:00
Thibaut Girka	175c2155a9	[Glitch] Compensate for scrollbar disappearing when media modal ... Port 60df87f6f0 to glitch-soc	2018-08-01 00:18:42 +02:00
Thibaut Girka	d2b3eebe00	[Glitch] Show media modal on public timeline ... Port e0b1e17bd0 to glitch-soc	2018-08-01 00:18:42 +02:00
Thibaut Girka	5cd7fe21bf	[Glitch] Add missing formatting to the text in hero widget ... Port 1d773b3a46 to glitch-soc	2018-08-01 00:18:42 +02:00
Thibaut Girka	d894cdc93f	Port profile redesign to glitch-soc ... Port bb71538bb5 to glitch-soc	2018-08-01 00:18:42 +02:00
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream ... 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”.	2018-08-01 00:18:13 +02:00
Eugen Rochko	cc56f2230a	Add separate setting for sidebar text (site_short_description) (#8107) ... * Add separate setting for sidebar text (site_short_description) * Fix tests	2018-07-31 18:59:34 +02:00
Thibaut Girka	88b593a63f	Drop glitch-style account bio fields ... Upstream's implementation has been merged a while ago and is the preferred way to set fields, as it is the only one compatible with upstream and is more user-friendly. This commit deletes the legacy glitch-soc FrontMatter functionality in order to clean up the code and make it easier to maintain.	2018-07-31 16:26:36 +02:00