8275 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ThibG	f109867578	Fix “slow mode” issues (#11859) ... * Fix weird scroll-jumping behavior with pending items * Treat pending items as unread items * Fix scroll position being altered because of the “X new items” button	2019-09-16 15:45:06 +02:00
Eugen Rochko	5eff29b28c	Fix pre-review confirmation e-mail saying you can't login (#11860) ... Fix #11419	2019-09-16 15:44:52 +02:00
Eugen Rochko	692fe477b4	New Crowdin translations (#11799) ... * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Kazakh) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Estonian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Norwegian Nynorsk) [ci skip] * New translations simple_form.en.yml (Norwegian Nynorsk) [ci skip] * New translations activerecord.en.yml (Norwegian Nynorsk) [ci skip] * New translations devise.en.yml (Norwegian Nynorsk) [ci skip] * New translations doorkeeper.en.yml (Norwegian Nynorsk) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Breton) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Breton) [ci skip] * New translations devise.en.yml (Breton) [ci skip] * New translations simple_form.en.yml (Breton) [ci skip] * New translations en.yml (Breton) [ci skip] * New translations activerecord.en.yml (Breton) [ci skip] * New translations devise.en.yml (Asturian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations activerecord.en.yml (Asturian) [ci skip] * New translations devise.en.yml (Russian) [ci skip] * New translations activerecord.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations devise.en.yml (Norwegian) [ci skip] * New translations activerecord.en.yml (Norwegian) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations devise.en.yml (Serbian (Latin)) [ci skip] * New translations devise.en.yml (Ukrainian) [ci skip] * New translations activerecord.en.yml (Ukrainian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations devise.en.yml (Slovak) [ci skip] * New translations activerecord.en.yml (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations activerecord.en.yml (Serbian (Latin)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations devise.en.yml (Serbian (Cyrillic)) [ci skip] * New translations activerecord.en.yml (Serbian (Cyrillic)) [ci skip] * New translations activerecord.en.yml (Indonesian) [ci skip] * New translations devise.en.yml (Georgian) [ci skip] * New translations activerecord.en.yml (Georgian) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations devise.en.yml (Croatian) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations devise.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations activerecord.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations devise.en.yml (Bulgarian) [ci skip] * New translations activerecord.en.yml (Bulgarian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations devise.en.yml (Indonesian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations devise.en.yml (Ido) [ci skip] * New translations en.json (Ido) [ci skip] * New translations devise.en.yml (Hebrew) [ci skip] * New translations activerecord.en.yml (Hebrew) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.json (Norwegian Nynorsk) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Portuguese) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Czech) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Danish) [ci skip] * i18n-tasks normalize * yarn manage:translations	2019-09-16 15:11:01 +02:00
ThibG	524187b653	Fix expiring polls not being displayed as such in the WebUI (#11835) ... * Fix expiring polls not being displayed as such in the WebUI * Reset expiration state and timer when a poll changes * Refactor timer logic in `_setupTimer`, only set expiration if props have changed * Refactor and do not use deprecated React lifecycles	2019-09-16 14:32:26 +02:00
dependabot-preview[bot]	1882ca673d	Bump webmock from 3.7.1 to 3.7.3 (#11853) ... Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.1 to 3.7.3. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.7.1...v3.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-16 14:30:29 +02:00
dependabot-preview[bot]	c4907c9d99	Bump tzinfo-data from 1.2019.2 to 1.2019.3 (#11857) ... Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2019.2 to 1.2019.3. - [Release notes](https://github.com/tzinfo/tzinfo-data/releases) - [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.2...v1.2019.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-16 14:29:44 +02:00
dependabot-preview[bot]	b0148d4c05	Bump faker from 2.2.2 to 2.3.0 (#11858) ... Bumps [faker](https://github.com/faker-ruby/faker) from 2.2.2 to 2.3.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v2.2.2...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-16 14:29:29 +02:00
mayaeh	ef0d22f232	Add search and sort functions to hashtag admin UI (#11829) ... * Add search and sort functions to hashtag admin UI * Move scope processing from tags_controller to tag_filter * Fix based on method naming conventions * Fixed not to get 500 errors for invalid requests	2019-09-16 14:27:29 +02:00
Takeshi Umeda	b7420b8643	Change dashboard to short number notation (#11847) ... * Add short numeric notation to the dashboard * Fix i18n * Fix to embed units in code * Remove settings and always use short notation * Remove misplaced test lines * Fit to other pages	2019-09-16 14:26:16 +02:00
dependabot-preview[bot]	73fa0a7b13	Bump puma from 4.1.0 to 4.1.1 (#11855) ... Bumps [puma](https://github.com/puma/puma) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.1.0...v4.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-16 14:25:37 +02:00
dependabot-preview[bot]	b2acbb62f6	Bump es6-symbol from 3.1.1 to 3.1.2 (#11851) ... Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/medikoo/es6-symbol/releases) - [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md) - [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.1...v3.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-16 19:16:02 +09:00
dependabot-preview[bot]	08ba494578	Bump eslint-plugin-import from 2.18.0 to 2.18.2 (#11849) ... Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.0 to 2.18.2. - [Release notes](https://github.com/benmosher/eslint-plugin-import/releases) - [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md) - [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.0...v2.18.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2019-09-16 19:15:21 +09:00
Eugen Rochko	c707ef49d9	Fix 2FA challenge and password challenge for non-database users (#11831) ... * Fix 2FA challenge not appearing for non-database users Fix #11685 * Fix account deletion not working when using external login Fix #11691	2019-09-15 21:08:39 +02:00
mayaeh	1511638975	Change the hashtag link from WebUI to public page (#11845)	2019-09-15 15:48:00 +02:00
Eugen Rochko	e41527f505	Update Crowdin configuration file	2019-09-14 11:40:13 +02:00
Eugen Rochko	a31b89dd71	Revert "Bump webpush from 0.3.8 to 1.0.0 (#11614)" (#11840) ... This reverts commit 9045f5e3f8.	2019-09-14 10:36:10 +02:00
Darius Kazemi	df3a42c4f2	Merge branch 'hometown-dev' of github.com:hometown-fork/hometown into hometown-dev	2019-09-13 20:28:09 -07:00
Darius Kazemi	7d7712e1ba	Fixing header CSS for rich text statuses ... Making the headers larger in font size, and differentiating the h1 and h2 headers.	2019-09-13 20:27:32 -07:00
ThibG	c00ab575b7	Fix media description button being disabled at 420 characters instead of 1500 (#11836)	2019-09-14 00:52:56 +02:00
Emma Winston	f10703ae07	Remove share intent button for local-only posts - closes #12	2019-09-13 22:37:40 +01:00
Eugen Rochko	cfd4c55c88	Fix profile fields overflowing page width (#11828) ... Fix #11720	2019-09-13 19:15:59 +02:00
Eugen Rochko	e8703c281e	Fix web push subscriptions being deleted on rate limit or timeout (#11826)	2019-09-13 19:15:47 +02:00
Eugen Rochko	18331fefa2	Remove deprecated GET /api/v1/search API (#11823) ... Use `GET /api/v2/search` instead	2019-09-13 16:11:13 +02:00
ThibG	cf2b708e6b	Fix display of long poll options (#11717)	2019-09-13 16:04:09 +02:00
ThibG	225edac118	Change /api/v1/timelines/public to require auth when public preview is off (#11802) ... Fixes #11289	2019-09-13 16:03:46 +02:00
Yamagishi Kazutoshi	4e1b742cb2	Change rate limit for media proxy (#11814)	2019-09-13 16:02:52 +02:00
Eugen Rochko	50edf84898	Fix search API not resolving URL when type is given (#11822) ... Fix #11771	2019-09-13 16:01:39 +02:00
Eugen Rochko	0762258aec	Fix hashtags being split by ZWNJ character (#11821) ... Fix #11761	2019-09-13 16:01:26 +02:00
Eugen Rochko	59da5ccb8e	Change unlisted custom emoji to not appear in autosuggestions (#11818) ... Fix #11669	2019-09-13 16:01:09 +02:00
Eugen Rochko	45f44ef4d3	Fix unused CSS (#11824) ... Fix #11689	2019-09-13 16:00:47 +02:00
Eugen Rochko	b6381bdc7d	Change max length of media descriptions from 420 to 1500 characters (#11819) ... Fix #11658	2019-09-13 16:00:34 +02:00
Eugen Rochko	bc869501f5	Fix name of Portuguese language not including Portugal (#11820) ... Fix #11602	2019-09-13 16:00:19 +02:00
Emma Winston	5406acd04b	Welcome email now welcomes you to your instance title, not to mastodon	2019-09-13 02:36:45 +01:00
Emma Winston	4b7548c760	rewording text to be more specific to platforms/hometown	2019-09-13 01:54:58 +01:00
Emma Winston	639a883d9b	Changing some mentions of 'Mastodon' to either be specific to the instance or general to the fediverse	2019-09-13 01:43:51 +01:00
Emma Winston	d904046775	Swapping out Mastodon for site title in sessions, noscript and backup confirmation message	2019-09-13 01:09:33 +01:00
Emma Winston	288709e430	change 'Mastodon' to site name on signup page	2019-09-13 00:53:29 +01:00
Emma Winston	0eeb168bbe	reworded 'the visually impaired' to 'visually impaired users' ... It's less clunky and dated language, and Darius said I could do it	2019-09-13 00:06:19 +01:00
Emma Winston	6ae391bbb3	Making more toots into posts	2019-09-12 23:52:17 +01:00
Emma Winston	30db0c5ee2	'Back to Mastodon' is now 'Back home', and posts are now toots in British English	2019-09-12 23:08:06 +01:00
Emma Winston	b43b748813	'Back to Mastodon' is now 'Back home', and posts are now toots in US English	2019-09-12 23:05:30 +01:00
Eugen Rochko	50755a47b4	Fix scroll position resetting when opening media modals in web UI (#11815)	2019-09-12 20:14:59 +02:00
Darius Kazemi	44486bdada	Merge pull request #17 from emmawinston/spoiler-tag-syntax-fix ... Corrects syntax for spoiler tags to valid HTML (fixes #10)	2019-09-12 10:48:37 -07:00
Emma Winston	e5cd6d0cda	Corrects syntax for spoiler tags to valid HTML (fixes #10)	2019-09-12 18:16:59 +01:00
Eugen Rochko	9361981388	Add missing locale file for ga and add rake task to check for it (#11813) ... * Add missing locale file for ga and add rake task to check for it * Update lib/tasks/repo.rake Co-Authored-By: Yamagishi Kazutoshi <ykzts@desire.sh> * Fix check-i18n build	2019-09-12 04:58:33 +02:00
Eugen Rochko	16cdaa1110	Fix uncaught errors in media proxy controller (#11811)	2019-09-12 01:51:12 +02:00
Eugen Rochko	3a3b40e0c3	Fix nil error in warning e-mail template (#11812)	2019-09-12 01:51:01 +02:00
Eugen Rochko	c5d37f18cb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) ... Change all account actions except "none" to resolve all unresolved reports Refactor `SuspendAccountService` to be more readable	2019-09-11 16:32:44 +02:00
Tao Bror Bojlén	4fe127664b	add admin setting for default search engine indexing (fix #11750) (#11804)	2019-09-11 08:44:58 +02:00
Darius Kazemi	4ba1695ae3	Indicate version number in link footer.	2019-09-10 14:10:42 -07:00