Eugen
181115422c
Disable CodeClimate duplication checks ( #1943 )
2017-04-16 18:26:46 +02:00
oliverkeeble
2adf65292c
Fix translation of 'reblogged' in eo.yml ( #1942 )
2017-04-16 18:11:07 +02:00
oliverkeeble
86d1dcc97a
Fix translation of 'reblogged' in eo.yml ( #1942 )
2017-04-16 18:11:07 +02:00
Eduardo Elias
a6beb78146
Add missing keys to PT locale ( #1941 )
2017-04-16 18:04:19 +02:00
Eduardo Elias
86eaaf0761
Add missing keys to PT locale ( #1941 )
2017-04-16 18:04:19 +02:00
alpaca-tc
5c2010661a
Check @recipient.user at the first ( #1939 )
2017-04-16 18:04:05 +02:00
alpaca-tc
19f63ff801
Check @recipient.user at the first ( #1939 )
2017-04-16 18:04:05 +02:00
Eugen
c2b4bafc33
Fix #1813 - Alleviate extra requests when processing mentions ( #1938 )
...
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-16 18:01:48 +02:00
Eugen
babbb2135e
Fix #1813 - Alleviate extra requests when processing mentions ( #1938 )
...
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-16 18:01:48 +02:00
Effy Elden
d52abe1cc7
Merge branch 'master' into fix/cache_blocking
2017-04-17 01:41:33 +10:00
Effy Elden
acd33101c5
Merge branch 'master' into fix/cache_blocking
2017-04-17 01:41:33 +10:00
Ash Furrow
03e110b671
Adds note for instance admins. ( #1925 )
...
* Adds note for instance admins.
* Addresses feedback from #1925 .
2017-04-16 16:59:53 +02:00
Ash Furrow
99226aba93
Adds note for instance admins. ( #1925 )
...
* Adds note for instance admins.
* Addresses feedback from #1925 .
2017-04-16 16:59:53 +02:00
Eugen
097041b15b
Add README note about tagged releases ( #1927 )
2017-04-16 16:42:46 +02:00
Eugen
42c9d5111a
Add README note about tagged releases ( #1927 )
2017-04-16 16:42:46 +02:00
Matt Jankowski
3052fe93ba
Clean up check that account needs a webfinger update ( #1932 )
2017-04-16 16:38:29 +02:00
Matt Jankowski
e0b5a94a4b
Clean up check that account needs a webfinger update ( #1932 )
2017-04-16 16:38:29 +02:00
Matt Jankowski
cff86fedcf
Remove trailing whitespace in terms.no.html ( #1933 )
2017-04-16 16:38:13 +02:00
Matt Jankowski
26ec042f38
Remove trailing whitespace in terms.no.html ( #1933 )
2017-04-16 16:38:13 +02:00
Matt Jankowski
a3a4fe2163
Simplify the og:image and og:description code in stream_entries/show ( #1934 )
2017-04-16 16:38:02 +02:00
Matt Jankowski
73b0af5c93
Simplify the og:image and og:description code in stream_entries/show ( #1934 )
2017-04-16 16:38:02 +02:00
Matt Jankowski
dce20ec3f5
Use local vars in partials ( #1935 )
...
* Use local vars in accounts/header partial
* Use local variable in 2fa recovery codes partial
2017-04-16 16:37:49 +02:00
Matt Jankowski
7efde22c3a
Use local vars in partials ( #1935 )
...
* Use local vars in accounts/header partial
* Use local variable in 2fa recovery codes partial
2017-04-16 16:37:49 +02:00
abcang
4e6ed3c06c
fix regex filter ( #1845 )
...
* fix regex filter
* fixed br to linebreak and, stlip tags.
* change to send raw content
* changed to unescape in reducer
2017-04-16 16:33:38 +02:00
abcang
90760eae4c
fix regex filter ( #1845 )
...
* fix regex filter
* fixed br to linebreak and, stlip tags.
* change to send raw content
* changed to unescape in reducer
2017-04-16 16:33:38 +02:00
tackeyy
813ee3cde6
Remove .keep in models ( #1892 )
2017-04-16 16:28:52 +02:00
tackeyy
fc34e0e191
Remove .keep in models ( #1892 )
2017-04-16 16:28:52 +02:00
alpaca-tc
30ef109bc5
Add presence validation to Import ( #1928 )
...
```
*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-16 16:28:26 +02:00
alpaca-tc
de72db99fa
Add presence validation to Import ( #1928 )
...
```
*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-16 16:28:26 +02:00
Alda Marteau-Hardi
f0cfb2cb90
Add the licence key in package.json ( #1914 )
2017-04-16 16:08:11 +02:00
Alda Marteau-Hardi
77d1447ac4
Add the licence key in package.json ( #1914 )
2017-04-16 16:08:11 +02:00
mshrtkch
ca1702f41c
Fix translation related to "mute" ( #1926 )
2017-04-16 16:07:58 +02:00
mshrtkch
2c329f2b69
Fix translation related to "mute" ( #1926 )
2017-04-16 16:07:58 +02:00
Kazuhiro NISHIYAMA
5f019cf675
Add missing Japanese translations ( #1923 )
...
And `i18n-tasks add-missing -l ja` changes some quotes.
2017-04-16 16:07:45 +02:00
Kazuhiro NISHIYAMA
c2762fa498
Add missing Japanese translations ( #1923 )
...
And `i18n-tasks add-missing -l ja` changes some quotes.
2017-04-16 16:07:45 +02:00
Akihiko Odaki
d22c508726
Relax Ruby version requirement ( #1901 )
2017-04-16 14:57:30 +02:00
Akihiko Odaki
0611209141
Relax Ruby version requirement ( #1901 )
2017-04-16 14:57:30 +02:00
Eduardo Elias
53632f945b
Improve PT locale on simple_form ( #1917 )
...
* Improve PT locale on simple_form
* Add missing keys to PT locale
2017-04-16 14:56:04 +02:00
Eduardo Elias
da302a43cd
Improve PT locale on simple_form ( #1917 )
...
* Improve PT locale on simple_form
* Add missing keys to PT locale
2017-04-16 14:56:04 +02:00
alpaca-tc
2aae4c5531
Fixed NoMethodError in UnfollowService ( #1918 )
2017-04-16 14:55:43 +02:00
alpaca-tc
8f8319852c
Fixed NoMethodError in UnfollowService ( #1918 )
2017-04-16 14:55:43 +02:00
Matt Jankowski
798e2b328a
Fix yaml issue in ja locale ( #1916 )
...
* Fix yaml parse issue in ja.yml locale
* Fix issue in locales/ja.jsx
2017-04-16 14:55:04 +02:00
Matt Jankowski
75f416a492
Fix yaml issue in ja locale ( #1916 )
...
* Fix yaml parse issue in ja.yml locale
* Fix issue in locales/ja.jsx
2017-04-16 14:55:04 +02:00
Naouak
50ad1c3762
Syntax error in japanese localisation ( #1920 )
...
assets:precompile was failling because of this missing comma.
2017-04-16 14:54:09 +02:00
Naouak
24baaa17e8
Syntax error in japanese localisation ( #1920 )
...
assets:precompile was failling because of this missing comma.
2017-04-16 14:54:09 +02:00
Erwan Leboucher
cc5bbc7048
Add missing french translation. ( #1906 )
...
* Add missing french translation.
Causing this error:
[React Intl] Missing message: "navigation_bar.mutes" for locale: "fr",
* Update fr.jsx
2017-04-16 14:15:03 +02:00
Erwan Leboucher
c99fc08a0d
Add missing french translation. ( #1906 )
...
* Add missing french translation.
Causing this error:
[React Intl] Missing message: "navigation_bar.mutes" for locale: "fr",
* Update fr.jsx
2017-04-16 14:15:03 +02:00
Yuki Nakagawa
003d62676b
Enlarge font size to avoid autozooming of iPhone. ( #1911 )
2017-04-16 14:05:16 +02:00
Yuki Nakagawa
a8f45c0838
Enlarge font size to avoid autozooming of iPhone. ( #1911 )
2017-04-16 14:05:16 +02:00
George Hattori
0418a1bd2d
Improve Japanese translation ( #1909 )
2017-04-16 13:44:57 +02:00