aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,243 Commits
151 Branches
284 Tags
1.0 GiB
Commit Graph

3243 Commits (e859d6f259cfe4aa61c2e68a18db95d34d460b81)
 

Author SHA1 Message Date
Naoki Kosaka e859d6f259 Fix LoadMore in Notifications. ()
Naoki Kosaka a0880edc6e Fix (PR ) Add hasMore to propTypes and cover handleScroll. ()
unarist 61fcdbbf7e Add back button to hashtag timeline again ()
Shunsuke Michii 43af695ba1 Add th.json. ()
IkUrA facd90e7a6 Add streaming_api_base_url to /api/v1/instance () 
* Add streaming_api_base_url to /api/v1/instance

* Adjust spaces

* nested view

* re-adjust spaces
Matt Jankowski 6201f96b8a Introduce StatusThreadingConcern () 
* Add a StatusFilter class to identify visibility of statuses by accounts

* Extract StatusThreadingConcern from Status

* Clarify purpose of checking for nil account
unarist c26cea262b Prevent pinned columns from scroll to top on URL changing ()
Naoki Kosaka 1f1d6bf2a0 Fix LoadMore in following and followers. ()
Eugen Rochko 4c06d1cb24 Fix - Add all missing foreign keys () 
* Fix  - Add all missing foreign keys

* Add missing foreign keys
Daigo 3 Dango 2985d08951 Redirect to streaming_api_base_url () 
* Redirect to streaming_api_base_url

When Rails receives a request to streaming API, it most likely
means that there is another host which is configured to respond
to it. This is to redirect clients to that host if
`STREAMING_API_BASE_URL` is set as another host.

* Use the new Ruby 1.9 hash syntax
Yamagishi Kazutoshi 66ca7157db Add support key shortcut to Onboarding Modal () 
* Add support key shortcut to Onboarding Modal

* this.state.pages -> this.pages
Yamagishi Kazutoshi 4addf051d4 Fix broken embed page ()
Yamagishi Kazutoshi ab914ce6d5 Add OnboadingModal story ()
Yamagishi Kazutoshi 6a4b224397 Fix randomly fail (regression from ) ()
Yamagishi Kazutoshi 6adbd114c1 Skip image length check (regression from ) ()
René Klačan 037f96c5ae Don't follow account if it's already followed () 
Closes https://github.com/tootsuite/mastodon/issues/3102
René Klačan f54dca06a9 Add migration versions () 
Since Rails 5.1 missing migration version results in following error:

```
StandardError: Directly inheriting from ActiveRecord::Migration is not supported. Please specify the Rails release the migration was written for:
```

This PR fixes all migration files.
Quent-in 370fa70924 l10n update for occitan language () 
* i18n Update : Add preference setting for delete toot modal

Adding a line for "Add preference setting for delete toot modal"

* i18n update for pin/unpin

Update to add two more translations

* i18n update to have the dates in plain occitan

* Removed the blank line

* %{selft} back in the translation
Matt Jankowski 5be1214c26 Gem version bumps () 
* Update annotate to version 2.7.2

* Update puma to version 3.9.0

* Update aws-sdk to version 2.9.28

* Update bootsnap to version 1.0.0

* Update nio4r to version 2.1.0

* Update nokogumbo to version 1.4.12

* Update oj to version 3.0.11

* Update pkg-config to version 1.2.3

* Update rubocop to version 0.49.1

* Update sidekiq-scheduler to version 2.1.5
Eugen Rochko f7a30e2fae Added support for configurable reserved usernames (fix of ) () 
* Added support for configurable reserved usernames

* Added reserved usernames from mastodon issue 1355

* Fix reserved usernames
Yamagishi Kazutoshi 3f815b2052 Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml ()
Akihiko Odaki (@fn_aki@pawoo.net) defe4f9bc3 Cover WebfingerResource more ()
Yamagishi Kazutoshi 943775fd90 Update dependencies of Node.js () 
* Update axios to version 0.16.2

* Update css-loader to version 0.28.4

* Update postcss-smart-import to version 0.7.4

* Update react-immutable-pure-component to version 0.0.5

* Update stringz to version 0.2.1

* Update style-loader to version 0.18.1

* Update websocket.js to version 0.1.9

* yarn upgrade
Akihiko Odaki (@fn_aki@pawoo.net) 42844df966 Spec ScopedSettings ()
Yamagishi Kazutoshi b0fe58dc69 Upgrade storybook to v3 ()
Akihiko Odaki (@fn_aki@pawoo.net) e07b57852e Remove some code in TagManager and spec () 
* Do not fall back to StreamEntry if object_type is unavailable in TagManager

Since 6d6a429af8, when Status, the only model
with stream_entry, and StreamEntry got its own logic in uri_for and
url_for, the purpose of the fallbacks to activity_type of StreamEntry
became unclear.

This commit removes the fallbacks. When adding another model with
stream_entry in future, consider to update uri_for and url_for.

* Cover TagManager more
m4sk1n 7c7c18fdea i18n: Updated Polish translation ()
lindwurm a84664026e l10n: ja: Change about/more link text () 
ref:  ("Extended information" -> "About this instance") and 

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
Akihiko Odaki (@fn_aki@pawoo.net) 02a0fd5b64 Spec InlineRablScope ()
Akihiko Odaki (@fn_aki@pawoo.net) 6505a42be0 Spec HashObject ()
Akihiko Odaki (@fn_aki@pawoo.net) e674608d10 A minor change for ProviderDiscovery and spec () 
* Do not default the format in ProviderDiscovery

The format should be determined when discovering, as it is in the current
implementation, and it is a flaw if it is not determined.

* Spec ProviderDiscovery
Akihiko Odaki (@fn_aki@pawoo.net) c7af8cbc90 Remove some arguments of Formatter.instance.format and spec () 
* Remove some arguments of Formatter.instance.format

* Improve spec for Formatter
Akihiko Odaki (@fn_aki@pawoo.net) 9475fbae78 Spec Extractor ()
Akihiko Odaki (@fn_aki@pawoo.net) 00e61d6807 Spec action verification of StreamEntryFinder ()
Akihiko Odaki (@fn_aki@pawoo.net) 19084d3c6c Remove Targetable ()
Naoki Kosaka e014bf8ed0 Fix limit_param in favourites_controller.rb ()
Yamagishi Kazutoshi f6e2309e70 Fix column buttons overflow in Japanese ()
Yamagishi Kazutoshi 9d2154c4ab Add Japanese translations (pin) () 
* Add Japanese translations (pin)

* "ピン留め" is more general
unarist 1dfd27a028 Fix all icons in the column header being hilighted ()
Mingye Wang b97ebaf620 en.json: change about/more link text to "About this instance" () 
This change follows , which does the same for the Chinese variants. Or should it be simply "About"?
Eugen Rochko 8ee2eb5d2e Allow mounting arbitrary columns () 
* Allow mounting arbitrary columns

* Refactor column headers, allow pinning/unpinning and moving columns around

* Collapse animation

* Re-introduce scroll to top

* Save column settings properly, do not display pin options in
single-column view, do not display collapse icon if there is
nothing to collapse

* Fix one instance of public timeline being closed closing the stream
Fix back buttons inconsistently sending you back to / even if history exists

* Getting started displays links to columns that are not mounted
masarakki 20b647020b refocus-after-toot ()
takayamaki 3eedad2737 change sidekiq queueing to bulk push ()
Akihiko Odaki (@fn_aki@pawoo.net) ce7c0def88 Remove redundant code in AtomSerializer and spec () 
* Remove redundant status.reply? in AtomSerializer#object

* Cover AtomSerializer more
Clworld dab8fc4584 Execute PushUpdateWorker only for accounts who uses StreamingAPI just now. () 
* Add redis key "subscribed:timeline:#{account.id}" to indicate active streaming API listeners exists.

* Add endpoint for notification only stream.

* Run PushUpdateWorker only for users uses Streaming API now.

* Move close hander streamTo(Http/Ws) -> stream(Http/Ws)End (Deal with )

* Add stream type for stream start log message.
Yamagishi Kazutoshi 8a597f0138 Cache assets in travis ()
Nolan Lawson 3363f2f4d6 Fix isIntersecting in Chrome ()
Mingye Wang c7f2d6af55 zh-cn&tw.json: "extended info" -> "about this site" () 
* zh-cn.json: "additional info" -> "more info"

This commit changes the "extended info" (about/more) text to something that translates to "more info", as "additional info" in zh can sound like appending things to the (ugh) navbar, I guess.

Or should I just change it to "about this site" (关于本站)?

* zh-cn.json: navbar.info -> "about this site"

* zh-臺灣.json: navbar.info -> "about this site"
Yamagishi Kazutoshi e878ddb7c0 Fix spec for ()
Yamagishi Kazutoshi 336f0b0823 Remove WarmCacheService () 
WarmCacheService is no longer used (removed with 5442083b3c ).