]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoWrap <Avatar> in account header in a link to that account's page. Fixes #245.
David Yip [Thu, 21 Dec 2017 11:05:18 +0000 (05:05 -0600)]
Wrap <Avatar> in account header in a link to that account's page.  Fixes #245.

8 years agoRemove themes.default from i18n-tasks unused check
David Yip [Thu, 21 Dec 2017 11:24:17 +0000 (05:24 -0600)]
Remove themes.default from i18n-tasks unused check

This translation key comes in from tootsuite, but the flavours system
does not use it.

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Wed, 20 Dec 2017 08:17:15 +0000 (08:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoRename settingKey in setting_toggle to settingPath (#6046)
Akihiko Odaki [Wed, 20 Dec 2017 07:19:59 +0000 (16:19 +0900)]
Rename settingKey in setting_toggle to settingPath (#6046)

8 years agoReplace <code> to <kbd> in KeyboardShortcuts component (#6049)
Neetshin [Wed, 20 Dec 2017 02:46:25 +0000 (02:46 +0000)]
Replace <code> to <kbd> in KeyboardShortcuts component (#6049)

* Add aria-autocomplete='list' in Textaria

ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete

* Make detect empty string brefore assign upload description

* Change code elements in keyboard-shortcuts component to kbd

8 years agoUpdate Korean translation (#6050)
Jeong Arm [Wed, 20 Dec 2017 02:45:50 +0000 (11:45 +0900)]
Update Korean translation (#6050)

* Update Korean translation

* Translate Korean for javascript

* Add missing translations on simple_form

8 years agoMerge pull request #272 from KnzkDev/add-en-ja
beatrix [Tue, 19 Dec 2017 15:35:02 +0000 (10:35 -0500)]
Merge pull request #272 from KnzkDev/add-en-ja

i18n: Update some locale files

8 years agoAdd en and ja
ncls7615 [Tue, 19 Dec 2017 11:16:48 +0000 (20:16 +0900)]
Add en and ja

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sun, 17 Dec 2017 03:17:14 +0000 (03:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd Slovak translation (#6052)
Peter [Sun, 17 Dec 2017 02:26:42 +0000 (02:26 +0000)]
Add Slovak translation (#6052)

* Add Slovak translation

* Slovak translation: i18n-normalize

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sat, 16 Dec 2017 15:17:12 +0000 (15:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoMerge pull request #253 from glitch-soc/prevent-local-only-federation
beatrix [Sat, 16 Dec 2017 14:26:48 +0000 (09:26 -0500)]
Merge pull request #253 from glitch-soc/prevent-local-only-federation

prevent federation of local-only statuses

8 years agoMerge pull request #270 from KnzkDev/fix/action_logs
beatrix [Sat, 16 Dec 2017 14:25:57 +0000 (09:25 -0500)]
Merge pull request #270 from KnzkDev/fix/action_logs

Fix admin/action_logs page

8 years agofix admin/action_logs page
ncls7615 [Sat, 16 Dec 2017 11:27:26 +0000 (20:27 +0900)]
fix admin/action_logs page

8 years agoFixes #244 to make search results scrollable
kibigo! [Fri, 15 Dec 2017 20:49:23 +0000 (12:49 -0800)]
Fixes #244 to make search results scrollable

8 years agoRemove period from the version number (#6039)
Daigo 3 Dango [Fri, 15 Dec 2017 20:38:25 +0000 (20:38 +0000)]
Remove period from the version number (#6039)

2.1.0. -> 2.1.0

8 years agoMerge branch 'gs-master' into prevent-local-only-federation
David Yip [Fri, 15 Dec 2017 18:20:56 +0000 (12:20 -0600)]
Merge branch 'gs-master' into prevent-local-only-federation

 Conflicts:
db/schema.rb

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Fri, 15 Dec 2017 18:17:14 +0000 (18:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoBump version to 2.1.0 🎆
Eugen Rochko [Fri, 15 Dec 2017 18:14:57 +0000 (19:14 +0100)]
Bump version to 2.1.0 🎆

8 years agoMerge pull request #269 from ncls7615/patch-1
beatrix [Fri, 15 Dec 2017 14:12:54 +0000 (09:12 -0500)]
Merge pull request #269 from ncls7615/patch-1

Update ja.js

8 years agoUpdate ja.js
NCLS [Fri, 15 Dec 2017 10:43:10 +0000 (19:43 +0900)]
Update ja.js

8 years agoUpdate ja.js
NCLS [Fri, 15 Dec 2017 10:38:13 +0000 (19:38 +0900)]
Update ja.js

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Fri, 15 Dec 2017 01:17:12 +0000 (01:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoBump version to 2.1.0rc6
Eugen Rochko [Fri, 15 Dec 2017 01:00:28 +0000 (02:00 +0100)]
Bump version to 2.1.0rc6

8 years agoDo not hide statuses from silenced accounts from other silenced accounts (#6030)
Eugen Rochko [Fri, 15 Dec 2017 00:54:05 +0000 (01:54 +0100)]
Do not hide statuses from silenced accounts from other silenced accounts (#6030)

8 years agoFix oEmbed image_modal src. (#6027)
Naoki Kosaka [Thu, 14 Dec 2017 22:31:14 +0000 (07:31 +0900)]
Fix oEmbed image_modal src. (#6027)

8 years agoFix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
Eugen Rochko [Thu, 14 Dec 2017 20:35:30 +0000 (21:35 +0100)]
Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)

8 years agoImprove Chinese (Simplified) Translations (#6024)
SerCom_KC [Thu, 14 Dec 2017 18:33:29 +0000 (02:33 +0800)]
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

8 years agoLast minute Dutch string updates (#6025)
Jeroen [Thu, 14 Dec 2017 17:45:32 +0000 (18:45 +0100)]
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

8 years agoExamples for Status.as_public_timeline.
David Yip [Thu, 14 Dec 2017 08:57:59 +0000 (02:57 -0600)]
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").

8 years agoExamples for Status#set_locality and .as_tag_timeline.
David Yip [Thu, 14 Dec 2017 08:27:42 +0000 (02:27 -0600)]
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

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Wed, 13 Dec 2017 23:17:15 +0000 (23:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoFix focused background color of notifications of direct toots (#6021)
Lynx Kotoura [Wed, 13 Dec 2017 22:36:29 +0000 (07:36 +0900)]
Fix focused background color of notifications of direct toots (#6021)

8 years agoFix overflowing emojis on some devices (#6016)
Lynx Kotoura [Wed, 13 Dec 2017 21:58:31 +0000 (06:58 +0900)]
Fix overflowing emojis on some devices (#6016)

* Fix overflowing emojis on some devices

* Quit visible and add padding

8 years ago1 fix + 1 translation (#6019)
Olivier Humbert [Wed, 13 Dec 2017 21:58:20 +0000 (22:58 +0100)]
1 fix + 1 translation (#6019)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Wed, 13 Dec 2017 20:17:13 +0000 (20:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoBump version to 2.1.0rc5
Eugen Rochko [Wed, 13 Dec 2017 19:53:39 +0000 (20:53 +0100)]
Bump version to 2.1.0rc5

8 years agoFix regression from #6014 (#6018)
Eugen Rochko [Wed, 13 Dec 2017 19:33:04 +0000 (20:33 +0100)]
Fix regression from #6014 (#6018)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Wed, 13 Dec 2017 18:17:16 +0000 (18:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agol10n OC and FR updates (#6017)
Quenty31 [Wed, 13 Dec 2017 18:17:04 +0000 (19:17 +0100)]
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

8 years agoFix layout for RTL (#6014)
Eugen Rochko [Wed, 13 Dec 2017 17:28:13 +0000 (18:28 +0100)]
Fix layout for RTL (#6014)

8 years agoExcahnge the order of spoiler-input and unlocked warning (#6015)
Lynx Kotoura [Wed, 13 Dec 2017 17:01:56 +0000 (02:01 +0900)]
Excahnge the order of spoiler-input and unlocked warning (#6015)

* Excahnge the order of spoiler-input and unlocked warning

* Fix trailing whitespace

8 years agoUpdate FR translation (#6012)
Olivier Humbert [Wed, 13 Dec 2017 17:00:42 +0000 (18:00 +0100)]
Update FR translation (#6012)

8 years agoRedesign tootbox (#5919)
Lynx Kotoura [Wed, 13 Dec 2017 16:37:23 +0000 (01:37 +0900)]
Redesign tootbox (#5919)

* Redesign tootbox

* Move counter into compose-form__buttons-wrapper

Change font and remove shadow
Refactor sass codes of compose-form

8 years agoWeblate translations (#6011)
Eugen Rochko [Wed, 13 Dec 2017 15:37:15 +0000 (16:37 +0100)]
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

8 years agoUpdate Chinese (Simplified) translations (#6005)
SerCom_KC [Wed, 13 Dec 2017 14:52:40 +0000 (22:52 +0800)]
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

8 years agoMake sure call `done();` in the listener of public timeline for anonymous connection...
nullkal [Wed, 13 Dec 2017 13:27:36 +0000 (22:27 +0900)]
Make sure call `done();` in the listener of public timeline for anonymous connection (#6009)

8 years agoFix the condition in streaming listener (#6008)
nullkal [Wed, 13 Dec 2017 12:42:16 +0000 (21:42 +0900)]
Fix the condition in streaming listener (#6008)

8 years agoAdd filters to admin UI for custom emojis (#6003)
Eugen Rochko [Wed, 13 Dec 2017 12:28:31 +0000 (13:28 +0100)]
Add filters to admin UI for custom emojis (#6003)

8 years agoBump version to 2.1.0rc4
Eugen Rochko [Wed, 13 Dec 2017 11:45:12 +0000 (12:45 +0100)]
Bump version to 2.1.0rc4

8 years agoChange streaming API URL when remote development (#5942)
Yamagishi Kazutoshi [Wed, 13 Dec 2017 11:43:54 +0000 (20:43 +0900)]
Change streaming API URL when remote development (#5942)

* Change streaming API URL when remote development

* Use STREAMING_API_BASE_URL when dev env

8 years agoSet direction style to reply indicator (#6006)
Yamagishi Kazutoshi [Wed, 13 Dec 2017 11:17:37 +0000 (20:17 +0900)]
Set direction style to reply indicator (#6006)

8 years agoFix redundant HTTP request in FetchLinkCardService (#6002)
Eugen Rochko [Wed, 13 Dec 2017 11:15:28 +0000 (12:15 +0100)]
Fix redundant HTTP request in FetchLinkCardService (#6002)

8 years agoClean up admin UI for accounts (#6004)
Eugen Rochko [Wed, 13 Dec 2017 11:15:10 +0000 (12:15 +0100)]
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

8 years agoFix GIF avatars not autoplaying when GIF autoplay is enabled (#6000)
Eugen Rochko [Wed, 13 Dec 2017 11:14:03 +0000 (12:14 +0100)]
Fix GIF avatars not autoplaying when GIF autoplay is enabled (#6000)

8 years agoShorten English title for 2FA to avoid line-break (#6001)
Eugen Rochko [Wed, 13 Dec 2017 06:42:22 +0000 (07:42 +0100)]
Shorten English title for 2FA to avoid line-break (#6001)

8 years agoFix #5952 - NameError (regression from #5762) (#5999)
Eugen Rochko [Wed, 13 Dec 2017 03:12:38 +0000 (04:12 +0100)]
Fix #5952 - NameError (regression from #5762) (#5999)

* Fix #5952 - NameError (regression from #5762)

* Fix

8 years agoAdjust empty list timeline message (#5997)
Eugen Rochko [Wed, 13 Dec 2017 01:40:32 +0000 (02:40 +0100)]
Adjust empty list timeline message (#5997)

8 years agoUse streaming API for standalone timelines on /about and /tag pages (#5998)
Eugen Rochko [Wed, 13 Dec 2017 01:12:41 +0000 (02:12 +0100)]
Use streaming API for standalone timelines on /about and /tag pages (#5998)

8 years agoUpdate: #5985 and #5817 (#5996)
Quenty31 [Tue, 12 Dec 2017 19:48:26 +0000 (20:48 +0100)]
Update: #5985 and #5817 (#5996)

8 years agoImprove error handling in streaming/index.js (#5968)
erin [Tue, 12 Dec 2017 19:19:33 +0000 (13:19 -0600)]
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.

8 years agoMake detect empty string before assign image description (#5994)
Neetshin [Tue, 12 Dec 2017 18:57:22 +0000 (18:57 +0000)]
Make detect empty string before assign image description (#5994)

* Add aria-autocomplete='list' in Textaria

ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete

* Make detect empty string brefore assign upload description

8 years agoRemove duplicate indexes in lists (#5990)
abcang [Tue, 12 Dec 2017 16:38:42 +0000 (01:38 +0900)]
Remove duplicate indexes in lists (#5990)

8 years agoStore preview image for embedded photo in preview cards (#5986)
Akihiko Odaki [Tue, 12 Dec 2017 14:54:38 +0000 (23:54 +0900)]
Store preview image for embedded photo in preview cards (#5986)

The preview image would be useful to embed in timeline.

8 years agoMerge pull request #263 from KnzkDev/optimize-paperclip
beatrix [Tue, 12 Dec 2017 14:15:52 +0000 (09:15 -0500)]
Merge pull request #263 from KnzkDev/optimize-paperclip

Optimizing paperclip

8 years agoUpdate Chinese (Simplified) translations (#5991)
SerCom_KC [Tue, 12 Dec 2017 14:13:47 +0000 (22:13 +0800)]
Update Chinese (Simplified) translations (#5991)

* i18n: (zh-CN) Update translations for #5817

* i18n: (zh-CN) Add translation for #5985

* i18n: (zh-CN) Normalization

8 years agomake it possible to stream public timelines without authorization (#5977)
nullkal [Tue, 12 Dec 2017 14:13:24 +0000 (23:13 +0900)]
make it possible to stream public timelines without authorization (#5977)

* make it possible to stream public timelines without authorization

* Fix

* Make eslint allow `value == null`

* Remove redundant line

* Improve style and revert .eslintrc.yml

* Fix streamWsEnd

* Show IP address instead of (anonymous user)

* Add missing semicolon

8 years agoReturn false if object does not respond to url (#5988)
Renato "Lond" Cerqueira [Tue, 12 Dec 2017 14:12:09 +0000 (15:12 +0100)]
Return false if object does not respond to url (#5988)

Avoid error when the service returns a mostly valid oembed, but has no
url in it, causing a MethodError: undefined method `url'
for #<OEmbed::Response::Photo:0x000056505def9620>

8 years agoChange conditional to avoid nil into string error in sidekiq (#5987)
Renato "Lond" Cerqueira [Tue, 12 Dec 2017 14:11:13 +0000 (15:11 +0100)]
Change conditional to avoid nil into string error in sidekiq (#5987)

* Change conditional to avoid nil into string error in sidekiq
When obtaining information about users with mastodon in a different
subdomain, sidekiq was giving out a 'no implicit conversion of nil into String'

* Use presence instead of blank? with ternary.
Following suggestion on PR

8 years agoMove files for GitHub to .github directory (#5989)
Yamagishi Kazutoshi [Tue, 12 Dec 2017 14:10:12 +0000 (23:10 +0900)]
Move files for GitHub to .github directory (#5989)

8 years agoMerge pull request #264 from KnzkDev/add-ja
beatrix [Tue, 12 Dec 2017 13:49:19 +0000 (08:49 -0500)]
Merge pull request #264 from KnzkDev/add-ja

i18n: Add ja translate

8 years agoRemove themes.default from nl and pt-BR locales.
David Yip [Tue, 12 Dec 2017 09:28:15 +0000 (03:28 -0600)]
Remove themes.default from nl and pt-BR locales.

This translation has been supplanted by the flavours-related
translations.

8 years agoMerge remote-tracking branch 'tootsuite/master' into merge-upstream
David Yip [Tue, 12 Dec 2017 08:54:13 +0000 (02:54 -0600)]
Merge remote-tracking branch 'tootsuite/master' into merge-upstream

8 years agoadd ja
ncls7615 [Tue, 12 Dec 2017 04:13:54 +0000 (13:13 +0900)]
add ja

8 years agoadd ja for fav conf
ncls7615 [Tue, 12 Dec 2017 04:05:48 +0000 (13:05 +0900)]
add ja for fav conf

8 years agoMerge pull request #262 from chriswmartin/fix-oauth-pack
Gô Shoemake [Tue, 12 Dec 2017 03:34:19 +0000 (19:34 -0800)]
Merge pull request #262 from chriswmartin/fix-oauth-pack

Add missing set pack to authorizations_controller

8 years agooptimize paperclip
ncls7615 [Tue, 12 Dec 2017 03:29:09 +0000 (12:29 +0900)]
optimize paperclip

8 years agoChange account_id non-nullable in lists (#5979)
Akihiko Odaki [Tue, 12 Dec 2017 03:11:17 +0000 (12:11 +0900)]
Change account_id non-nullable in lists (#5979)

8 years agoImprove public status page title (#5985)
Eugen Rochko [Tue, 12 Dec 2017 02:56:30 +0000 (03:56 +0100)]
Improve public status page title (#5985)

8 years agoFix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
Eugen Rochko [Tue, 12 Dec 2017 02:55:39 +0000 (03:55 +0100)]
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)

8 years agoExclude moved accounts from search results (#5984)
Eugen Rochko [Tue, 12 Dec 2017 01:14:33 +0000 (02:14 +0100)]
Exclude moved accounts from search results (#5984)

8 years agochange pack to 'auth'
cwm [Tue, 12 Dec 2017 00:14:41 +0000 (18:14 -0600)]
change pack to 'auth'

8 years agoload pack
cwm [Mon, 11 Dec 2017 23:54:40 +0000 (17:54 -0600)]
load pack

8 years agoreblog_service.rb: Status#local_only -> local_only?
Erin [Mon, 11 Dec 2017 23:39:11 +0000 (17:39 -0600)]
reblog_service.rb: Status#local_only -> local_only?

8 years agomove outbox filtering to Status#permitted_for (as per @ekiru)
Erin [Mon, 11 Dec 2017 21:28:04 +0000 (15:28 -0600)]
move outbox filtering to Status#permitted_for (as per @ekiru)

8 years agopost_status_service: stylistic change (local_only -> local_only?)
Erin [Mon, 11 Dec 2017 21:27:31 +0000 (15:27 -0600)]
post_status_service: stylistic change (local_only -> local_only?)

8 years agoTiny little change (#5981)
Quenty31 [Mon, 11 Dec 2017 19:53:29 +0000 (20:53 +0100)]
Tiny little change (#5981)

8 years agoFixed index in webpack config
kibigo! [Mon, 11 Dec 2017 18:45:21 +0000 (10:45 -0800)]
Fixed index in webpack config

8 years agoMerge pull request #259 from KnzkDev/flavours-ja
beatrix [Mon, 11 Dec 2017 15:56:41 +0000 (10:56 -0500)]
Merge pull request #259 from KnzkDev/flavours-ja

i18n: Add ja translate for flavour/skin ux

8 years agoadd ja
ncls7615 [Mon, 11 Dec 2017 15:28:33 +0000 (00:28 +0900)]
add ja

8 years agoMerge pull request #254 from glitch-soc/new-theme-ux
beatrix [Mon, 11 Dec 2017 14:36:14 +0000 (09:36 -0500)]
Merge pull request #254 from glitch-soc/new-theme-ux

New flavour/skin UX

8 years agoApply a 25x rate limit by IP even to authenticated requests (#5948)
Eugen Rochko [Mon, 11 Dec 2017 14:32:29 +0000 (15:32 +0100)]
Apply a 25x rate limit by IP even to authenticated requests (#5948)

8 years agoMerge pull request #255 from KnzkDev/remove-picture
beatrix [Mon, 11 Dec 2017 14:08:13 +0000 (09:08 -0500)]
Merge pull request #255 from KnzkDev/remove-picture

Remove getting-started picture

8 years agoRemove preview_card fabricator (#5975)
Akihiko Odaki [Mon, 11 Dec 2017 13:22:08 +0000 (22:22 +0900)]
Remove preview_card fabricator (#5975)

preview_card fabricator has a removed attribute, status, and is no longer
functional.

8 years agoAdd missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
David Yip [Mon, 11 Dec 2017 06:17:30 +0000 (00:17 -0600)]
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.

8 years agoremove picture
ncls7615 [Mon, 11 Dec 2017 04:52:17 +0000 (13:52 +0900)]
remove picture

8 years agoAdd Rake task to backfill local-only flag (#253)
David Yip [Mon, 11 Dec 2017 04:49:59 +0000 (22:49 -0600)]
Add Rake task to backfill local-only flag (#253)

8 years agoAdded styling
kibigo! [Mon, 11 Dec 2017 04:24:11 +0000 (20:24 -0800)]
Added styling

8 years agoScreenshot support for themes
kibigo! [Mon, 11 Dec 2017 04:15:09 +0000 (20:15 -0800)]
Screenshot support for themes

8 years agoMoved flavour UI into own prefs tab
kibigo! [Mon, 11 Dec 2017 01:56:17 +0000 (17:56 -0800)]
Moved flavour UI into own prefs tab