about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-10-16Merge remote-tracking branch 'upstream/master' into gs-masterDavid Yip
2017-10-16Filter out duplicate IDs in timelines reducer (#5417)Eugen Rochko
Possibly the cause of #5379, #5377
2017-10-16Fix un-reblogged status being at wrong position in the home timeline (#5418)unarist
We've changed un-reblogging behavior when we implement Snowflake, to insert un-reblogged status at the position reblogging status existed. However, our API expects home timeline is ordered by status ids, and max_id/since_id filters by zset score. Due to this, un-reblogged status appears as a last item of result set, and timeline expansion may skips many statuses. So this reverts that change...reblogged status inserted at corresponding position to its id.
2017-10-16Add up-to-date korean translation on client (#5402)voidSatisfaction
* chore: add Korean translation for client * fix: change unlisted and embed Korean words
2017-10-16Fix #5082 - disable retweet link for followers only toot (#5397)KY
* Fix #5082 - disable retweet link for followers only toot * Hide reblog count when it is a direct message
2017-10-16i18n: Update Polish translation (#5416)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-10-16i18n ultim hour «More» dropdown title + reduce motion (#5415)JeanGauthier
* Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)
2017-10-16Enable ESLint rules import/* (#5414)Yamagishi Kazutoshi
* Enable ESLint rules import/* * fix
2017-10-16Add option to reduce motion (#5393)Nolan Lawson
* Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml
2017-10-16Fix offline-plugin warning in dev mode (#5411)Nolan Lawson
2017-10-16Replace JavaScript Testing Framework from Mocha to Jest (#5412)Yamagishi Kazutoshi
2017-10-16i18n "More" dropdown title (#5410)Nolan Lawson
2017-10-16Refactor and simplify icon_button.js (#5413)Nolan Lawson
2017-10-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-16Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unificationDavid Yip
Avatar unification, mk.II
2017-10-151.6 changed files for unified avatar styling -- updated to restore unityMatthew Walsh
2017-10-15Merge pull request #173 from glitch-soc/zerowidthmojiDavid Yip
use zerowidth spaces with emojis
2017-10-16Clear timer when unmounting RelativeTimestamp components (#5408)Eugen Rochko
Possibly the cause of #5379, #5377
2017-10-15l10n Occitan: finishing touches (#5404)JeanGauthier
* Update oc.json * Update oc.yml
2017-10-15Update French translation (#5401)Yannick A
2017-10-14Adjust public hashtag pages (#5357)Lynx Kotoura
2017-10-14Use atomUri in Undo activity of Announce (#5376)unarist
This allows deletion of reblogs which delivered before with OStatus URI.
2017-10-14replace newlines in desktop notif with spaces instead of removing them (#5361)Ondřej Hruška
2017-10-14Updated Catalan strings (#5323)spla
* Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted * Updated Catalan strings * Updated Catalan strings
2017-10-14Fix #5351 - Redirection with page params after copy emoji (#5387)KY
* Fix #5351 - Redirection with page params after copy emoji * Add page params to copy emoji link
2017-10-14Close connection when succeeded posting (#5390)abcang
* Close connection when succeeded posting * Update webmock
2017-10-14Update French translation (#5384)Yannick A
Update French translation
2017-10-14l10n: update Persian translation for 2.0 (#5391)Masoud Abkenar
2017-10-14Doodle improvements 2 (#176)Ondřej Hruška
* Fix some doodle bugs and added Background color functionality * added protections against accidental doodle erase, screen size changing * resolve react warning about 'selected' on <option>
2017-10-14Update German translation (#5389)Jakob Kramer
2017-10-14Doodle palette, options, fill tool (#172)Ondřej Hruška
2017-10-14use zerowidth spaces for emojisOndřej Hruška
2017-10-13Fixed a bug where the canvas would get transparent bg upon eraseOndřej Hruška
2017-10-13Initial doodle supportOndřej Hruška
2017-10-13Dutch strings: small change (#5375)Jeroen
* Dutch strings: small change * And this too.
2017-10-13Optimize Status#permitted_for 500x (account timeline) (#5373)unarist
The main change of this PR is removing `order by visibility` hack. This was introduced to force using of `index_statuses_on_account_id` instead of PK index, but it seems no longer needed probably due to `index_statuses_on_account_id_id`. Removing this avoids reading all rows, so really improves first fetching of the user who has lot of statuses. I have also changed JOIN to IN + subquery, which slightly faster in most cases.
2017-10-13Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager ↵Eugen Rochko
(#5371) This error occurred at least in development environment
2017-10-13Fix UserTrackingConcern firing on every request, optimize some queries (#5368)Eugen Rochko
- For some reason, :if option on before_action did not work. It got executed every time, returned false, and the action run anyway, which led to the current_sign_in_at and sign_in_count being updated on every request - Return "do not filter" early in FeedManager#filter_from_home? if the status is authored by receiver. Usually this method is not called for own statuses at all, but it is called when Feed#get uses the database - Return early if #reload_stale_associations! has nothing to load to save a database query with WHERE 1=0
2017-10-13Do not try to guess why home timeline is empty in web UI (#5370)Eugen Rochko
* Do not try to guess why home timeline is empty in web UI * Fix style issue
2017-10-13When unfollowing, remove from home in web UI immediately (#5369)Eugen Rochko
Do NOT send "delete" through streaming API when unmerging from home timeline. "delete" implies that the original status was deleted, which is not true!
2017-10-13Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)ThibG
Remote ActivityPub users that have never been known as OStatus users (whether or not they support it) will not have a “remote_url” attribute set. In case they reside on an instance with WEB_DOMAIN ≠ LOCAL_DOMAIN, the current check did rely on “remote_url” to verify the user's domain.
2017-10-13Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)Yamagishi Kazutoshi
2017-10-13Retoot count increases without reason (#5363)Lex Alexander
* Retoot count increases without reason -The store_uri method for Statuses was being called on after_create and causing reblogs to be incremented twice. -This calls it when the transaction is finished by using after_create_commit. -Fixes #4916. * Added test case for after_create_commit callback for checking reblog count. * Rewrote test to keep original, but added one for only the after_create_commit callback.
2017-10-12Reduce discrepancies between server and client-side character count (#5360)ThibG
2017-10-13l10n: PT-BR translation updated (#5362)Anna e só
* PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed
2017-10-12Fix the notification bug with newlinesOndřej Hruška
2017-10-12Another tabs-vs-spaces fix, but with ~feeling~David Yip
2017-10-12Fix some consistance errors in gender neutral formulations. Add some missing ↵Alda Marteau-Hardi
ones. (#5350)
2017-10-12Fix tabs-vs-spaces issue pointed out by eslint.David Yip
2017-10-12Update oc.json (#5343)JeanGauthier
generated by cgit-pink (git 2.37.1) at 2024-11-03 22:15:03 +0000