about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-16Add missing keys to PT locale (#1941)Eduardo Elias
2017-04-16Check @recipient.user at the first (#1939)alpaca-tc
2017-04-16Fix #1813 - Alleviate extra requests when processing mentions (#1938)Eugen
The <link rel="mentioned" /> tag refers to accounts by href. So we were matching the DB by the url attribute, and falling back to HTTP look-up. However, GS and Mastodon use profile URLs as URIs, too, and the match for that was missing. This could potentially alleviate some extra network requests
2017-04-17Merge branch 'master' into fix/cache_blockingEffy Elden
2017-04-16Adds note for instance admins. (#1925)Ash Furrow
* Adds note for instance admins. * Addresses feedback from #1925.
2017-04-16Add README note about tagged releases (#1927)Eugen
2017-04-16Clean up check that account needs a webfinger update (#1932)Matt Jankowski
2017-04-16Remove trailing whitespace in terms.no.html (#1933)Matt Jankowski
2017-04-16Simplify the og:image and og:description code in stream_entries/show (#1934)Matt Jankowski
2017-04-16Use local vars in partials (#1935)Matt Jankowski
* Use local vars in accounts/header partial * Use local variable in 2fa recovery codes partial
2017-04-16fix regex filter (#1845)abcang
* fix regex filter * fixed br to linebreak and, stlip tags. * change to send raw content * changed to unescape in reducer
2017-04-16Remove .keep in models (#1892)tackeyy
2017-04-16Add presence validation to Import (#1928)alpaca-tc
``` *An* `ActiveRecord::StatementInvalid` *occurred while* `POST </settings/import>` *was processed by* `imports#create` Exception ---------------- PG::NotNullViolation: ERROR: null value in column "type" violates not-null constraint ```
2017-04-16Add the licence key in package.json (#1914)Alda Marteau-Hardi
2017-04-16Fix translation related to "mute" (#1926)mshrtkch
2017-04-16Add missing Japanese translations (#1923)Kazuhiro NISHIYAMA
And `i18n-tasks add-missing -l ja` changes some quotes.
2017-04-16Relax Ruby version requirement (#1901)Akihiko Odaki
2017-04-16Improve PT locale on simple_form (#1917)Eduardo Elias
* Improve PT locale on simple_form * Add missing keys to PT locale
2017-04-16Fixed NoMethodError in UnfollowService (#1918)alpaca-tc
2017-04-16Fix yaml issue in ja locale (#1916)Matt Jankowski
* Fix yaml parse issue in ja.yml locale * Fix issue in locales/ja.jsx
2017-04-16Syntax error in japanese localisation (#1920)Naouak
assets:precompile was failling because of this missing comma.
2017-04-16Add missing french translation. (#1906)Erwan Leboucher
* Add missing french translation. Causing this error: [React Intl] Missing message: "navigation_bar.mutes" for locale: "fr", * Update fr.jsx
2017-04-16Enlarge font size to avoid autozooming of iPhone. (#1911)Yuki Nakagawa
2017-04-16Improve Japanese translation (#1909)George Hattori
2017-04-16Add binstub for rspec from rspec-core (#1913)Matt Jankowski
2017-04-16Update Japanese Translate (#1903)新都心(Neet Shin)
* [Update ja.jsx] Add Muted, Video_error and sorted * [Update ja] Added Recovery code's translation * [Update ja] Added Two-fact/Recovery's translation * Update ja.jsx
2017-04-16Unite all mandatory rake tasks in mastodon:daily (#1887)Eugen
* Unite all mandatory rake tasks in mastodon:daily Add mastodon:media:remove_remote task Make mastodon:maintenance:add_static_avatars more resilient to exceptions * Fix typo in task description
2017-04-16lock capistrano to 3.8.0 (#1890)Alex Dunn
2017-04-16Make file attachment on MediaAttachment optional (#1865)Eugen
Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI
2017-04-16cache blockings for reducing queries.Keiji Yoshimi
2017-04-16Fix up recovery codes design a little (#1866)Eugen
2017-04-16Remove unused gem: coffee-rails (#1885)luigi
2017-04-16Leave out the "Expires" header from S3 uploads (#1886)Joachim Viide
2017-04-16capistrano: allow overriding repo_url and branch (#1889)Alex Dunn
2017-04-16View spec fix (#1888)Matt Jankowski
* Add option to disable verify partial doubles * Add show_landing_strip? helper method * Use show_landing_strip? helper in accounts and stream entries views * Fix naming in view specs
2017-04-16Fix #1852 - Ensure feeds have valid <title> tags (#1875)Eugen
2017-04-16Show error message if video cannot be loaded (#1879)Isabelle Knott
2017-04-15Removed Heroku in-process spawning. (#1873)Ash Furrow
2017-04-15Indicate when a toot is part of a chain with a "reply all" icon (#1869)Eugen
2017-04-15Fix cross-origin integrity (#1871)Eugen
See <https://glitch.social/users/bea/updates/434>
2017-04-15English localization for mention notification was missing (#1867)Eugen
2017-04-15Check for a custom css file to help customization of instances (#1368)Naouak
* User can create a custom.scss to customize their instance without modifying gitted files. * Add documentation for customization. * Forgot the helper file * Fix Style to pass codeclimate * Requests from maintainer.
2017-04-15Make the rake mastodon:users:clear task properly clear out unconfirmed users ↵Eugen
(#1777) Before it cleared out user records only (e-mail, password) without freeing up the associated username (account record). Furthermore, since these records have no dependent records (due to no user activity) they can be deleted quickly with delete_all instead of destroy
2017-04-15ActiveRecord::NotFound is not defined (#1864)alpaca-tc
2017-04-15Fix typo in simple_form.eo.yml (#1848)oliverkeeble
2017-04-15Give SINGLE_USER a chance to register (#1820)Marcin Cieślak
An attempt to open a brand new Mastodon instance configured as SINGLE_USER_MODE=true will cause an exception. Enable temporary registration if we have no users in the database Fixes #1817
2017-04-15Add password reset for users from admin accounts area (#1841)Matt Jankowski
2017-04-15Remove isRequired from optional prop (#1843)Henry Smith
2017-04-15Fix function call name typo (#1851)Henry Smith
2017-04-15About page contact email (#1839)Matt Jankowski
* Correct site_contact_email typo * Separate about more page into partials, add specs