treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
5,387 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

3686 Commits (5975446002d6d653f59c683a37504ffc1b8f1335)

Author SHA1 Message Date
Neetshin 163da9770c 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
 2017-12-20 11:46:25 +09:00
Jeong Arm 7df9864429 Update Korean translation (#6050) 
* Update Korean translation

* Translate Korean for javascript

* Add missing translations on simple_form
 2017-12-20 11:45:50 +09:00
ncls7615 58e3bd4d71 Add en and ja 2017-12-19 20:16:48 +09:00
cwm 5b185a0a0f missed a semicolon 2017-12-17 22:21:15 -06:00
cwm 1dd4e3791f use makeMapStateToProps 2017-12-17 22:00:25 -06:00
cwm d6ca0e29a7 use list-ul icon in list header and web/lists 2017-12-17 21:25:18 -06:00
Jenkins 9dd76b5b41 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-17 03:17:14 +00:00
Peter c9c63c2232 Add Slovak translation (#6052) 
* Add Slovak translation

* Slovak translation: i18n-normalize
 2017-12-17 11:26:42 +09:00
beatrix 978e5e5606 Merge pull request #253 from glitch-soc/prevent-local-only-federation 
prevent federation of local-only statuses
 2017-12-16 09:26:48 -05:00
ncls7615 82bff179f4 fix admin/action_logs page 2017-12-16 20:27:26 +09:00
kibigo! e59d124be5 Fixes #244 to make search results scrollable 2017-12-15 12:49:23 -08:00
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation 
Conflicts:
	db/schema.rb
 2017-12-15 12:20:56 -06:00
NCLS cbc2f1ea5d Update ja.js 2017-12-15 19:43:10 +09:00
NCLS b9d1543f7e Update ja.js 2017-12-15 19:38:13 +09:00
Jenkins 601f0fe4a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-15 01:17:12 +00:00
Eugen Rochko 99a208cd8f Do not hide statuses from silenced accounts from other silenced accounts (#6030) 2017-12-15 01:54:05 +01:00
Naoki Kosaka 7da34ff0a3 Fix oEmbed image_modal src. (#6027) 2017-12-14 23:31:14 +01:00
Eugen Rochko ef8fc3542b Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026) 2017-12-14 21:35:30 +01:00
SerCom_KC 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
Jeroen 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
David Yip 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
Jenkins e3d8c010b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 23:17:15 +00:00
Lynx Kotoura d0a8463db0 Fix focused background color of notifications of direct toots (#6021) 2017-12-14 07:36:29 +09:00
Lynx Kotoura 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
Olivier Humbert 4621fd6461 1 fix + 1 translation (#6019) 2017-12-13 22:58:20 +01:00
Jenkins ac183e024b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 20:17:13 +00:00
Eugen Rochko 1010831783 Fix regression from #6014 (#6018) 2017-12-13 20:33:04 +01:00
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-13 18:17:16 +00:00
Quenty31 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
Eugen Rochko 772456072e Fix layout for RTL (#6014) 2017-12-13 18:28:13 +01:00
Lynx Kotoura 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
Lynx Kotoura 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
Eugen Rochko 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
SerCom_KC 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
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003) 2017-12-13 13:28:31 +01:00
Yamagishi Kazutoshi 7a5e2ffebe Set direction style to reply indicator (#6006) 2017-12-13 12:17:37 +01:00
Eugen Rochko 8c04f9417f Fix redundant HTTP request in FetchLinkCardService (#6002) 2017-12-13 12:15:28 +01:00
Eugen Rochko 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
Eugen Rochko 88aef653ee Fix GIF avatars not autoplaying when GIF autoplay is enabled (#6000) 2017-12-13 12:14:03 +01:00
cwm f464eefc45 code style fixes 2017-12-12 23:07:12 -06:00
cwm 430733477c move list items into an array, don't unnecessarily concat misc nav item 2017-12-12 22:50:20 -06:00
Eugen Rochko 5b2ab607db Fix #5952 - NameError (regression from #5762) (#5999) 
* Fix #5952 - NameError (regression from #5762)

* Fix
 2017-12-13 04:12:38 +01:00
Eugen Rochko 992e8a11fe Adjust empty list timeline message (#5997) 2017-12-13 02:40:32 +01:00
Eugen Rochko 895e3c2e6c Use streaming API for standalone timelines on /about and /tag pages (#5998) 2017-12-13 02:12:41 +01:00
Neetshin 9a7fb53a7f 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
 2017-12-12 19:57:22 +01:00
Akihiko Odaki d67575edea Store preview image for embedded photo in preview cards (#5986) 
The preview image would be useful to embed in timeline.
 2017-12-12 15:54:38 +01:00
cwm 2fa762ef0a travis fixes 2017-12-12 08:50:31 -06:00
Renato "Lond" Cerqueira 15bc3398f7 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>
 2017-12-12 15:12:09 +01:00
Renato "Lond" Cerqueira ab3d248f48 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
 2017-12-12 15:11:13 +01:00
beatrix 82ec368680 Merge pull request #264 from KnzkDev/add-ja 
i18n: Add ja translate
 2017-12-12 08:49:19 -05:00
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2017-12-12 02:54:13 -06:00
cwm 6cbf55ce7b readded connect for onboarding modal 2017-12-12 00:17:07 -06:00
cwm c746388452 remove unneeded imports from getting_started_misc 2017-12-12 00:09:18 -06:00
cwm 975d888f5c add components to getting started column 2017-12-12 00:01:17 -06:00
ncls7615 6bfbeb1fe1 add ja 2017-12-12 13:13:54 +09:00
Akihiko Odaki a90fa13235 Change account_id non-nullable in lists (#5979) 2017-12-12 04:11:17 +01:00
Eugen Rochko d5f4baf720 Improve public status page title (#5985) 2017-12-12 03:56:30 +01:00
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983) 2017-12-12 03:55:39 +01:00
Eugen Rochko 3b69e9b99c Exclude moved accounts from search results (#5984) 2017-12-12 02:14:33 +01:00
cwm 690cd248b1 change pack to 'auth' 2017-12-11 18:14:41 -06:00
cwm 7e8c87e443 load pack 2017-12-11 17:54:40 -06:00
Erin bdf25f5a60 reblog_service.rb: Status#local_only -> local_only? 2017-12-11 17:39:11 -06:00
Erin eb0660f6ef move outbox filtering to Status#permitted_for (as per @ekiru) 2017-12-11 15:28:04 -06:00
Erin 080149acaf post_status_service: stylistic change (local_only -> local_only?) 2017-12-11 15:27:31 -06:00
beatrix af0031fe1b Merge pull request #254 from glitch-soc/new-theme-ux 
New flavour/skin UX
 2017-12-11 09:36:14 -05:00
Eugen Rochko 31fe0d067b Apply a 25x rate limit by IP even to authenticated requests (#5948) 2017-12-11 15:32:29 +01:00
beatrix cb05ff359f Merge pull request #255 from KnzkDev/remove-picture 
Remove getting-started picture
 2017-12-11 09:08:13 -05:00
David Yip b1f803d360 Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController. 2017-12-11 00:17:30 -06:00
ncls7615 58a133978b remove picture 2017-12-11 13:52:17 +09:00
kibigo! d9e1496990 Added styling 2017-12-10 20:32:28 -08:00
kibigo! a1c79ef544 Screenshot support for themes 2017-12-10 20:32:28 -08:00
kibigo! 901c08a999 Moved flavour UI into own prefs tab 2017-12-10 20:32:27 -08:00
beatrix 252de634bb Merge pull request #250 from chriswmartin/fav-confirm-modal 
add favourite confirmation modal
 2017-12-10 23:10:19 -05:00
Erin 6f3321fe4f set local_only in a before_create callback instead of status service 2017-12-10 21:39:27 -06:00
Erin 7fc6f40a88 remove vestigial Status#local_only? definition 2017-12-10 21:25:36 -06:00
Erin c3e84d208c post_status_service.rb: save the status after setting local_only 2017-12-10 20:35:57 -06:00
Erin 278d34a0ec Status#not_local_only scope should match nils too 2017-12-10 20:35:42 -06:00
Erin 3d1bef760d filter local-only toots from AP outboxes 2017-12-10 19:07:43 -06:00
ncls7615 b07111ceba add comma 2017-12-11 09:50:52 +09:00
ncls7615 3e6949b554 " => ' 2017-12-11 09:46:17 +09:00
ncls7615 5cd4e577c2 Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles 
# Conflicts:
#	app/javascript/glitch/locales/ja.json
 2017-12-11 09:43:21 +09:00
Erin b463321c6f filter local-only statuses from public pages 2017-12-10 17:23:01 -06:00
Erin a80c329328 replace reblog service check for an 👁️ with #local_only 2017-12-10 17:12:21 -06:00
Erin d431bb8930 set local_only flag on statuses in post_status_service 2017-12-10 17:04:32 -06:00
Erin 993449ee59 status: stub local_only?, add scope, add marked_local_only? 2017-12-10 17:04:28 -06:00
Erin 5eadff9883 add a local_only column to the statuses table 2017-12-10 16:41:25 -06:00
cwm 2f56e7e00d use single quotes in locale entry 2017-12-10 15:39:23 -06:00
cwm 34630e00cb pulled master, moved locale entry to new location 2017-12-10 15:22:15 -06:00
cwm 06c490be96 removed unneeded actions_modal div 2017-12-10 15:14:56 -06:00
kibigo! bb65adc0c0 Move ja localization to new locaiton 2017-12-10 11:09:59 -08:00
kibigo! b27126f1d6 Linting fixes 2017-12-10 11:08:04 -08:00
kibigo! 853082e760 Only localize js when there's a theme 2017-12-10 11:08:04 -08:00
kibigo! 99e8710095 Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
kibigo! f4c233f59f Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
Andrea Scarpino e8198cd298 Fix account and tag searches with leading/trailing spaces (#5965) 
* Strip leading & trailing spaces from account query

* Strip leading & trailing spaces from tag search
 2017-12-10 19:35:46 +01:00
Lynx Kotoura 188f230f1e Refix extraspace for emojis (#5964) 
Fix misalignment between emoji sizes
 2017-12-10 17:56:05 +01:00
abcang a55211ee5b Save media outside transaction (#5959) 2017-12-10 16:33:52 +01:00
cwm 4b9fa497c6 removed one last app settings addition 2017-12-10 09:25:44 -06:00
cwm 0d6a515145 removed app settings additions 2017-12-10 09:10:47 -06:00
Quenty31 7f56924d71 l10n i18n OC: corrections (#5962) 
* filling missing strings

* Small changes

Better way of saying
+ removed 2 finals dots

* Corrections

* Corrections

Now with final point or without, just like the EN file

* Update oc.json
 2017-12-11 00:07:24 +09:00