fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-17 15:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
5322 commits 130 branches 269 tags 981 MiB
Commit graph

5322 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SerCom_KC 775c3056b6 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
nullkal ccf4f170de Make sure call done(); in the listener of public timeline for anonymous connection (#6009) 2017-12-13 14:27:36 +01:00
nullkal 90e7da16a0 Fix the condition in streaming listener (#6008) 2017-12-13 13:42:16 +01:00
Eugen Rochko ad75ec8b5b
Add filters to admin UI for custom emojis (#6003) 2017-12-13 13:28:31 +01:00
Eugen Rochko 57fcc21a86
Bump version to 2.1.0rc4 2017-12-13 12:45:12 +01:00
Yamagishi Kazutoshi 6855baa0c5 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
Yamagishi Kazutoshi 07b4427865 Set direction style to reply indicator (#6006) 2017-12-13 12:17:37 +01:00
Eugen Rochko a8deb6648b
Fix redundant HTTP request in FetchLinkCardService (#6002) 2017-12-13 12:15:28 +01:00
Eugen Rochko 20a6584d2d
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 155e211dd0
Fix GIF avatars not autoplaying when GIF autoplay is enabled (#6000) 2017-12-13 12:14:03 +01:00
Eugen Rochko 81923f88ba Shorten English title for 2FA to avoid line-break (#6001) 2017-12-13 15:42:22 +09:00
Eugen Rochko 5706fe18c2
Fix #5952 - NameError (regression from #5762) (#5999) 
* Fix #5952 - NameError (regression from #5762)

* Fix
 2017-12-13 04:12:38 +01:00
Eugen Rochko 71965cbef2
Adjust empty list timeline message (#5997) 2017-12-13 02:40:32 +01:00
Eugen Rochko 0128b86d30
Use streaming API for standalone timelines on /about and /tag pages (#5998) 2017-12-13 02:12:41 +01:00
Quenty31 0370ba7b0a Update: #5985 and #5817 (#5996) 2017-12-12 20:48:26 +01:00
erin c986218c3a 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
Neetshin 0c8b1eb577 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
abcang cfa3f55221 Remove duplicate indexes in lists (#5990) 2017-12-12 17:38:42 +01:00
Akihiko Odaki f9f6918148 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
beatrix 65d083338d
Merge pull request #263 from KnzkDev/optimize-paperclip 
Optimizing paperclip
 2017-12-12 09:15:52 -05:00
SerCom_KC 2a61b9f000 Update Chinese (Simplified) translations (#5991) 
* i18n: (zh-CN) Update translations for #5817

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

* i18n: (zh-CN) Normalization
 2017-12-12 15:13:47 +01:00
nullkal cfea28216f 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
 2017-12-12 15:13:24 +01:00
Renato "Lond" Cerqueira 19257d91bf 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 fe180f18ff 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
Yamagishi Kazutoshi 1486fd64cc Move files for GitHub to .github directory (#5989) 2017-12-12 15:10:12 +01:00
beatrix 504c3d650f
Merge pull request #264 from KnzkDev/add-ja 
i18n: Add ja translate
 2017-12-12 08:49:19 -05:00
David Yip be33247235
Remove themes.default from nl and pt-BR locales. 
This translation has been supplanted by the flavours-related
translations.
 2017-12-12 03:28:15 -06:00
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2017-12-12 02:54:13 -06:00
ncls7615 b93ad3d0e8 add ja 2017-12-12 13:13:54 +09:00
ncls7615 c0c4526283 add ja for fav conf 2017-12-12 13:05:48 +09:00
Gô Shoemake 04eaa1943f
Merge pull request #262 from chriswmartin/fix-oauth-pack 
Add missing set pack to authorizations_controller
 2017-12-11 19:34:19 -08:00
ncls7615 c95af71da5 optimize paperclip 2017-12-12 12:29:09 +09:00
Akihiko Odaki 14c4a33cd9 Change account_id non-nullable in lists (#5979) 2017-12-12 04:11:17 +01:00
Eugen Rochko 30d2ea03b0
Improve public status page title (#5985) 2017-12-12 03:56:30 +01:00
Eugen Rochko 1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983) 2017-12-12 03:55:39 +01:00
Eugen Rochko 481fac7c84
Exclude moved accounts from search results (#5984) 2017-12-12 02:14:33 +01:00
cwm 0a52e37648 change pack to 'auth' 2017-12-11 18:14:41 -06:00
cwm 44992df257 load pack 2017-12-11 17:54:40 -06:00
Erin 2efffe77dc reblog_service.rb: Status#local_only -> local_only? 2017-12-11 17:39:11 -06:00
Erin c5a4eda694 move outbox filtering to Status#permitted_for (as per @ekiru) 2017-12-11 15:28:04 -06:00
Erin 3ec47e732b post_status_service: stylistic change (local_only -> local_only?) 2017-12-11 15:27:31 -06:00
Quenty31 c588fcf4bc Tiny little change (#5981) 2017-12-11 20:53:29 +01:00
kibigo! 8aa527434c Fixed index in webpack config 2017-12-11 10:45:21 -08:00
beatrix 7d024a6b68
Merge pull request #259 from KnzkDev/flavours-ja 
i18n: Add ja translate for flavour/skin ux
 2017-12-11 10:56:41 -05:00
ncls7615 d8206d1931 add ja 2017-12-12 00:28:33 +09:00
beatrix 771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux 
New flavour/skin UX
 2017-12-11 09:36:14 -05:00
Eugen Rochko feed07227b
Apply a 25x rate limit by IP even to authenticated requests (#5948) 2017-12-11 15:32:29 +01:00
beatrix 0cd5f2a61f
Merge pull request #255 from KnzkDev/remove-picture 
Remove getting-started picture
 2017-12-11 09:08:13 -05:00
Akihiko Odaki e56323a4dd Remove preview_card fabricator (#5975) 
preview_card fabricator has a removed attribute, status, and is no longer
functional.
 2017-12-11 22:22:08 +09:00
David Yip 204688e803
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController. 2017-12-11 00:17:30 -06:00