82bff179f4
fix admin/action_logs page
2017-12-16 20:27:26 +09:00
e59d124be5
Fixes #244 to make search results scrollable
2017-12-15 12:49:23 -08:00
64ae134e7b
Remove period from the version number ( #6039 )
...
2.1.0. -> 2.1.0
2017-12-15 21:38:25 +01:00
d53f727653
Merge branch 'gs-master' into prevent-local-only-federation
...
Conflicts:
db/schema.rb
2017-12-15 12:20:56 -06:00
ebfca67b98
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 18:17:14 +00:00
b23c9ab7de
Bump version to 2.1.0 🎆
2017-12-15 19:14:57 +01:00
c0419dcea8
Merge pull request #269 from ncls7615/patch-1
...
Update ja.js
2017-12-15 09:12:54 -05:00
cbc2f1ea5d
Update ja.js
2017-12-15 19:43:10 +09:00
b9d1543f7e
Update ja.js
2017-12-15 19:38:13 +09:00
601f0fe4a3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-15 01:17:12 +00:00
1079099d2b
Bump version to 2.1.0rc6
2017-12-15 02:00:28 +01:00
99a208cd8f
Do not hide statuses from silenced accounts from other silenced accounts ( #6030 )
2017-12-15 01:54:05 +01:00
7da34ff0a3
Fix oEmbed image_modal src. ( #6027 )
2017-12-14 23:31:14 +01:00
ef8fc3542b
Fix #6022 - Prevent nested migrated accounts, or migrations to self ( #6026 )
2017-12-14 21:35:30 +01:00
19a2ed9a04
Improve Chinese (Simplified) Translations ( #6024 )
...
* i18n: (zh-CN) Change `工作人员` (staff) to `管理人员`
Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109
* i18n: (zh-CN) Change `协管` to `监察员`
* i18n: (zh-CN) Fix all "Are you" questions
* i18n: (zh-CN) Various improvements
* i18n: (zh-CN) Final clean-up
* i18n: (zh-CN) Change translation for 500
* i18n: (zh-CN) Remove spaces between time distances
* i18n: (zh-CN) Improve translations
2017-12-14 19:33:29 +01:00
0cadfd35a5
Last minute Dutch string updates ( #6025 )
...
* Last minute Dutch strinfupdate
* Last minute Dutch strings update
* Fixing Weblate output errors
* Fixing Weblate output errors
* Fixing more Weblate rubish
Weblate is also changing some " to ' - I think that is not a problem
* Fixing more weblate stuff
* Fixing
* Update nl.yml
2017-12-14 18:45:32 +01:00
634f0481c3
Examples for Status.as_public_timeline.
...
Also adjust the examples for Status.as_tag_timeline to match the
nomenclature used in .as_public_timeline (e.g. "account" -> "viewer").
2017-12-14 02:57:59 -06:00
b8e6074c53
Examples for Status#set_locality and .as_tag_timeline.
...
This commit also:
- exposes the local-only emoji so that it can be used in examples
- allows local_only to be set explicitly, i.e. for timeline filtering
specs
2017-12-14 02:27:42 -06:00
e3d8c010b1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 23:17:15 +00:00
d0a8463db0
Fix focused background color of notifications of direct toots ( #6021 )
2017-12-14 07:36:29 +09:00
891b03536f
Fix overflowing emojis on some devices ( #6016 )
...
* Fix overflowing emojis on some devices
* Quit visible and add padding
2017-12-13 22:58:31 +01:00
4621fd6461
1 fix + 1 translation ( #6019 )
2017-12-13 22:58:20 +01:00
ac183e024b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 20:17:13 +00:00
d4849787c5
Bump version to 2.1.0rc5
2017-12-13 20:53:39 +01:00
1010831783
Fix regression from #6014 ( #6018 )
2017-12-13 20:33:04 +01:00
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-13 18:17:16 +00:00
10c0745c8f
l10n OC and FR updates ( #6017 )
...
* Adjust empty list timeline message (#5997 )
* Adjust empty list timeline message (#5997 )
* Add filters to admin UI for custom emojis (#6003 ) + #6004
* Update fr.yml
2017-12-14 03:17:04 +09:00
772456072e
Fix layout for RTL ( #6014 )
2017-12-13 18:28:13 +01:00
cbf6bd4e0c
Excahnge the order of spoiler-input and unlocked warning ( #6015 )
...
* Excahnge the order of spoiler-input and unlocked warning
* Fix trailing whitespace
2017-12-13 18:01:56 +01:00
9b24e2ef34
Update FR translation ( #6012 )
2017-12-13 18:00:42 +01:00
d7bd1906d4
Redesign tootbox ( #5919 )
...
* Redesign tootbox
* Move counter into compose-form__buttons-wrapper
Change font and remove shadow
Refactor sass codes of compose-form
2017-12-13 17:37:23 +01:00
d4d0befb4b
Weblate translations ( #6011 )
...
* Translated using Weblate (Dutch)
Currently translated at 100.0% (522 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (French)
Currently translated at 99.8% (521 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 99.4% (519 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (519 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Arabic)
Currently translated at 40.0% (209 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Polish)
Currently translated at 99.8% (521 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Added translation using Weblate (Galician)
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.0% (517 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Galician)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 22.6% (17 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Portuguese)
Currently translated at 66.0% (37 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (520 of 522 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 48.8% (21 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Arabic)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Portuguese)
Currently translated at 73.2% (41 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/
* i18n-tasks normalize && yarn manage:translations
* Restore wrongfully deleted files
2017-12-13 16:37:15 +01:00
9bef4eb4c0
Update Chinese (Simplified) translations ( #6005 )
...
* i18n: (zh-CN) Remove spaces in time distances
* i18n: (zh-CN) Update translations for #5997
* i18n: (zh-CN) Add translation for #6004
also change translation of `staff` from `管理员` to `工作人员`
* i18n: (zh-CN) Add translations for #6003
* i18n: (zh-CN) Normalization
2017-12-13 15:52:40 +01:00
c40537c6ff
Make sure call `done();` in the listener of public timeline for anonymous connection ( #6009 )
2017-12-13 14:27:36 +01:00
44fb9f8030
Fix the condition in streaming listener ( #6008 )
2017-12-13 13:42:16 +01:00
d6088c5308
Add filters to admin UI for custom emojis ( #6003 )
2017-12-13 13:28:31 +01:00
cae49f11c7
Bump version to 2.1.0rc4
2017-12-13 12:45:12 +01:00
9dcead778c
Change streaming API URL when remote development ( #5942 )
...
* Change streaming API URL when remote development
* Use STREAMING_API_BASE_URL when dev env
2017-12-13 12:43:54 +01:00
7a5e2ffebe
Set direction style to reply indicator ( #6006 )
2017-12-13 12:17:37 +01:00
8c04f9417f
Fix redundant HTTP request in FetchLinkCardService ( #6002 )
2017-12-13 12:15:28 +01:00
aea3d0814b
Clean up admin UI for accounts ( #6004 )
...
* 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-13 12:15:10 +01:00
88aef653ee
Fix GIF avatars not autoplaying when GIF autoplay is enabled ( #6000 )
2017-12-13 12:14:03 +01:00
4e780addd3
Shorten English title for 2FA to avoid line-break ( #6001 )
2017-12-13 15:42:22 +09:00
f464eefc45
code style fixes
2017-12-12 23:07:12 -06:00
430733477c
move list items into an array, don't unnecessarily concat misc nav item
2017-12-12 22:50:20 -06:00
5b2ab607db
Fix #5952 - NameError (regression from #5762 ) ( #5999 )
...
* Fix #5952 - NameError (regression from #5762 )
* Fix
2017-12-13 04:12:38 +01:00
992e8a11fe
Adjust empty list timeline message ( #5997 )
2017-12-13 02:40:32 +01:00
895e3c2e6c
Use streaming API for standalone timelines on /about and /tag pages ( #5998 )
2017-12-13 02:12:41 +01:00
84de19e1fd
Update: #5985 and #5817 ( #5996 )
2017-12-12 20:48:26 +01:00
d0f4496805
Improve error handling in streaming/index.js ( #5968 )
...
On an unhandled worker exception, we should log the exception
and exit with nonzero status, instead of letting workers
silently fail and restarting them in an endless loop.
Note: we previously tried to handle the `'error'` signal.
That's not a signal Node fires; my patch traps `'uncaughtException'`,
which is what the code was _trying_ to do.
2017-12-12 20:19:33 +01:00
ncls7615