acd33101c5
Merge branch 'master' into fix/cache_blocking
2017-04-17 01:41:33 +10:00
99226aba93
Adds note for instance admins. ( #1925 )
...
* Adds note for instance admins.
* Addresses feedback from #1925 .
2017-04-16 16:59:53 +02:00
42c9d5111a
Add README note about tagged releases ( #1927 )
2017-04-16 16:42:46 +02:00
e0b5a94a4b
Clean up check that account needs a webfinger update ( #1932 )
2017-04-16 16:38:29 +02:00
26ec042f38
Remove trailing whitespace in terms.no.html ( #1933 )
2017-04-16 16:38:13 +02:00
73b0af5c93
Simplify the og:image and og:description code in stream_entries/show ( #1934 )
2017-04-16 16:38:02 +02:00
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
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
fc34e0e191
Remove .keep in models ( #1892 )
2017-04-16 16:28:52 +02:00
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
77d1447ac4
Add the licence key in package.json ( #1914 )
2017-04-16 16:08:11 +02:00
2c329f2b69
Fix translation related to "mute" ( #1926 )
2017-04-16 16:07:58 +02:00
c2762fa498
Add missing Japanese translations ( #1923 )
...
And `i18n-tasks add-missing -l ja` changes some quotes.
2017-04-16 16:07:45 +02:00
0611209141
Relax Ruby version requirement ( #1901 )
2017-04-16 14:57:30 +02:00
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
8f8319852c
Fixed NoMethodError in UnfollowService ( #1918 )
2017-04-16 14:55:43 +02:00
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
24baaa17e8
Syntax error in japanese localisation ( #1920 )
...
assets:precompile was failling because of this missing comma.
2017-04-16 14:54:09 +02:00
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
a8f45c0838
Enlarge font size to avoid autozooming of iPhone. ( #1911 )
2017-04-16 14:05:16 +02:00
6df63465b9
Improve Japanese translation ( #1909 )
2017-04-16 13:44:57 +02:00
13b11ddc8c
Add binstub for rspec from rspec-core ( #1913 )
2017-04-16 13:42:45 +02:00
f2997c9715
Update Japanese Translate ( #1903 )
...
* [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-16 13:42:16 +02:00
e17f9d5e1a
Unite all mandatory rake tasks in mastodon:daily ( #1887 )
...
* 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-16 12:53:58 +02:00
865cb39e9b
lock capistrano to 3.8.0 ( #1890 )
2017-04-16 12:52:18 +02:00
5d710b1139
Make file attachment on MediaAttachment optional ( #1865 )
...
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-16 12:51:30 +02:00
fd81916e86
cache blockings for reducing queries.
2017-04-16 12:20:38 +09:00
8a58942c80
Fix up recovery codes design a little ( #1866 )
2017-04-16 04:32:57 +02:00
f97272549c
Remove unused gem: coffee-rails ( #1885 )
2017-04-16 04:02:29 +02:00
363de2dffd
Leave out the "Expires" header from S3 uploads ( #1886 )
2017-04-16 04:01:58 +02:00
6a1ac9b31f
capistrano: allow overriding repo_url and branch ( #1889 )
2017-04-16 04:01:27 +02:00
3834e1e69b
View spec fix ( #1888 )
...
* 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-16 03:40:33 +02:00
95bcbaa434
Fix #1852 - Ensure feeds have valid <title> tags ( #1875 )
2017-04-16 02:40:36 +02:00
911338bdcc
Show error message if video cannot be loaded ( #1879 )
2017-04-16 01:12:47 +02:00
0f8b7d0660
Removed Heroku in-process spawning. ( #1873 )
2017-04-15 23:02:13 +02:00
e332552816
Indicate when a toot is part of a chain with a "reply all" icon ( #1869 )
2017-04-15 22:48:41 +02:00
0d83569899
Fix cross-origin integrity ( #1871 )
...
See <https://glitch.social/users/bea/updates/434 >
2017-04-15 22:48:30 +02:00
515434ed87
English localization for mention notification was missing ( #1867 )
2017-04-15 22:48:17 +02:00
3d3e32befb
Check for a custom css file to help customization of instances ( #1368 )
...
* 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-15 22:47:48 +02:00
fa08b5079d
Make the rake mastodon:users:clear task properly clear out unconfirmed users ( #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-15 21:55:28 +02:00
00392d3c63
ActiveRecord::NotFound is not defined ( #1864 )
2017-04-15 21:17:59 +02:00
28606d730a
Fix typo in simple_form.eo.yml ( #1848 )
2017-04-15 16:46:48 +02:00
1c8477eab2
Give SINGLE_USER a chance to register ( #1820 )
...
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-15 16:46:27 +02:00
6670e6d33f
Add password reset for users from admin accounts area ( #1841 )
2017-04-15 16:44:59 +02:00
9d2f55ecc3
Remove isRequired from optional prop ( #1843 )
2017-04-15 16:44:28 +02:00
b7ec2fd492
Fix function call name typo ( #1851 )
2017-04-15 16:41:22 +02:00
3b8908c114
About page contact email ( #1839 )
...
* Correct site_contact_email typo
* Separate about more page into partials, add specs
2017-04-15 13:33:25 +02:00
7b10794afb
Add rails-i18n gem ( #1837 )
2017-04-15 13:32:53 +02:00
355965c17b
Silence Devise deprecation warning about TestHelpers ( #1840 )
...
Devise changed their approach -
3f3ec236bb
2017-04-15 13:30:57 +02:00
0f889523e4
views/about: use Setting.site_title instead of hardcoding ( #1508 )
2017-04-15 13:28:09 +02:00
Effy Elden
Ash Furrow
Eugen
Matt Jankowski
abcang
tackeyy
alpaca-tc
Alda Marteau-Hardi
mshrtkch
Kazuhiro NISHIYAMA
Akihiko Odaki
Eduardo Elias
Naouak
Erwan Leboucher
Yuki Nakagawa
George Hattori
新都心(Neet Shin)
Alex Dunn
Keiji Yoshimi
luigi
Joachim Viide
Isabelle Knott
oliverkeeble
Marcin Cieślak
Henry Smith
Hiromi Kai