about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-09-20Fixed disabled boost SVG (#106)kibigo!
2017-09-20Fixed #133 (only parse links in status text)kibigo!
2017-09-20Fix custom emojis with non-1:1 aspect ratio being stretched (#5017)Eugen Rochko
2017-09-19redo #4500 with customEmojis (#5016)MIYAGI Hikaru
2017-09-19i18n: Update Polish translation (#5015)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-19Fix race condition when processing incoming OStatus messages (#5013)ThibG
* Avoid races in incoming OStatus toots processing * oops * oops again
2017-09-19Introduce OStatus::TagManager (#5008)Akihiko Odaki
2017-09-19Fix non-local statuses are html_encoded in public_page. (#5012)Naoki Kosaka
2017-09-19Set touchstart listener to 'passive', remove 'once' (#5011)Nolan Lawson
2017-09-19Use OrderedCollectionPage to return followers/following list (#4949)nullkal
2017-09-19Add support for multiple themes (#4959)Andrew
* Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return
2017-09-19Hide sensitive image in default on the public pages (#5009)unarist
Additionally, this restores previous background / text color for media spoiler.
2017-09-19Fix incomplete account records being read (#4998)Eugen Rochko
* Fix incomplete account records being read - Put account processing into redis lock - Do not save until record is complete * Fix spaces
2017-09-19Remove ubuntu-toolchain-r-test (#5005)Akihiko Odaki
2017-09-19Fix custom emojis index (#5006)Yamagishi Kazutoshi
2017-09-19Define emoji context for ActivityPub (#5004)Eugen Rochko
* Define emoji context for ActivityPub * Fix the emojo * Use general Mastodon context instead
2017-09-19Admin interface for listing, adding and removing custom emojis (#5002)Eugen Rochko
* Admin interface for listing, adding and removing custom emojis * Only display local ones in the list
2017-09-19Run i18n-tasks normalize (#5003)Eugen Rochko
2017-09-19Custom emoji (#4988)Eugen Rochko
* Custom emoji - In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />` - In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }` - In REST API: Status object includes `emojis` array (`shortcode`, `url`) - Domain blocks with reject media stop emojis - Emoji file up to 50KB - Web UI handles custom emojis - Static pages render custom emojis as `<img />` tags Side effects: - Undo #4500 optimization, as I needed to modify it to restore shortcode handling in emojify() - Formatter#plaintext should now make sure stripped out line-breaks and paragraphs are replaced with newlines * Fix emoji at the start not being converted
2017-09-19A few updates to the Spanish translation and some typos fixing (#4997)BruWalfas
* So Spanish. Much changes. Wow. * Some little fixes * Updated es.yml, and fixed some ortographical errors * Some little changes to simple_form.es.yml * Yeah, so much translations * Spanish e-mail messages * Remove unused message
2017-09-18Add will-change to improve scrolling perf (#5001)Nolan Lawson
2017-09-18Re-allow underscore on valid_url_path_ending_chars (#4999)unarist
Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941.
2017-09-18Add published property to ActivityPub activity for reblogs (#5000)unarist
Since reblogs are serialized as Announce activity, its published property can be used for the creation time of reblog.
2017-09-18Do not add image size without meta to OGP (regression from #4901) (#4995)Yamagishi Kazutoshi
2017-09-18Use Account.local.sum(statuses_count) instead of Status.local.count (#4996)Akihiko Odaki
It is faster.
2017-09-18Bump ruby version to 2.4.2 (#4958)Daigo 3 Dango
* Bump ruby version to 2.4.2 https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/ Gemfile.lock is also updated. TODO - [ ] Update Dockerfile with Alpine release of ruby-2.4.2 * Revert jwt version It seems that jwt 2.0.0 fails in some environment. ref. https://github.com/zaru/webpush/issues/42 * Bump Ruby version on docker image
2017-09-18Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993)Yamagishi Kazutoshi
2017-09-18Some improvements in the Spanish translation (#4991)febrezo
2017-09-17Oauth code in input form and add description message (#4986)Lynx Kotoura
* Oauth code in a input form and add description * New authcode description
2017-09-17Validate uri presence for remote status (#4985)unarist
2017-09-17Raise an error on getting activity uri for remote status (#4984)unarist
We had returned `nil` for that case, but this raises an error instead, as a wrong usage of the method. This method is currently only used in ActivitySerializer.
2017-09-17Fix cancellation of scroll to the right (#4978)abcang
2017-09-17Randomize sidekiq-scheduler cron schedule (#4980)Patrick Figel
SubscriptionsScheduler in particular causes high load across the entire fediverse at 5 AM UTC every day. Randomizing cron schedules and/or adding a random delay is considered best practice to avoid this issue.
2017-09-17Fix an error when actor json couldn't be fetched in ↵unarist
ResolveRemoteAccountService (#4979) * Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService * Add specs
2017-09-17So Spanish. Much changes. Wow. (#4976)BruWalfas
2017-09-17Remove local_only scope in Status (#4977)Akihiko Odaki
2017-09-16Escape URL parts on formatting local status (#4975)unarist
2017-09-16Minor Chinese check & jsx addition (#4973)Mingye Wang
* zh-*: transition from "like" back to "fav" This commit reverts the translation for the yellow-star "fav" button back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is deliberately used in zh-TW/HK by using the existing phrase "最爱" (favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.), "collect") in some instances. Fixes #3511. * zh-*: apply suggestions for PR #4557 * zh-cn: de-monetize ya account In Chinese two separate characters, 账 and 帐, can be used to spell the word for account (账/帐户). However, the one with a 贝 on the left is evolved from the latter specifically for monetary purposes. Since people usually can't figure out which one to use, it might be a good idea to use the original not-so-money one. * zh-*: complete jsx translation
2017-09-16Re-center hidden media text verticalSurinna Curtis
2017-09-16Adjust landing pages 2 (#4967)Lynx Kotoura
* Adjust landing pages 2 Fix styles of terms page Remove action buttons from timeline in about page Adjust styles of short description Adjust form inputs Set autocomplete off for username and email box in registration form. Remove line breakings. * Revert removing action buttons
2017-09-16Merge pull request #147 from yipdw/sync/upstreamDavid Yip
Fix error when following locked accounts (#4896)
2017-09-16Fix an error in ReplyDistributionWorker when replied status was deleted (#4974)unarist
Reply distribution is proceed by Sidekiq, so replied status may be deleted before this.
2017-09-16Fix error when following locked accounts (#4896)Eugen Rochko
(cherry picked from commit 0ef9d45d0581dddf2f325033c43721f42fcfca9e)
2017-09-16correct URL pattern used in text length counter in WebUI (#4968)ふぁぼ原
2017-09-16Fix AP serialization error when thread is missing (#4970)unarist
`Status#reply?` may returns true even if the thread is missing. e.g. the replied status was deleted or couldn't be fetched. Then it raises NoMethodError on various AP json serialization. This issue won't happen on Atom serialization because it checks thread existence using `StreamEntry#threaded?` instead.
2017-09-16Fix hasSize condition in secSet and sizes. (#4969)Naoki Kosaka
2017-09-16Fix filterable_languages method of SettingsHelper (#4966)Akihiko Odaki
2017-09-16Bump to 1.6.1Eugen Rochko
2017-09-16When accessing uncached media attachment, redownload it (#4955)Eugen Rochko
* When accessing uncached media attachment, redownload it * Prevent re-download of rejected media
2017-09-16Fix invisible load more button (#4962)unarist
* Fix behavior while the button is invisible e.g. pointer cursor, couldn't open contextmenu * Avoid rendering the button to remove blank space if no more items are available or no items are rendered