about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-14Do not cancel PuSH subscriptions after encountering "permanent" error… (#3046)Eugen Rochko
* Do not cancel PuSH subscriptions after encountering "permanent" error response After talking with MMN about it, turns out some servers/php setups do return 4xx errors while rebooting, so this anti-feature that was meant to take load off of the hub is doing more harm than good in terms of breaking subscriptions * Update delivery_worker.rb
2017-05-13tiny js fix for 'show more' button in chrome (#3045)beatrix
2017-05-13feat(count): Just yml count syntax to provide different rule for 1 (#2685)Stephen Burgess
Update all translation forms that use this "counter" element.
2017-05-13i18n: Hebrew string updates (#3037)Ira
2017-05-13Small FR localisation enhancements (#3033)Bastien
* Small localisation enhancement. Be consistent regarding "e-mail" vs "courriel": I suggest using "courriel" to refer to the electronic message and "e-mail" when used in "adresse e-mail". This reflects the usage I generally observe, but I may be wrong. * Localisation enhancements. Omit some commas: "..., ..., ou ..." should be "..., ... ou ..." since "ou" already articulates the sentence. Also replace "demande" by "requête" when it makes sense.
2017-05-13Fix og:url. (#3031)Shunsuke Michii
2017-05-13Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036)alpaca-tc
2017-05-13Fix broken storybook (#3030)Yamagishi Kazutoshi
2017-05-13Revert HTML CW changes (#3020)beatrix
* selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit 72698bc3b49925a2b2955f32e5a562c1eecd729b. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit e2491680e696d2c285a798ec4c66b26d2748df66.
2017-05-13Make direct statuses stand out more (#3025)Eugen Rochko
Resolves #2515
2017-05-13Finalizing Dutch strings (#3028)jeroenpraat
for this file.
2017-05-12Rebuild node-sass (#3002)Daigo 3 Dango
Got an error in asset precompile on Heroku: Module build failed: Error: ENOENT: no such file or directory, scandir '/tmp/.../node_modules/node-sass/vendor' ref: https://github.com/rails/webpacker#troubleshooting
2017-05-12fix #3008 : props was not defined (#3022)Wonderfall
2017-05-12Spec coverage and refactor for pubsub/delivery worker (#3021)Matt Jankowski
* Framework for delivery worker spec * Refactor of pubsub delivery worker
2017-05-12Fix color contrast some more in privacy warning (#3018)Shel Raphen
* Fix color contrast some more in privacy warning Latest master appears to have changed the <strong> to this unreadable grey color. If you want that to be white then it should be pure white. If someone would rather revert this to that strong dark blue color it was before that would be good too. * Make domain dark blue again * add missing ; woops
2017-05-12Allow SCSS variables to be overridden (#2987)Koala Yeung
* Allow SCSS variables to be overridden with `app/javascript/pack/variables*.scss` * Allow these SCSS variables to be overriden: * `$base-shadow-color` * `$base-overlay-background` * `$base-border-color` * `$simple-background-color` * `$primary-text-color` * `$valid-value-color * `$error-value-color`
2017-05-12Remove reference to non-existent table in schema rb (#3019)Matt Jankowski
2017-05-12Add conversation model, <ostatus:conversation /> (#3016)Eugen Rochko
* Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Fix conversation migration * More spec coverage for status before_create * Prevent n+1 query when generating Atom with the new conversations * Improve code style * Remove redundant local variable
2017-05-12Prepend reblogs' wrapper content with "RT @original_author", (#3013)Eugen Rochko
so that when a reblog parse fails on another instance, it doesn't look like a misattributed/stolen text
2017-05-12Increase color contrast on privacy warning (#3015)Shel Raphen
The current text contrast on the privacy warning is a WCAG violation. I didn't notice this because my instance has a custom theme which is better. On default theme I am barely able to read the text with my impaired vision. This patch brings the contrast to Normal Text WCAG AA compliance, and Large Text WCAG AAA compliance.
2017-05-12Fix sidekiq "port" being wrong (#3014)Eugen Rochko
Sidekiq doesn't need a port, however that env var is used for generating URLs in development, so when foreman sets it wrong, you get bad URLs from the streaming API during development
2017-05-12Fix not rejecting remote URIs when parsing out local IDs (#3012)Eugen Rochko
2017-05-12Add back stdout logging to development environment after rails_12factor was ↵Eugen Rochko
removed (#3011)
2017-05-12Fix locales again (#3010)Eugen Rochko
* Normalize locales * Restore "mention" locale key
2017-05-12Use ES Class Fields & Static Properties (#3008)Yamagishi Kazutoshi
Use ES Class Fields & Static Properties (currently stage 2) for improve class outlook. Added babel-plugin-transform-class-properties as a Babel plugin.
2017-05-12Remove unnecessary message in video player (#3007)Yamagishi Kazutoshi
Remove unnecessary messages added in #1879. It is duplicated with other keys, causing the correct message not to be displayed.
2017-05-12Use cid3 on Heroku (#3001)Daigo 3 Dango
Use https://github.com/heroku/heroku-buildpack-apt to install protobuf-compiler and libprotobuf-dev which are needed by cid3
2017-05-12Add yarn log files to gitignore (#3003)AA4ch1
* Add yarn-error.log to gitignore * Add yarn-debug.log to gitignore
2017-05-12Update ar.json (#3004)ButterflyOfFire
Updating some arabic translations.
2017-05-12Update doorkeeper.ar.yml (#3006)ButterflyOfFire
* Update doorkeeper.ar.yml - Remodelling doorkeeper.ar.yml and adding missing strings from english version to arabic version. - Translating max strings - Reviewing some translations - Other strings to be translated later (complicated somehow) * Update doorkeeper.ar.yml Updating translations from lines : 88 to 91
2017-05-12Remove dependencies that are no longer needed now (#2999)Yamagishi Kazutoshi
There are some dependencies that are no longer needed anymore. As a result, it took more time to install the package than necessary. I want to delete them and shorten the installation time.
2017-05-11Fix #1426 - Trim long usernames in public follower/following lists (#2993)Eugen Rochko
Fix #2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments Don't strip "rel" attribute from <a> tags when sanitizing (microformats)
2017-05-11Coverage for domain block worker (#2997)Matt Jankowski
2017-05-11Fix #2205 - Delete associated notifications when a status is deleted (#2994)Eugen Rochko
2017-05-11Fix #2027 - Accept own ID for remote follow with and without preceding @ (#2991)Eugen Rochko
* Fix #2027 - Accept own ID for remote follow with and without preceding @ Fix #2177 - Omit leading "acct:" in remote follow redirect template expansion * Fix test
2017-05-11Stop require of i18n-tasks (#2992)Yamagishi Kazutoshi
2017-05-11When avatar/header are missing, do not include the missing file into Atom ↵Eugen Rochko
(#2988) Receiving instances will then use their own missing image Also, add <content /> to deleted statuses, since there was a reported problem with the deletes and GNU social
2017-05-11Focus tab of Mastodon when clicking notification (#2989)Yamagishi Kazutoshi
2017-05-11Add pessimistic constraints to gem versions (#2980)Jack Jennings
2017-05-11Add dynamic polyfills for older browsers (#2985)Nolan Lawson
Fixes #2941
2017-05-11Add specs for current Status#permitted? implementation (#2982)Jack Jennings
2017-05-11[bug] wrong config setting for dababase. (#2984)Ayumu AIZAWA
2017-05-11Fixed mention regex to support unicode (#2420)Go Shoemake
2017-05-11Update screenshot in readme (#2978)Eugen Rochko
2017-05-11Refine unescapeHTML (#2977)Yamagishi Kazutoshi
2017-05-11Remove unnecessary .keep files (#2976)Yamagishi Kazutoshi
Follow up #2902
2017-05-11Fix regressions from #2683 (#2970)Eugen Rochko
* Fix regressions from #2683 Properly format spoiler text HTML, while keeping old logic for blankness intact Process hashtags and mentions in spoiler text Format spoiler text for Atom Change "show more" toggle into a button instead of anchor Fix style regression on dropdowns for detailed statuses * Fix lint issue * Convert spoiler text to plaintext in desktop notifications
2017-05-11Very small fix/update NL strings (#2971)jeroenpraat
* Very small fix/update NL strings * Oops
2017-05-11Pubsub confirmation worker spec (#2974)Matt Jankowski
* Add specs for valid challenge response from pubsub confirmation worker * Refactor the pubsub confirmation worker
2017-05-10Fix #2955 - Send HEAD request ahead of GET when fetching URL previews (#2972)Eugen Rochko