about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-10-17Swedish translation (#5406)Håkan Eriksson
* Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete
2017-10-17Small update Dutch (nl) strings (#5424)Jeroen
* Update Dutch strings * Update Dutch
2017-10-16Fix dual toot button wrong behavior after compose re-designOndřej Hruška
2017-10-16workaround for null statusOndřej Hruška
2017-10-16Merge pull request #184 from tootsuite/masterbeatrix
Fix reduced motion breaking public galleries (#5423)
2017-10-16Merge pull request #182 from glitch-soc/wide-tootbox-panelDavid Yip
Full-width tootbox panel to make room for buttons
2017-10-16satisfy eslint and jestOndřej Hruška
2017-10-16rem a commentOndřej Hruška
2017-10-16double-decker tootboxOndřej Hruška
2017-10-16Merge remote-tracking branch 'upstream/master' into upstream-merge-againOndřej Hruška
2017-10-16fix some lint errorsOndřej Hruška
2017-10-16Fix reduced motion breaking public galleries (#5423)Nolan Lawson
2017-10-16Keep references to all reblogs of a status on home feed (#5419)Eugen Rochko
* Keep references to all reblogs of a status on home feed When inserting reblog: Add to set of reblogs of this status on the feed, if original status was present in the feed, add it to that set as well. When removing a reblog: Remove it from that set. Take random remaining item from the set. If one exists, re-insert it into feed, otherwise do not re-insert anything. Fix #4210 * When original is removed, toss out reblog references
2017-10-16Merge remote-tracking branch 'upstream/master' into gs-masterDavid Yip
2017-10-16Merge remote-tracking branch 'upstream/master' into gs-masterDavid Yip
2017-10-16Ensure that feed renegeration restores non-zero items (#5409)Eugen Rochko
Fix #5398 Ordering the home timeline query by account_id meant that the first 100 items belonged to a single account. There was also no reason to reverse-iterate over the statuses. Assuming the user accesses the feed halfway-through, it's better to have recent statuses already available at the top. Therefore working from newer->older is ideal. If the algorithm ends up filtering all items out during last-mile filtering, repeat again a page further. The algorithm terminates when either at least one item has been added, or if the database query returns nothing (end of data reached)
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.