| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2017-09-28 | Skip-merge commit '0401a24558294b6941c30c922af3f2063dfd305e' into ↵ | Ondřej Hruška | |
| merging-upstream | |||
| 2017-09-28 | Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream | Ondřej Hruška | |
| 2017-09-28 | Revert "autoscroll emoji suggestions box" | Ondřej Hruška | |
| This reverts commit c89cce0219646502b4d338213d112a528373bdc4. | |||
| 2017-09-28 | Revert "Merge pull request #149 from glitch-soc/mojon-suggest" | Ondřej Hruška | |
| This reverts commit fa3587645da228e93767b245eeadbd668bc6cd38, reversing changes made to 15c9c2fd7e5603d48b5eeb966963138b454cfe2a. | |||
| 2017-09-23 | Fix intl warning with disabled secondary toot btn | Ondřej Hruška | |
| - Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility | |||
| 2017-09-23 | Make secondary toot button work nicer with file attachments & revert to the ↵ | Ondřej Hruška | |
| original behavior if it's disabled | |||
| 2017-09-23 | Add 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-23 | Remove "extra clickable spaces" made obsolete by status re-design | Ondřej Hruška | |
| 2017-09-22 | applied blackle's fix for gallery offset with full-width media | Ondřej Hruška | |
| 2017-09-21 | Long display names now ellipsis properly | kibigo! | |
| 2017-09-21 | Styling fixes for header redesign | kibigo! | |
| 2017-09-21 | Merge pull request #148 from glitch-soc/better-header | David Yip | |
| Improvements to status headers and content | |||
| 2017-09-21 | autoscroll emoji suggestions box | Ondřej Hruška | |
| 2017-09-20 | Merge pull request #149 from glitch-soc/mojon-suggest | beatrix | |
| Emoji and Hashtag autocomplete | |||
| 2017-09-20 | Fixed notification appearance | kibigo! | |
| 2017-09-20 | fulltext mojo suggestions | Ondřej Hruška | |
| 2017-09-20 | TURBO shortcode search | Ondřej Hruška | |
| 2017-09-20 | add scrollbar to mojon suggestions list when too long | Ondřej Hruška | |
| 2017-09-20 | cache allShortcodes | Ondřej Hruška | |
| 2017-09-20 | typo in comment | Ondřej Hruška | |
| 2017-09-20 | Appease Travis | Ondřej Hruška | |
| 2017-09-20 | Emoji and Hashtag autocomplete | Ondřej Hruška | |
| 2017-09-20 | Pinned toots; embeds | kibigo! | |
| 2017-09-20 | Added GIF hover-to-play support | kibigo! | |
| 2017-09-20 | Improvements to status headers | kibigo! | |
| 2017-09-20 | Fixed disabled boost SVG (#106) | kibigo! | |
| 2017-09-20 | Fixed #133 (only parse links in status text) | kibigo! | |
| 2017-09-19 | Add 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-19 | Hide sensitive image in default on the public pages (#5009) | unarist | |
| Additionally, this restores previous background / text color for media spoiler. | |||
| 2017-09-19 | Fix 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-19 | Remove ubuntu-toolchain-r-test (#5005) | Akihiko Odaki | |
| 2017-09-19 | Fix custom emojis index (#5006) | Yamagishi Kazutoshi | |
| 2017-09-19 | Define emoji context for ActivityPub (#5004) | Eugen Rochko | |
| * Define emoji context for ActivityPub * Fix the emojo * Use general Mastodon context instead | |||
| 2017-09-19 | Admin 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-19 | Run i18n-tasks normalize (#5003) | Eugen Rochko | |
| 2017-09-19 | Custom 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-19 | A 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-18 | Add will-change to improve scrolling perf (#5001) | Nolan Lawson | |
| 2017-09-18 | Re-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-18 | Add 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-18 | Do not add image size without meta to OGP (regression from #4901) (#4995) | Yamagishi Kazutoshi | |
| 2017-09-18 | Use Account.local.sum(statuses_count) instead of Status.local.count (#4996) | Akihiko Odaki | |
| It is faster. | |||
| 2017-09-18 | Bump 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-18 | Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993) | Yamagishi Kazutoshi | |
| 2017-09-18 | Some improvements in the Spanish translation (#4991) | febrezo | |
| 2017-09-17 | Oauth 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-17 | Validate uri presence for remote status (#4985) | unarist | |
| 2017-09-17 | Raise 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-17 | Fix cancellation of scroll to the right (#4978) | abcang | |
| 2017-09-17 | Randomize 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. | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |