31f0bcf804
Refresh webfinger ( #1323 )
...
* Refresh local info for remote accounts when webfinger returns new values
It only refreshes account info if one of the URLs or the public-key changes,
in which cases it refreshes the full info, re-downloading the feeds from that
user.
Some special handling should probably be done when the public key changes,
but I have been unable to find any use for it in Mastodon yet.
* Re-fetch remote users we aren't subscribed to.
This might induce performance issues, we might want to only do that for users
we explicitly attempted to subscribe but failed to.
* Refactor changes
* Do not refresh existing remote account details more than once a day
* Avoid re-fetching webfinger info in tests unless otherwise specified
2017-04-15 03:16:05 +02:00
09540192c9
Rename admin/accounts_helper to admin/filter_helper ( #1816 )
...
- Add some spec coverage for both methods
- Add explicit constant call-outs for where the params are from
2017-04-15 03:09:55 +02:00
08059ddda9
jslint: fix jslint warnings ( #1704 )
...
* jslint: remove trailing space
* jslint: fix no-nested-ternary issue
Follow the jslint [no-nested-ternary](http://eslint.org/docs/rules/no-nested-ternary )
rule. Rewritten ternary with if-then.
2017-04-15 02:57:26 +02:00
ec9999cdfe
Update Traditional Chinese, HK (zh-HK) translation ( #1759 )
...
* Fix missing string in javascript locale (zh-HK)
* Change javascript locale (zh-HK)
* Fix some other strings that were still English.
* Improve `search.status_by`.
* Fix `notification.follow`. ("開始開始你")
* Changes according to user feedback.
* "Back": "較前顯示" -> "返回"
* "Home": "家" -> "主頁"
* Update ruby locale (zh-HK)
* Fix missing translation
* Normalize yml
* Update translation strings
2017-04-15 02:48:30 +02:00
4ba6acd518
Update nl.jxs ( #1766 )
...
Some rewording and switching to infinitive localization.
2017-04-15 02:44:33 +02:00
5d8d827436
Update Russian translation ( #1733 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
2017-04-15 02:43:51 +02:00
cde1f37d93
Use site title on tags#show page ( #1802 )
2017-04-15 02:37:20 +02:00
4bebeb27d3
More Norwegian translations ( #1805 )
...
* Working translation for Norwegian.
* Fixes to Norwegian translation.
* Further adjustments to Norwegian translation.
* Further adjustments to Norwegian translation.
* Yet more improvements to the Norwegian translation.
* More Norwegian translations. Better terminology.
2017-04-15 02:33:37 +02:00
ef879a8839
Send initial state in a <script type="application/json"> tag ( #1806 )
2017-04-15 02:32:42 +02:00
0655f16cc1
[css] reduce spacing between text elements on about pages ( #1510 )
2017-04-15 02:29:32 +02:00
a9529d3b4b
Allow running mastodon on a different domain as the one used for identifying users ( #1267 )
...
* Allow running mastodon on a different domain as the one used for identifying users
* Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing
* Compare to web_domain instead of local_domain when dealing with feeds/API
* Correctly identify mentions to local accounts
Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.
2017-04-15 02:15:46 +02:00
fe8dd58bc1
Add list of muted user to UI and Getting Started ( #1799 )
...
Add the same UI that already exists for blocked users for muted
ones and add it to the "Getting Started" menu.
2017-04-15 01:23:49 +02:00
f5cd138323
Improve i18n chooser ( #1804 )
...
* Add locale spec with failing locale plus region check
* Use a more accurate locale when supplied by browser headers
Previously we were using a matching option which would use the first locale
available which matched the locale portion, even if a region was specified.
This changes to first try to find an exact match, and then fall back to the
region, and then fall back to the default.
* Clean up default_locale method
2017-04-15 01:12:39 +02:00
fa89deb4eb
Add title attribute to URLs in statuses ( #1755 )
...
Since URLs in statuses are truncated, it would be pleasant to see the
full URL when hovering the URL (like on twitter, yes).
2017-04-14 13:22:56 +02:00
26a892dd90
Fix invalid byte sequence issue in nl.jsx ( #1751 )
2017-04-14 13:00:03 +02:00
8321884eef
Change usage of gsub to delete, as per Code Climate/Rubocop recommendation ( #1753 )
2017-04-14 12:50:00 +02:00
290e8ef854
Remove .keep in models ( #1748 )
2017-04-14 12:43:29 +02:00
1467515d3d
Use landmark regions on columns ( #1732 )
...
Closes mastodon#1720
2017-04-14 11:12:59 +02:00
8b74aa4217
Admin reports controller improvements ( #1714 )
...
* Simplify admin/reports controller filtering for index
* Rename parameter to resolved
* Fix issue where reports view could not access filter_link_to
* Add coverage for admin/reports controller
* DRY up resolution of related reports for target account
* Clean up admin/reports routes
* Add Report#statuses method
* DRY up current account action taken params
* Rubocop styles
2017-04-14 11:10:28 +02:00
a6807201d2
Implementing Subresource Integrity ( #1729 )
...
* Add sprockets-rails to Gemfile
* Add sprockets-rails to Gemfile.lock
* Update show.html.haml
* Update index.html.haml
* Update admin.html.haml
* Update auth.html.haml
* Update embedded.html.haml
* Update public.html.haml
2017-04-14 11:09:20 +02:00
41c697fd81
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
2017-04-13 22:25:07 +02:00
c5afe573da
Fix drag & drop overlay not appearing on firefox ( #1721 )
2017-04-13 22:21:34 +02:00
c0c56db0fa
Translate admin ( #1702 )
...
* Translate the domain_block panel
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Translate PubSubHubbub section
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* translate account section and correct typos
* move reports translation & translate sidebar
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* normalize l18n
2017-04-13 21:49:07 +02:00
55b56e3f95
terms: remove redundant words ( #1578 )
...
"at least X" and "X or older" have identical meanings.
Using both together feels a little jarring.
2017-04-13 19:50:19 +02:00
c4d39b1b3d
quick typo fix in en.jsx: Rejec -> Reject ( #1701 )
2017-04-13 19:37:04 +02:00
ac54da9394
Fix #1220 , fix #1671 - Hook up comment box to the Redux comment value ( #1699 )
...
Fix username styling regression introduced in #1063
Fix report screen background regression introduced in #1415
2017-04-13 19:36:41 +02:00
043862f411
Fix #1609 , fix #1628 - Revert #1397 ( #1700 )
...
When transmitting data in a HTML-encoded element like <content type="html" />,
relying on newlines being preserved is not wise, since HTML by itself
does not care for newlines - it cares for <p> and <br>
Additional fix: reset NSFW toggle after sending toot
2017-04-13 19:23:36 +02:00
5619099564
translation: Fix comment out issue in en.jsx ( #1698 )
2017-04-13 17:11:18 +02:00
ce80d0b0a9
Fix minor jslint issue ( #1697 )
...
* Undefined propType in react component `ColumnSettings`.
Add proper PropTypes definition.
2017-04-13 17:10:48 +02:00
5f8155482a
Add overlay style to buttons, continue video after expanding it
2017-04-13 17:01:09 +02:00
efcf9448da
Update settings_helper.rb
2017-04-13 16:16:39 +02:00
e70b84b1dc
Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox
2017-04-13 16:14:11 +02:00
9362700137
Convert emoji shortnames when sending status ( #1666 )
2017-04-13 16:03:45 +02:00
1206627c59
Add Dutch translation (nl) ( #1682 )
...
* Dutch language files for Ruby code
* Created RoR translation ymls:
* config/locales/devise.nl.yml
* config/locales/doorkeeper.nl.yml
* config/locales/nl.yml
* config/locales/simple_form.nl.yml
* Modified RoR config and helper
* app/helpers/settings_helper.rb
* config/application.rb
* Dutch language javascript locale
* Created javascript locale files:
* app/assets/javascripts/components/locales/index.jsx
* app/assets/javascripts/components/locales/nl.jsx
* Reference the newly created locale files:
* app/assets/javascripts/components/containers/mastodon.jsx
* Fix syntax error in locale file (nl)
* Fix missing translate in js locale (nl)
* Convert all ruby Dutch locale (nl) file to utf8
Fix yml conversion issues.
* Fix duplicated key in devise.nl.yml
* Fix indentation error in doorkeeper.nl.yml
2017-04-13 16:02:23 +02:00
edefcfcf42
Fix issue where 'sensitive content click to show' item takes up whole screen on public view ( #1692 )
2017-04-13 16:00:56 +02:00
b330d1f000
Organize coverage dirs ( #1695 )
...
* Add `Presenters` group to SimpleCov configuration
* Move validators to app/validators, add to simplecov config
2017-04-13 16:00:31 +02:00
1a5a54eb4b
Merge branch 'master' into master
2017-04-13 16:00:20 +02:00
447b8bc44e
Do not show media attachment as og:image if it was marked as NSFW ( #1693 )
2017-04-13 15:59:43 +02:00
093879c177
Fix language export variables ( #1689 )
...
* Fix naming of JS locale constants
* Improve the translation instructions re: const names
2017-04-13 15:59:12 +02:00
905a4faa1c
Update settings_helper.rb
2017-04-13 15:32:31 +02:00
5355b7d930
Update settings_helper.rb
2017-04-13 15:31:38 +02:00
00cc3066a2
Allow video to be expanded into lightbox
2017-04-13 09:09:45 -04:00
a57d30c680
[l10n] ja: update missing Japanese translations ( #1687 )
2017-04-13 14:39:14 +02:00
467d32fce3
[l10n] ja: update missing Japanese translations ( #1684 )
2017-04-13 13:40:58 +02:00
282bb55c3c
fix Portuguese translation ( #1661 )
...
* update portuguese translation
added the missing fields and improved the translation
* pt translations fix
* improve last translation commit
* fix damn quotes
2017-04-13 13:25:34 +02:00
0e4479bb3a
Update Japanese translation files ( #1640 )
...
* [l10n] ja: Improve Japanese Translations
* ja: about: Fix highlighting
* ja: Update Translations
* ja: Translate admin settings
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
* Update ja.jsx
* Update doorkeeper.ja.yml
* Update ja.yml
* Update ja.jsx
* Update ja.jsx
2017-04-13 13:23:45 +02:00
af7e880df5
Update Russian translation ( #1570 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
2017-04-13 13:23:23 +02:00
aa7bf1515c
Fix #624 - Add localization for Bulgarian ( #645 )
...
* Add translation files and declarations for Bulgarian
* Add a bunch of translations to bg.jsx
* Add rest of translations to bg.jsx
* Add devise translations
* Fix devise translations
2017-04-13 13:16:28 +02:00
4f781b17cc
Use input type `number` for Two-factor code ( #1683 )
2017-04-13 13:13:17 +02:00
137100dcf3
Clean up well-known routes/controllers ( #1649 )
...
* Add request spec for host meta route returning xml
* Add routing spec for xrd routes
* Update well-known routes
* Move webfinger and host-meta actions to their own controllers
2017-04-13 13:09:07 +02:00
ThibG
Matt Jankowski
Koala Yeung
Fjoerfoks
Ratmir Karabut
Thor Harald Johansen
Joachim Viide
Alex Dunn
Patrick Figel
Luc Didry
Effy Elden
西小倉宏信
JP DeVries
maxypy
Eugen Rochko
Thomas Citharel
Alyssa Ross
R Tucker
INAGAKI Hiroshi
Matteo Aquila
Rachel H
Isabelle Knott
YOSHIOKA Eiichiro
Musee U
Hugo Gameiro
新都心(Neet Shin)
Svetlozar Todorov
Daijiro Wachi