about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-09-28Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstreamOndřej Hruška
2017-09-28Revert "autoscroll emoji suggestions box"Ondřej Hruška
This reverts commit c89cce0219646502b4d338213d112a528373bdc4.
2017-09-28Revert "Merge pull request #149 from glitch-soc/mojon-suggest"Ondřej Hruška
This reverts commit fa3587645da228e93767b245eeadbd668bc6cd38, reversing changes made to 15c9c2fd7e5603d48b5eeb966963138b454cfe2a.
2017-09-23Fix intl warning with disabled secondary toot btnOndřej Hruška
- Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility
2017-09-23Make secondary toot button work nicer with file attachments & revert to the ↵Ondřej Hruška
original behavior if it's disabled
2017-09-23Add secondary toot button (opt-in) (#153)Ondřej Hruška
Add secondary toot button + other toot button enhancements. Squashing so it's easy to revert if needed.
2017-09-23Remove "extra clickable spaces" made obsolete by status re-designOndřej Hruška
2017-09-22applied blackle's fix for gallery offset with full-width mediaOndřej Hruška
2017-09-21Long display names now ellipsis properlykibigo!
2017-09-21Styling fixes for header redesignkibigo!
2017-09-21Merge pull request #148 from glitch-soc/better-headerDavid Yip
Improvements to status headers and content
2017-09-21autoscroll emoji suggestions boxOndřej Hruška
2017-09-20Merge pull request #149 from glitch-soc/mojon-suggestbeatrix
Emoji and Hashtag autocomplete
2017-09-20Fixed notification appearancekibigo!
2017-09-20fulltext mojo suggestionsOndřej Hruška
2017-09-20TURBO shortcode searchOndřej Hruška
2017-09-20add scrollbar to mojon suggestions list when too longOndřej Hruška
2017-09-20cache allShortcodesOndřej Hruška
2017-09-20typo in commentOndřej Hruška
2017-09-20Appease TravisOndřej Hruška
2017-09-20Emoji and Hashtag autocompleteOndřej Hruška
2017-09-20Pinned toots; embedskibigo!
2017-09-20Added GIF hover-to-play supportkibigo!
2017-09-20Improvements to status headerskibigo!
2017-09-20Fixed disabled boost SVG (#106)kibigo!
2017-09-20Fixed #133 (only parse links in status text)kibigo!
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-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-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-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-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