c0f0bcf17d
Add password reset for users from admin accounts area ( #1841 )
2017-04-15 16:44:59 +02:00
15b393201e
Add recovery code support for two-factor auth ( #1773 )
...
* Add recovery code support for two-factor auth
When users enable two-factor auth, the app now generates ten
single-use recovery codes. Users are encouraged to print the codes
and store them in a safe place.
The two-factor prompt during login now accepts both OTP codes and
recovery codes.
The two-factor settings UI allows users to regenerated lost
recovery codes. Users who have set up two-factor auth prior to
this feature being added can use it to generate recovery codes
for the first time.
Fixes #563 and fixes #987
* Set OTP_SECRET in test enviroment
* add missing .html to view file names
2017-04-15 13:26:03 +02:00
1549a9d997
Add some missing Spanish translations ( #1818 )
...
* Add missing spanish translations on user settings
simple_form.es.yml
* Fix typo: Aute/ción. should be Autenticación
2017-04-15 13:25:00 +02:00
a1d00eb993
Fix Japanese translation of ja.yml ( #1835 )
2017-04-15 13:18:08 +02:00
5e32054802
Update devise.fr.yml ( #1728 )
...
Very light grammar fix to improve gender-neutral
2017-04-15 02:55:43 +02:00
3c90f2bd4c
Add translations for zh-TW (Taiwan) ( #1794 )
2017-04-15 02:49:43 +02:00
3264c6d658
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
ade4168f91
Update nl.yml ( #1764 )
...
Some rewording, typos and switching to infinitve
2017-04-15 02:45:46 +02:00
44b0f14f5f
Update devise.fr.yml ( #1792 )
...
* Update devise.fr.yml
Consistencies across the French translation
* Update doorkeeper.fr.yml
2017-04-15 02:44:10 +02:00
66da14e13b
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
dfb94fed43
Mispelling & minor fixes ( #1814 )
2017-04-15 02:31:16 +02:00
3e08188dca
Remove unused will_paginate.page_gap key from i18n ( #1815 )
...
This value was changed recently, and every locale which had it set was using the
same value as the default. This value is still the default in the new location.
2017-04-15 02:30:55 +02:00
16004237f2
Polish translation (needs more love though) ( #807 )
...
* Polish translation (needs more love though)
* Polish translation bugfix
* bugfix for new colon-containing texts
* another bugfix. yaml is evil
* minor fix
* fixing issues pointed out by reviewers
* Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer
* Etyczny dizajn zbyt sarkastyczny, to będą założenia
2017-04-15 02:22:46 +02:00
492e8ec00e
Add REDIS_DB env variable to configure Redis database ( #1366 )
2017-04-15 02:21:13 +02:00
c45c67c2ac
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
5da8581563
Custom Paperclip path. ( #778 )
...
* Custom Paperclip path.
* Document PAPERCLIP_ROOT.
* Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).
2017-04-15 02:07:21 +02:00
692199a07a
Add missing Japanese translations ( #1785 )
2017-04-14 19:10:12 +02:00
b7561baee4
Fix Japanese translation for remote_follow ( #1771 )
...
Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.
2017-04-14 19:09:52 +02:00
22f1d9099a
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
98aa3c9ccb
Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. ( #1745 )
2017-04-14 11:02:25 +02:00
e9261cd3b8
Fix italian translation
2017-04-13 22:26:32 +02:00
10b8829c02
Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master
2017-04-13 22:25:07 +02:00
12df378904
Make browserify respect changes in node_modules for asset compilation ( #1722 )
2017-04-13 22:21:20 +02:00
73a299b51b
Update devise.it.yml
2017-04-13 22:09:47 +02:00
9d35b8de47
Update devise.it.yml
2017-04-13 22:06:19 +02:00
0659f879d9
Make boost modal off by default ( #1719 )
2017-04-13 21:53:59 +02:00
f3ae46a512
Add filename extension to paperclip ( #1718 )
2017-04-13 21:52:56 +02:00
03fe4e36a6
Use english in reported by translation ( #1713 )
2017-04-13 21:49:46 +02:00
cbe58bb4e8
Fr missing strings ( #1708 )
...
* Fix missing translation for username already taken
* fr - note too long translation
2017-04-13 21:49:34 +02:00
6524136728
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
31f72c39a6
smtp delivery type fix ( #1556 )
...
* delivery fix
# Conflicts:
# config/environments/production.rb
* added stub in .env file
* reordered and added a comment
2017-04-13 19:51:49 +02:00
553dc8dbb5
Apply `i18n-tasks normalize` to locales ( #1696 )
2017-04-13 19:18:32 +02:00
ff826c68eb
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
b57c52c7e7
Update application.rb
2017-04-13 15:33:45 +02:00
9410b7cbc6
Rename simple_form.it.yml to config/locales/simple_form.it.yml
2017-04-13 15:28:30 +02:00
3281686b5c
Rename devise.it.yml to config/locales/devise.it.yml
2017-04-13 15:28:15 +02:00
125657117b
Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml
2017-04-13 15:27:56 +02:00
c1e2949b86
Rename it.yml to config/locales/it.yml
2017-04-13 15:27:37 +02:00
a3019ede5a
[l10n] ja: update missing Japanese translations ( #1684 )
2017-04-13 13:40:58 +02:00
81b05262f5
Adds Croatian language [Hrvatski] ( #1000 )
...
* Create simple.form.hr.yml
* Create hr.yml
* Update hr.yml
* Update hr.yml
* Create doorkeeper.hr.yml
* Create devise.hr.yml
2017-04-13 13:38:44 +02:00
67ed9d8f18
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
5a7354ef00
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
651b89199a
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
d8789124ae
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
26ea2f70bd
Admin accounts controller cleanup ( #1664 )
...
* Remove unused account_params method in admin/accounts controller
* Introduce AccountFilter to find accounts
* Use AccountFilter in admin/accounts controller
* Use more restful routes admin silence and suspension area
* Add admin/silences and admin/suspensions controllers
2017-04-13 13:04:23 +02:00
d898b8d958
Adjustments to the Norwegian translation ( #1648 )
...
* Working translation for Norwegian.
* Fixes to Norwegian translation.
* Further adjustments to Norwegian translation.
* Further adjustments to Norwegian translation.
2017-04-13 02:17:26 +02:00
caddfb64aa
[l10n] ja: Improve Japanese Translations ( #1631 )
...
* ja: about: Fix highlighting
* ja: Update Translations
* ja: Translate admin settings
Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-04-12 20:41:50 +02:00
6ffc89a2e7
fix Japanese translation ( #1623 )
...
* add device.ja.yml
* update device.ja.yml
* add file simple_form.ja.yml
* 👍 Added doorkeeper.ja.yml
* add ja.yml
* Update doorkeeper.ja.yml
fixed url to uri
* update ja.yml
* fix some translations
* fix japanese grammar of a translate
* fix some translates
* fix ja.yml
* add ja.jsx
* add Japanese user mail views
* Added japanese translate locales
* Added :ja to available_locales
こっちも
* Added "日本語" to HUMAN_LOCALES
* Imported/Added ja to addLocaleData
* update ja.jsx
* fix translations
翻訳の誤りの修正と改善
* freeの訳修正
* いいねをお気に入りに統一
* Revert "いいねをお気に入りに統一"
This reverts commit 568d5cccfa0b6620ccb6c9db8346c52c0396d99f.
間違ってtranslateブランチにコミットしたため取り消し
* Revert "freeの訳修正"
This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf.
* revertでミスったので戻す
* Revert "ミスったので戻す"
This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing
changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116.
* freeの訳修正
* いいねをお気に入りに統一
* 一回戻す
* 戻しきれてなかった
* 再度変更
* 戻す
* 再度変更
* 再度変更
* Update doorkeeper.ja.yml
Fixed a lot of unnatural translations
* Update ja.yml
資格情報 isn't easy to understanding. so fixed to ログイン情報.
* Update ja.yml
fixed some unnatural translations
* Update simple_form.ja.yml
Fixed wrong translate 「アカウント」 to 「アイコン画像」
* Update simple_form.ja.yml
* Update doorkeeper.ja.yml
* Revert "多くの不自然な翻訳を解消しました。"
* Update ja.jsx
fixed typo
* 文字化け修正
2017-04-12 20:19:38 +02:00
39dd2aaae7
Fix incorrect notation in simple_form.ja.yml ( #1620 )
2017-04-12 20:19:27 +02:00
2d2b114d9b
Update fr.yml ( #1600 )
...
Mistake on %{link} variable
2017-04-12 19:56:09 +02:00
d1ebb63c54
Quick best practice cleanup of views/helpers ( #1546 )
...
* Remove trailing whitespace
* Use query methods instead of explicit .blank? checks
2017-04-12 18:24:18 +02:00
bf7306636e
Allow import/export of mutes list ( #1541 )
...
* Allow export of mutes list
* Allow importing of mutes list
* Refactor to use Settings::Exports::BaseController and DRY up exports code
2017-04-12 18:20:44 +02:00
7fd5075806
Added missing Spanish translations strings ( #1292 )
...
* Added missing Spanish translations strings
* fix bad translation
* resolve conflict with tootsuite/master
* agreements from spanish community
* Add some missing strings
2017-04-12 17:16:40 +02:00
cd2324b07b
Make Reporting admin section translatable ( #1549 )
...
* Make Reporting admin section translatable
And translate it into english and french
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Make subject of emails translatable and improve french translation
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Make error pages translatable and translate them in english and french
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* Translate site setting section
* Insert instance in registration emails and improve them a bit
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-12 17:11:49 +02:00
b2c1df5c20
Working translation for Norwegian. ( #1611 )
2017-04-12 17:07:51 +02:00
c27253cbb6
Default to json type for webfinger requests ( #1583 )
2017-04-12 16:03:37 +02:00
a3bfac26fb
Add Traditional Chinese, Hong Kong translation (zh-HK) ( #1544 )
...
* Added Chinese Traditional Hong Kong (zh-HK) for Ruby
* Added translations for Ruby.
* Added Chinese Traditional Hong Kong (zh-HK) for JS
* Added translations for javascript code.
* Rearrange language references in mastodon.jsx
* Break `addLocaleData` into multiple lines. Make future commit more readable.
* Roughly re-sort the languages in alphabetical orders
(only manually put English on top because it is default).
* Sort application.rb locale with alphabetical order
With exception that English (default language) goes first.
Improve code readability.
* Resort language selection box alphabetically
Sort HUMAN_LOCALES in the alphabetical order of display name
(except English, the default language, come first).
Improve usability.
2017-04-12 08:50:50 +02:00
9dac43b6d1
Change default log level in production from :debug to :info for less I/O ( #1579 )
2017-04-11 23:28:23 +02:00
3120d41c53
Fix #1535 - #1372 set a wrong default on :openssl_verify_mode ( #1563 )
2017-04-11 22:49:53 +02:00
63e46e27f0
Refactor exports controller ( #1567 )
...
* Add basic coverage for settings/exports controller
* Remove unused @account variable from settings/exports controller
* Add coverage for download export actions
* Remove deprecated `render :text` in favor of `send_data` for csv downloads
* Add model to handle exports
* Use Export class in settings/exports controller
* Simplify settings/exports controller methods
* Move settings/export to more restful routes
2017-04-11 22:00:43 +02:00
c471e5c694
Update french locale ( #1525 )
...
* Update devise.fr.yml fixing minor typos
* add missing strings
* Fix a translation and add translation for devise part
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-11 21:54:40 +02:00
601d93bfc3
Add Japanese translation ( #1552 )
...
* add device.ja.yml
* update device.ja.yml
* add file simple_form.ja.yml
* 👍 Added doorkeeper.ja.yml
* add ja.yml
* Update doorkeeper.ja.yml
fixed url to uri
* update ja.yml
* fix some translations
* fix japanese grammar of a translate
* fix some translates
* fix ja.yml
* add ja.jsx
* add Japanese user mail views
* Added japanese translate locales
* Added :ja to available_locales
こっちも
* Added "日本語" to HUMAN_LOCALES
* Imported/Added ja to addLocaleData
* update ja.jsx
2017-04-11 21:52:09 +02:00
58a75b4bed
Revised finnish translation ( #1537 )
2017-04-11 21:41:40 +02:00
b1b9d0fee7
Update language files ( #1516 )
...
* update faq with default language
* update translation for about page
* update Minio config
Thanks to @Gargon for helping me. I hope this will help others as well
* update import and export translation
* translate emails to finnish
* add finnish translation for emails
* add finnish translation for emails
* add finnish translation
* add missing dot
* update finnish language to emails
* add finnish translation for emails
* add dot and fix typo
* updated some minor typos
* remove language change due breaking emails
And by dev request
* updated minio config by dev request
* updated about page translation
* fix for Amazon S3/Minio instance setups
If you were using S3 or Minio for your files, this will fix the Import issue :)
* update translation according to issue #1515
See issue #1515
* update translation for issue #1515
see issue #1515
2017-04-11 21:41:29 +02:00
b440b2a9ee
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
2017-04-11 20:43:56 +02:00
e7d77f4e13
Allow user to disable the boost confirm dialog in preferences
2017-04-11 10:10:16 -04:00
dc7ea0225a
Avoid user enumeration with devise paranoid mode ( #1527 )
2017-04-11 14:21:15 +02:00
fcec9fcd99
Pagination improvements ( #1445 )
...
* Replace will_paginate with kaminari
* Use #page instead of #paginate in controllers
* Replace will_paginate.page_gap with pagination.truncate in i18n
* Customize kaminari views to match prior styles
* Set kaminari options to match prior behavior
* Replace will_paginate with paginate in views
2017-04-11 01:11:41 +02:00
b4950a59bb
Version bumps for ruby and misc gems ( #1159 )
...
* Update rspec-rails to version 3.5.2
* Update addressable to version 2.5.1
* Update autoprefixer-rails to version 6.7.7.1
* Update bullet to version 5.5.1
* Update domain_name to version 0.5.20170404
* Update letter_opener_web to version 1.3.1
* Upate redis-rails to version 5.0.2
* Update active_record_query_trace to version 1.5.4
* Update capistrano-rails to version 1.2.3
* Update dotenv-rails to version 2.2.0
* Update pg to version 0.20.0
* Update tilt to version 2.0.7
* Update warden to version 1.2.7
* Update tins to version 1.13.2
* Update terminal-table to version 1.7.3
* Update oj to version 2.18.5
* Update simplecov to version 0.14.1
* Update uglifier to version 3.1.13
* Update hashdiff to version 0.3.2
* Update webmock to version 2.3.2
* Update devise to version 4.2.1
* Use ruby version 2.4.1
* Update sass to version 3.4.23
* Update puma to version 3.8.2
* Update will_paginate to version 3.1.5
* Update font-awesome-rails to version 4.7.0.1
* Update fuubar to version 2.2.0
* Update pry-rails to version 0.3.6
* Update simple-navigation to version 4.0.5
* Update rubocop to version 0.48.1
* Update doorkeeper to version 4.2.5
* Update faker to version 1.7.3
* Update aws-sdk to version 2.9.5
* Update fabrication to version 2.16.1
* Update hamlit-rails to version 0.2.0
* Update http to version 2.2.1
* Update httplog to version 0.99.2
* Update sidekiq to version 4.2.10
* Update rspec-sidekiq to version 3.0.0
* Update pghero to version 1.6.4
* Update rack-cors to version 0.4.1
* Update i18n-tasks to version 0.9.13
* Update ruby-oembed to version 0.12.0
* Update jquery-rails to version 4.3.1
* Update simple_form to version 3.4.0
* Update react-rails to version 1.11.0
* Update aws-sdk to version 2.9.6
* Update sidekiq-unique-jobs to version 5.0.0
* Update uglifier to version 3.2.0
2017-04-10 22:47:41 +02:00
7ff773bed5
More SMTP customization ( #1372 )
...
* Allow SMTP auth method customization
* Add SMTP openssl_verify_mode option support
Allows one use self-signed certs with their SMTP server.
* Add SMTP enable_starttls_auto option support
2017-04-10 21:48:30 +02:00
ac50bab158
Add Russian translation (ru) ( #1023 )
...
* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
2017-04-10 12:52:06 +02:00
ef5d7dec72
Add comment to settings.yml to nudge admins towards editing values via Web UI ( #1289 )
...
* Put a useful message for new admins on /about/more
I totally failed to realize this file was just defaults. I think
this message would be a good default for people like me.
* Revert default site description, expand comment
This will keep setup-related stuff from leaking into public views,
while still hopefully keeping over-eager admins from editing this
file unnecessarily before RTFMing. (e.g., me)
2017-04-09 18:34:29 +02:00
6e0b4032b3
Allow users to update their Account in the API ( #1179 )
...
* Allow users to update their Account in the API
It would be nice for API clients to be able to allow users to update
their accounts without having to wrap Mastodon in a web view. This patch
adds an API endpoint to let users submit a PATCH for their account.
Signed-off-by: David Celis <me@davidcel.is>
* Add /api/v1/accounts/update_credentials to the API docs
Signed-off-by: David Celis <me@davidcel.is>
2017-04-09 18:33:40 +02:00
d473a092e3
French translation update ( #1271 )
...
* Update confirmation_instructions.fr.html.erb
consistency across the French translation
* Update
consistency across the French translation
* Update fr.yml
a bunch of consistency across the French translation + a few typos
* Update doorkeeper.fr.yml
consistency across the French translation (punctuation)
2017-04-09 14:55:58 +02:00
3bfac1374d
French typo ( #1257 )
...
* French typo
* Datetime french translation
2017-04-09 14:54:47 +02:00
41b79ae693
Clean up about page ( #1282 )
...
* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter
2017-04-09 14:47:25 +02:00
27ab3d3d36
Ignore implied formats for catch all route requests ( #1340 )
...
A request to `/test` would show the custom 404 page, but a request to
`/test.test` would return a 404 with an empty body.
This change ignores the format on incoming catch all route requests, so that the
html 404 page is returned on these requests.
2017-04-09 14:39:41 +02:00
0cec9862db
Add env variable to disable prepared statements ( #1293 )
2017-04-09 05:46:32 +02:00
90101a724c
Allows setting log level in env variable ( #1290 )
...
* Allows setting log level in env variable.
* Made changes based on feedback in #1290 .
2017-04-09 01:42:13 +02:00
b532134503
Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled ( #1278 )
...
* Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled
* Clean up
2017-04-08 22:20:08 +02:00
a9863c1708
Update french translation ( #1148 )
...
Add french translation for emails sent
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Add non-breaking spaces
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
changes and fixes to the nbsps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
French update
a few fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-08 13:11:16 +02:00
201019e2c3
Fixed two translation errors ( #1139 )
...
Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx
2017-04-08 13:03:11 +02:00
58fcc553f3
Update simple_form.de.yml ( #971 )
2017-04-08 13:02:07 +02:00
3c063ae050
Updated about page in Finnish language ( #1170 )
...
* update faq with default language
* update translation for about page
* update Minio config
Thanks to @Gargon for helping me. I hope this will help others as well
* update import and export translation
* translate emails to finnish
* add finnish translation for emails
* add finnish translation for emails
* add finnish translation
* add missing dot
* update finnish language to emails
* add finnish translation for emails
* add dot and fix typo
* updated some minor typos
* remove language change due breaking emails
And by dev request
* updated minio config by dev request
* updated about page translation
2017-04-08 12:17:34 +02:00
10a0055a2a
French translation update ( #1188 )
...
* Update fr.yml
one typo fix
* Update simple_form.fr.yml
one translation consistency
2017-04-08 12:16:49 +02:00
3b9a56d4b3
Merge branch 'master' into master
2017-04-07 22:21:21 -04:00
1a82d2bde6
Use I18n for media attachment validation errors
...
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
2017-04-07 14:23:18 -04:00
ef7240169a
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
fb0ce9d38d
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
9bb84337a7
Allow setting of default language through config
...
Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug
2017-04-07 12:40:26 +02:00
1781fcaea4
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
783de713cd
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
06e3d9bdd8
Make sure Rabl is using Oj
2017-04-05 19:29:30 +02:00
5c414eeb45
updated blocking translation
2017-04-05 14:53:35 +02:00
16d14e854b
updated two-way auth and preferences translation
2017-04-05 14:49:29 +02:00
d49612327a
updated translation for about page
2017-04-05 14:47:42 +02:00
c0295924bc
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
c33a8ce307
updated reblog to boost translation
...
Since it is that :D
2017-04-05 09:57:25 +02:00
7ea7713997
udpdated display_name translation
2017-04-05 09:52:31 +02:00
b97a8236fb
updated reblog translation
2017-04-05 09:51:35 +02:00
d9f1e07c6c
Fix spec
2017-04-05 03:31:26 +02:00
05de364fbc
Merge pull request #863 from Eychics/master
...
Add closed_registrations message on French language
2017-04-05 03:11:13 +02:00
c571ed77d7
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
cc82f3adff
Merge pull request #866 from kklleemm/patch-1
...
Fix typos on french translations
2017-04-05 03:06:41 +02:00
45c3772ddb
Merge pull request #792 from chapeaumeinfreund/master
...
Updated and fixed german orthography
2017-04-05 03:05:50 +02:00
27b758f328
Merge pull request #790 from chapeaumeinfreund/patch-1
...
Updated and fixed german orthography
2017-04-05 03:05:31 +02:00
4751381a24
Merge pull request #852 from peterkeen/email-whitelist-817
...
[#817 ] Add email whitelist
2017-04-05 03:04:58 +02:00
2f7da4167f
Merge pull request #805 from nevillepark/master
...
Changed "reblogs" to "boosts"
2017-04-05 03:00:57 +02:00
ba8744d0a7
Fix typos on french translations
2017-04-04 19:09:54 +02:00
6afd3a6eab
Add closed_registrations message on French language
2017-04-04 18:58:19 +02:00
f28fcf9080
[ #817 ] Add email whitelist
...
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.
Fixes #817
2017-04-04 11:20:15 -04:00
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
0c0e1c2519
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
0c0acb22e6
updated translation
2017-04-04 08:29:53 +02:00
7b297cc6d2
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
d6d192c914
added Esperanto (eo)
2017-04-03 20:22:50 +02:00
c23ef9a706
Fix norwegian translation being malformed
2017-04-03 19:50:55 +02:00
ce9bb73e96
Updated and fixed orthography
2017-04-03 19:10:48 +02:00
b8324b3aed
Updated and fixed german orthography
2017-04-03 19:01:17 +02:00
6ebe31e716
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
c1f52eaff1
Add Norwegian locale
2017-04-03 16:32:03 +02:00
e74a4efa20
another typo. fuck me
2017-04-03 14:56:13 +02:00
54db5aa06c
fixed an sneaky peaky tpy
2017-04-03 14:54:53 +02:00
bed61b7cc4
add finnish translation
...
add finnish translation
2017-04-03 14:43:07 +02:00
aa77d63da9
add finnish translation
...
add finnish translation
2017-04-03 14:20:50 +02:00
35ad63910d
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
1c84f62d6d
add finnish translation
...
add finnish translation
2017-04-03 13:35:12 +02:00
cbff9a2e15
finnish translation
...
finnish translation
2017-04-03 13:25:46 +02:00
5045c23636
updated final translation
...
updated final translation
2017-04-03 13:07:09 +02:00
7606beb4dd
Create new translation file
...
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
38bf31d425
Improve french translation
2017-04-03 11:04:00 +02:00
7d5921dd5c
Improve French translation
...
Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03 03:16:37 +02:00
720922cd13
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
066b904205
Fix typo in simple_form.fr.yml
2017-04-02 14:04:06 -07:00
b7554089cb
Improve translation of data import in fr.yml
2017-04-02 14:03:57 -07:00
6162adec16
Better translation for revoked token in doorkeeper.fr.yml
2017-04-02 14:03:41 -07:00
53e0834cf4
Fix date format in doorkeeper.fr.yml
2017-04-02 14:03:31 -07:00
0335a52e28
Merge pull request #741 from eramdam/feature/improve-french-locales
...
Improve/add some French locales
2017-04-02 22:22:44 +02:00
00e99e58db
Add proper error page for request timeouts
2017-04-02 19:43:44 +02:00
180edd4baa
Add locale in devise.fr.yml
2017-04-01 23:38:40 -07:00
9ba1d01fe4
Add french translation for "scopes" in doorkeeper.fr.yml
2017-04-01 23:35:11 -07:00
cfc96a619c
Fix small typo in doorkeeper.fr.yml
2017-04-01 23:34:37 -07:00
ef1c4de714
Complete localization of in simple_form.fr.yml
2017-04-01 23:26:26 -07:00
b256d43b14
Improve french locales on the backend (WIP)
2017-04-01 23:15:49 -07:00
be9accbacc
Fix #700 - hide spoilers on static pages
2017-03-31 13:54:36 +02:00
244da78105
Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )
2017-03-30 19:42:33 +02:00
74fb333eb7
Fix up some localizations
2017-03-26 13:22:38 +02:00
58c9d97d07
🌐 add simplified chinese language
2017-03-26 14:13:18 +08:00
e4205b09d1
🚧 chinese translation WIP
2017-03-24 19:03:14 +08:00
017e3b7da8
🌐 add chinese language file
2017-03-24 18:53:41 +08:00
11f8faa6ba
🔧 S3 protocol from ENV
...
add support for reading S3 protocol from ENV
also add S3_HOSTNAME in .env.production.sample
2017-03-23 15:44:55 +08:00
b3cb765a94
Prettier account and stream entry URLs
2017-03-22 19:55:14 +01:00
3893f75a51
New API method: /api/v1/search
...
Returns accounts, statuses, hashtags arrays
2017-03-22 02:32:27 +01:00
8785e271bf
Improved landing page
2017-03-21 19:18:37 +01:00
47c74efa85
Add landing strip
2017-03-20 03:36:29 +01:00
b339e488fe
Export follow/block lists as CSV
2017-03-19 20:29:41 +01:00
a19062b726
Federate header images, fix open-uri http->https redirection error
2017-03-18 22:51:20 +01:00
5c7b222769
Promote Apps ( #670 )
...
"Various apps are available" is now a hyperlink
2017-03-17 16:16:39 +01:00
c97f817e40
Fix #525 - Add instance information API
2017-03-15 23:12:48 +01:00
6599b27b2b
Merge branch 'master' into mastodon-site-api
2017-03-15 22:55:22 +01:00
453d65e6da
Obfuscate filenames better, double rate limits
2017-03-14 15:59:21 +01:00
250beb1971
Revert earlier fix due to new bug reports
2017-03-06 02:25:41 +01:00
65b49d95b7
Make the paperclip filename interpolator smarter about the :original style
...
If an :original gets converted into another format, it would get saved as
original_filename *anyway*, so generating the extension is pointless and
yields bad results for when you change the style definition later. This way,
old gifs will still have correct URLs
2017-03-05 23:03:49 +01:00
c911ade272
Detect videos with no sound, handle them like gifv
2017-03-05 22:55:24 +01:00
d1e1f26878
Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies
...
Redirect /:username to /users/:username
Redirect /:username/:id to /users/:username/updates/:id
Updated API documentation and sponsors
2017-03-05 17:27:17 +01:00
4b93cf88e5
Fix #431 - convert gif to webm during upload. Web UI treats them like it did
...
before. In the API, attachments now can be either image, video or gifv. Gifv
is to be treated like images in terms of behaviour, but are videos by file
type.
2017-03-04 23:02:24 +01:00
0cb5a2a0a7
Add digest e-mails
2017-03-04 00:00:48 +01:00
4554ccd5d0
Mute button progress so far. WIP, doesn't entirely work correctly.
2017-03-01 22:31:21 -06:00
b39356835b
Adds site metadata access to the API
2017-02-27 04:06:25 -08:00
a741049a77
Fix #104 - Style OAuth authorized applications page
...
Add ability to search accounts by display name
2017-02-27 00:15:00 +01:00
75d5dc1df8
Improve glow
2017-02-23 02:14:35 +01:00
7f9d6d0160
Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments
...
Make replies default to privacy settings of the status being replied to
2017-02-17 01:30:24 +01:00
0613d66df8
Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report
2017-02-17 00:42:52 +01:00
6917e53fe0
Adding index overview for reports in admin UI
2017-02-16 02:28:10 +01:00
0fe2cc37ee
Expose Link headers via CORS
2017-02-15 23:26:17 +01:00
513a78d67b
Fix admin UI for accounts somewhat
2017-02-15 00:22:58 +01:00
2cc31b3194
Adding POST /api/v1/reports API, and a UI for submitting reports
2017-02-14 20:59:26 +01:00
a83dc927d8
Fix #587 - Display TOTP secret next to QR code
2017-02-13 20:56:03 +01:00
03ce24d3bf
Update service timeout setting from 15s to 90s
2017-02-13 20:42:02 +01:00
f9f8f52fe9
Stop trying to shoehorn all Salmon updates into the poor database-connected
...
StreamEntry model. Simply render Salmon slaps as they are needed
2017-02-12 01:19:14 +01:00
32580cc661
Site title is now a setting
2017-02-10 22:37:11 +01:00
3f854bd75c
Add link to other instances text
...
Text for link to other instances
2017-02-10 13:08:47 -05:00
7037774d6e
Merge pull request #603 from evanminto/activitypub-account
...
Expose ActivityStreams 2.0 representation of accounts
2017-02-07 02:08:40 +01:00
b1f2683ecc
Add API modifiers to limit returned toots from public/hashtag timelines
...
to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen
2017-02-06 23:16:20 +01:00
db7affbf5b
Reuse existing controller and route
2017-02-06 01:19:26 -08:00
2f126b1225
Removing failed push notification API, make context loads use cache
2017-02-05 17:51:44 +01:00
efa4065029
Preheat status cache
2017-02-05 17:24:18 +01:00
e02bfd0aa2
Remove unnecessary leftover code
2017-02-04 14:49:24 -08:00
b56d24ed71
Add an account endpoint for ActivityPub and link to it on HTML profile pages
2017-02-04 14:46:23 -08:00
9bd2b6be86
Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
...
work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
2017-02-04 00:34:31 +01:00
727d236fcc
Cleaning up format of broadcast real-time messages, removing
...
redis-backed "mentions" timeline as redundant (given notifications)
2017-02-02 00:03:31 +01:00
1e89e8e74d
Looks like log level :debug is required for activerecord times to be tracked
2017-02-01 12:13:16 +01:00
8f9729ec2d
Fix activerecord logging in production
2017-02-01 11:34:50 +01:00
38b7551359
Add "open in web" link to detailed public status pages
2017-01-30 23:01:37 +01:00
28e528bfcb
Add capistrano to development environment
2017-01-30 20:03:17 +01:00
9327d05bf7
API for apps to register for push notifications
2017-01-29 01:30:32 +01:00
c58da52e9f
Split 2FA login into two prompts
2017-01-28 20:43:38 +01:00
557de8e24c
Update settings to re-use admin layout, one big navigation tree, improve settings forms
2017-01-28 03:56:10 +01:00
0bf8c1b5d8
Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled)
...
Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit
2017-01-27 20:35:16 +01:00
9b8670c939
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
8008b60324
Fix key names in statsd
2017-01-26 19:46:52 +01:00
fd23876e75
Improve StatsD instrumentation
2017-01-26 19:08:05 +01:00
4bd0286045
Fix up timeout, improve contrast on "show more", add responsive style
...
for extremely wide monitors
2017-01-26 18:48:56 +01:00
096ff9ba38
Removed accidental n+1 query from notifications, updated some deps,
...
improved how "show more" link looks
2017-01-26 14:52:07 +01:00
72514a07b9
Add redirect for /admin => /admin/settings
2017-01-26 18:59:35 +11:00
959e064186
Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text
...
Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations
2017-01-25 01:29:16 +01:00
4d39cc7bf9
Add /api/v1/notifications/clear, non-existing link cards for statuses will
...
now return empty hash instead of throwing a 404 error. When following,
merge into timeline will filter statuses
2017-01-23 21:09:27 +01:00
f80c55b591
Fix error
2017-01-22 23:07:31 +01:00
e161d2acdc
Override Rack::Request to use the same trusted proxy settings as Rails
2017-01-22 21:01:28 +01:00
ef376b0bfd
Allow to specify trusted proxies through env
2017-01-22 20:35:49 +01:00
7344c75a27
Fix code style
2017-01-21 22:19:13 +01:00
3916a753d2
Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
2017-01-21 22:15:22 +01:00
f4836b9077
Method to fetch a single notification
2017-01-21 22:14:13 +01:00
432cc1d3c1
Set remote dev environments to use letter_opener_web, add default .env.vagrant variables
2017-01-21 20:22:49 +11:00
f748a91ec7
Fix #463 - Fetch and display previews of URLs using OpenGraph tags
2017-01-20 01:00:14 +01:00
31d48af0d1
Fix statsd null backend not being initialized properly
2017-01-19 09:37:07 +01:00
86264a950c
Add optional StatsD performance tracking
2017-01-18 23:44:29 +01:00
7865ce28e5
Add sounds for notifications. Boop by @jk@mastodon.social
2017-01-17 20:09:03 +01:00
a898072d76
Add Heroku deployment support
2017-01-17 22:00:03 +11:00
3471b9acb1
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
...
Fix S3 default settings
2017-01-15 14:29:47 +01:00
5d88ef90c9
Fix tests, add applications to eager loading/cache for statuses, fix
...
application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464 until it's consistent with non-animated version
2017-01-15 14:01:33 +01:00
db40fd4641
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
2017-01-15 20:58:46 +11:00
21c888fefd
Add a textual 'Back to Mastodon' link in footer of settings pages
2017-01-15 11:03:35 +11:00
f2667139ad
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
533448be42
Add extended about page stub
2017-01-13 03:24:41 +01:00
7e7c2bbb0f
Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
...
with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage
2017-01-12 20:46:24 +01:00
001a73c6fc
Fix env variable name
2017-01-10 22:01:13 +01:00
4293e132d1
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
f29df16eea
Fix Paperclip timeout setting. Fix bug introduced in #437
2017-01-08 19:12:54 +01:00
438446b397
Add read timeout to paperclip when it's downloading remote images
2017-01-07 15:43:56 +01:00
b115602bb7
"Reblog" -> "boost" in more places
...
A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI
2017-01-04 18:00:50 -08:00
335914abd9
Fix #385 - /web now loads a page
2017-01-04 15:35:36 +01:00
df2f14d2dd
Adding remote follow button
2017-01-01 19:54:34 +01:00
6a20c13009
Add API for retrieving favourites
2016-12-29 20:33:26 +01:00
2bc6e7c96e
Add API for retrieving blocked accounts
2016-12-29 20:12:32 +01:00
57f6f80838
Add ability to use remote follow function on other sites
2016-12-29 16:54:54 +01:00
fde1917a54
Add preferences for follow request notification e-mails
2016-12-26 22:04:16 +01:00
cef68b9b1c
Follow requests send e-mail notifications, but are excluded from notifications API
...
Better initial state for unlisted/nsfw toggles
2016-12-26 21:52:03 +01:00
6a54df90c8
Replacing follow requests in the settings area with in-UI column
2016-12-26 21:33:51 +01:00
ef9e827c54
Adding follow requests API
2016-12-26 19:30:45 +01:00
302051ffcb
Add page for authorizing/rejecting follow requests
2016-12-23 00:04:52 +01:00
6931b9bf32
Adjust wording
2016-12-22 23:24:46 +01:00
77cd58545d
Re-enable Webfinger for locked accounts but don't handle "follow" events
...
coming in via Salmon.
Currently no way to prevent remote follows, but they will only receive public
and unlisted posts
2016-12-22 23:17:57 +01:00
238233440f
Follow call on locked account creates follow request instead
...
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
2016-12-22 23:03:57 +01:00
09a477c782
Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users
2016-12-22 21:34:19 +01:00
7855a9b58b
Don't use rack timeout in any but production environments
2016-12-21 19:10:40 +01:00
090e3a245d
Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen
2016-12-21 00:13:13 +01:00
4bfaca1470
Merge pull request #356 from victorhck/master
...
added two missings spanish translations
2016-12-18 21:22:46 +01:00
346aae50b0
Adjusting public display of statuses to look similar to logged-in UI,
...
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive
content behind a spoiler on public pages
2016-12-18 19:47:11 +01:00
6d7f3be2f6
Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails
2016-12-18 15:20:39 +01:00
9d4f96f440
Removing external hub completely, fix #333 fixing digit-only hashtags,
...
removing web app capability from non-webapp pages
2016-12-18 12:24:37 +01:00
b254629157
added to missings spanish translations
2016-12-14 18:43:00 +01:00
66e08d880c
Improved admin UI
2016-12-13 13:42:10 +01:00
7fb69d5153
Fix translations
2016-12-09 11:52:09 +01:00
fffd718696
Declare Ukrainian
...
Closes : #345
2016-12-08 18:57:58 +02:00
7a08597e6e
Fix some translation errors.
2016-12-07 21:13:57 +02:00
8266ff2d69
Final steps for Ukrainian translation
2016-12-07 20:39:22 +02:00
4a167885b2
Fix paperclip config
2016-12-07 17:19:29 +01:00
311f2354cf
Update Paperclip config to allow plugging in Minio instead of AWS
2016-12-07 16:59:18 +01:00
88218c83d5
Add suspend account functionality to admin UI
2016-12-06 18:22:59 +01:00
5522606989
Add single user mode
2016-12-06 17:19:26 +01:00
83cb3eecd2
Merge pull request #338 from stamak/uk.yml
...
Add Ukrainian localization file uk.yml
2016-12-05 12:30:07 +01:00
01623e2650
Add Ukrainian localization file uk.yml
...
Closes : #337
2016-12-05 07:40:45 +02:00
e5e702a976
Adding configurable e-mail blacklist
2016-12-04 19:07:02 +01:00
68586258ca
Adding more to admin accounts UI
2016-12-04 18:10:40 +01:00
f6b99b05d3
Do not use expiring links after all
2016-12-04 13:02:43 +01:00
595f592304
Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals
...
for avatars/headers, resize avatars down to 120x120 instead of 300x300. Set cache headers on S3 stuff, also
make it private (aka only accessible via expiring links to prevent hotlinking)
2016-12-04 12:28:10 +01:00
e20d57a9e6
Fix cloudfront config
2016-12-03 22:12:22 +01:00
b245dc1575
Add Cloudfront support
2016-12-03 22:08:15 +01:00
5c6faa8cc4
Add Ukrainian localization file doorkeeper.uk.yml
...
Closes : #334
2016-12-03 09:46:26 +02:00
3966353feb
Fix line endings for Portuguese locale
2016-12-01 17:27:47 +00:00
8260628fc8
Fix pt translations, improve pre-cache queries, removing will_paginate
...
from accounts/tags because it's a terribly inefficient way to paginate
large sets of data
2016-12-01 16:26:25 +01:00
1028ee341b
Create pt localisation files in /config/locales/
2016-11-30 23:04:53 -01:00
a8814a19dc
Add basic OEmbed provider API, fix #247
2016-11-30 23:01:03 +01:00
8d4ef0b6c3
Per-status control for unlisted mode, also federation for unlisted mode
...
Fix #233 , fix #268
2016-11-30 21:34:59 +01:00
329b2a326d
Normalize localizations, add stub for admin/accounts
2016-11-30 15:32:26 +01:00
67db2cd871
Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars
2016-11-29 14:20:15 +01:00
3c1c2b0e06
Adding rack timeout of 30sec, PuSH jobs moved to push queue so they
...
can be processed separately
2016-11-29 02:07:14 +01:00
56b9edd476
Don't rate-limit PuSH endpoints
2016-11-29 00:44:11 +01:00
79075e1303
Fix URLs in inline-rendered XML
2016-11-29 00:26:01 +01:00
4d3cd93221
Fix URLs in ApplicationController.renderer
2016-11-28 21:21:05 +01:00
f37efe8e56
Add simple admin overview of PuSH subscriptions
2016-11-28 18:45:13 +01:00
ef93efbb5b
Enabling portuguese and hungarian translations, which are awfully incomplete
2016-11-28 13:55:03 +01:00
b5ad0eb4ea
Adding embedded PuSH server
2016-11-28 13:36:47 +01:00
313ebb4962
Merge pull request #275 from kodacs/master
...
Hungarian translation for Mastodon.
2016-11-26 18:33:48 +01:00
8b32b212de
Fix CDN_HOST variable requirement
2016-11-26 15:27:05 +01:00
de5764c372
Fix reset date format when rate limited
2016-11-25 18:20:47 +01:00
e737856f59
#275 fix missing i18n item
2016-11-25 14:56:28 +01:00
2774adc6fe
fixing yamls for #275
2016-11-25 13:57:37 +01:00
9849c564de
fix #275
2016-11-25 13:35:08 +01:00
8cd2d6a174
Merge branch 'master' into french-translation
2016-11-25 13:33:00 +01:00
3958b6c655
Update simple_form.fr.yml
2016-11-25 13:30:52 +01:00
9798cf624a
Normalized locale files
2016-11-25 13:15:07 +01:00
8183330361
Merge pull request #273 from nclm/french-translation
...
French localisation update
2016-11-25 13:14:30 +01:00
ea0846645a
Fix #65 - Options to block notifications from people you don't follow/who don't follow you
2016-11-25 13:13:16 +01:00
6d952d6815
Server side HU translation + Toot fix.
2016-11-25 12:43:23 +01:00
283623e3d4
Update simple_form.fr.yml
2016-11-25 09:25:31 +01:00
ed8361b57a
Update fr.yml
2016-11-25 09:25:29 +01:00
30f9e9e624
Remove Neo4J
2016-11-24 23:46:27 +01:00
8ab2fcbb2c
Mini Profiler not working well, remove it
2016-11-24 19:59:11 +01:00
f613f2b84a
Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users
2016-11-24 18:17:58 +01:00
29bcf41808
Merge branch 'master' into french-translation
2016-11-23 15:43:27 +01:00
cb19a97e3e
Update doorkeeper.fr.yml
...
e
2016-11-23 14:47:41 +01:00
85e53eb127
Update doorkeeper.fr.yml
2016-11-23 14:45:31 +01:00
30010a6dbd
Moving some counter queries out of subqueries in the API
2016-11-22 22:59:54 +01:00
33ccf97c49
Fix broken locales
2016-11-22 11:34:36 +01:00
a731b0d15a
Update fr.yml
2016-11-22 10:39:15 +01:00
9725264490
Update simple_form.fr.yml
...
silenced mode + edits
2016-11-22 10:32:43 +01:00
1a9ad408e8
Merging code updates (Unlisted Mode)
2016-11-22 10:25:17 +01:00
74df3ba1d7
Local accounts can control "silenced" attribute which removes them from public timeline
2016-11-21 23:06:41 +01:00
1aeebf8de5
Adding French locale
2016-11-21 22:46:59 +01:00
d20ba4c34c
Importing doorkeeper.fr.yml
...
From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml
2016-11-21 22:39:20 +01:00
324fe9b102
Importing devise.fr.yml
...
From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013
2016-11-21 22:34:50 +01:00
0943e98288
Adding option to specify asset server, filter followers query by local accounts
...
during Fan Out On Write to load less stuff into memory
2016-11-21 22:04:10 +01:00
8532fe10d6
First version for simple_form.fr.yml
2016-11-21 21:30:13 +01:00
a100ad0334
First version for fr.yml
2016-11-21 21:25:27 +01:00
fd49a94259
Create devise.fr.yml
2016-11-21 20:59:41 +01:00
cdf8b2019a
Create doorkeeper.fr.yml
2016-11-21 20:59:13 +01:00
2bf59ee5c5
Create simple_form.fr.yml
2016-11-21 20:58:43 +01:00
d9c0211b88
Create fr.yml
2016-11-21 20:57:28 +01:00
4176de708e
Fixes for the Spanish translation
2016-11-21 11:05:11 +01:00
951843e646
Adding notifications column
2016-11-20 19:39:58 +01:00
38025dfea3
Adding unified streamable notifications
2016-11-20 19:39:58 +01:00
29928a1082
improvements in text made by Ekaitz
2016-11-20 00:52:06 +01:00
6185b4167f
fix typos, and suggestions made by Ekaitz
2016-11-20 00:50:45 +01:00
862ce37f4f
Fix up Spanish translations
2016-11-19 22:05:26 +01:00
84a1560274
Finished spanish translation config files
2016-11-19 18:40:03 +01:00
132d231107
Fix wrong language declaration
2016-11-19 18:31:36 +01:00
9d766cd6bf
Fix wrong language declaration
2016-11-19 18:31:21 +01:00
d3aa9f7961
finished spanish translation config files
2016-11-19 17:45:45 +01:00
42fb16ec3a
Activating Spanish i18n
2016-11-19 00:10:47 +01:00
c12e893e7e
Spanish translation for devise.es.yml
2016-11-18 23:57:03 +01:00
84db0df531
finished spanish translation for es.yml
2016-11-18 23:04:26 +01:00
689077f743
started sp translations config locales
2016-11-18 20:39:40 +01:00
a82a15a38e
Adding german localization
2016-11-18 15:53:46 +01:00
0e0b4f9e59
i18n for devise mailer too
2016-11-16 18:25:21 +01:00
b8e6ca45e5
Add user locale setting
2016-11-16 17:56:31 +01:00
1b61e404b4
Localizations for most server-side strings
2016-11-16 00:55:33 +01:00
0e956910c3
Adding some localizations
2016-11-15 23:02:57 +01:00
e71b152d89
Fix rubocop issues, introduce usage of frozen literal to improve performance
2016-11-15 16:56:29 +01:00
0f7a388de6
Fix #110 - Make web UI use browser history, change links in e-mails to link to that
2016-11-13 14:02:34 +01:00
cbfa28b9cc
Use full-text search for autosuggestions
2016-11-12 14:36:10 +01:00
beb370801f
Fix #141 - Add "Server: Mastodon" header to responses
2016-11-10 23:34:33 +01:00
a6667f7f58
Replace setting custom CORS headers with rack-cors, set it on /oauth/token endpoint
2016-11-09 18:06:01 +01:00
beb36e24fe
API pagination for all collections using Link header
2016-11-09 17:48:44 +01:00
d98b43cf56
Move timelines API from statuses to its own controller, add a check for
...
resources that require a user context vs those that don't (such as public timeline)
/api/v1/statuses/public -> /api/v1/timelines/public
/api/v1/statuses/home -> /api/v1/timelines/home
/api/v1/statuses/mentions -> /api/v1/timelines/mentions
/api/v1/statuses/tag/:tag -> /api/v1/timelines/tag/:tag
2016-11-08 23:29:08 +01:00
46191e7071
Adding Emoji One
2016-11-08 21:46:29 +01:00
9da30e31c8
Fix region setting for AWS gem
2016-11-08 18:55:46 +01:00
8f0869876b
Improved configuration from ENV, cleaned up timeline filter methods
...
to be more readable, add extra logging to process feed service
2016-11-07 23:20:52 +01:00
89e887b44a
Fix insecure S3 URLs
2016-11-06 20:59:06 +01:00
54b9a42b3a
Fix URL configuration when S3 is enabled
2016-11-06 20:43:16 +01:00
ec43fb73ed
Improve S3 config
2016-11-06 18:55:20 +01:00
eb6ad973d1
Adding optional S3, fail-mastodon
2016-11-06 18:35:46 +01:00
cb22dce970
Adding hashtags
2016-11-05 17:13:14 +01:00
8ae3306bd3
Add pghero for analyzing postgres performance in production
2016-11-04 18:35:04 +01:00
834f3c4388
Add tests for recently added API end points
2016-11-03 18:53:37 +01:00
7a527c947d
Fix reblogged/favourited caching; add API endpoints for who favd/reblogged status
2016-11-03 14:50:22 +01:00
e6e80a8017
Add puma preloading, decrease DB pool size to size of threads per worker
2016-11-02 16:38:54 +01:00
c3c122d2ba
Replace in-memory cache store with redis store, should decrease memory
...
footprint of each running process by 128mb
2016-11-02 13:30:52 +01:00
45c22cd9a4
Fix missing default headers
2016-11-02 13:12:18 +01:00
e7035a4d39
Make cookies https-only if LOCAL_HTTPS is true, set X-Frame-Options to DENY,
...
add permissive CORS to API controllers
2016-11-02 12:58:15 +01:00
36470feeb2
Fix follow icon changing plus to minus, add terms page stub
2016-11-01 18:05:55 +01:00
38cacac4b0
Adding common followers API, fixing fallback query again
2016-10-29 01:29:19 +02:00
ff0eca7337
Restrict access to oauth/applications to admins only
2016-10-23 12:08:52 +02:00
6657414266
Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting
...
to the API
2016-10-22 19:39:44 +02:00
be98addccc
Improving all forms
2016-10-18 16:37:15 +02:00
02613aef3b
Adding application/jrd+json webfinger resource
2016-10-18 02:54:49 +02:00
b92c8c3f87
More debugging
2016-10-18 01:22:28 +02:00
032de4b5e8
More debugging
2016-10-18 00:59:18 +02:00
aefc7d7694
Do not compress JS (perhaps it removes source maps, needed for debugging)
2016-10-18 00:48:40 +02:00
56891c4bcc
Enable source maps
2016-10-18 00:36:01 +02:00
5860094354
Adding sync of follow relationships to Neo4J, accounts/suggestions API
2016-10-14 23:10:07 +02:00
588cb77e9f
E-mail preferences page
2016-10-14 02:28:49 +02:00
c3f5dfeabb
Adding public timeline
2016-10-07 16:00:11 +02:00
10395fd275
Fix #72 - add follow/unfollow button to public profiles
2016-10-06 21:27:58 +02:00
9f2df5672e
use consistent capitalization for subject lines
2016-10-06 11:16:59 +01:00
043ff2f616
Update default devise wording to include reference to Mastodon
...
Fix #68
2016-10-06 07:45:07 +02:00
fe77921e47
Catching more exceptions that slipped through, removing AR logging from
...
production as it's very verbose and not very useful
2016-10-05 13:26:44 +02:00
7b9a4af311
API for blocking and unblocking
2016-10-03 18:17:06 +02:00
fc198a8b4c
Adding e-mail confirmations
2016-10-03 16:51:00 +02:00
d74da1a89a
Small fixes
2016-10-02 23:46:25 +02:00
f06f295890
Fix doorkeeper skip_authorization
2016-10-02 22:55:09 +02:00
6d7290f47c
Add API for getting info about authenticated user: /api/v1/accounts/verify_credentials
2016-10-02 16:14:21 +02:00
4909bbf415
Add logging for outgoing http requests
2016-10-02 14:58:06 +02:00
492224b93f
Allow non-https redirect URIs for OAuth apps (AndStatus seems to require this)
2016-09-30 22:40:31 +02:00
e63aebff7a
Adding landing page
2016-09-27 23:12:33 +02:00
4f9b7432dd
Fix #52 - Add API versioning (v1)
2016-09-27 16:59:08 +02:00
7e14eefc81
Replace logo, fix #57 - delete/unreblog/unfavourite API, fix #45 - app
...
registration API
2016-09-26 23:56:53 +02:00
3b56350121
Fix #6 - Rate limit GET reqs to 300/5min, POST to 100/5min
2016-09-24 13:53:54 +02:00
e46abc71ca
Fix notifications in UI, added new API for fetching account relationships
2016-09-21 22:07:18 +02:00
bd5ad304ba
Adding media controller, 1 webm/compose form allowed, previews generated
2016-09-17 17:47:26 +02:00
5b0cef9781
Setting up preliminary "detailed" routes in the UI, new API end-point for fetching status context
2016-09-16 00:21:51 +02:00
85d89b472d
Optimized n+1 queries in accounts Atom and HTML views
...
Added stack trace for SQL queries in development
Removed badly thought out accounts/lookup API
2016-09-08 20:36:01 +02:00
509c18eb13
Fix local follows, 404 in logs
2016-09-08 02:40:51 +02:00
0f4bc56719
Improving production logs, removing n+1 on media attachments in atom,
...
adding attachments display to static views
2016-09-08 01:24:26 +02:00
eec0dc46a6
PostStatusService can attach media to status, ProcessFeedService likewise
2016-09-05 18:39:53 +02:00
ae1fac0062
Add API to upload media attachments
2016-09-05 17:46:36 +02:00
413e700fe0
Enhancing test suite but I think the problem might have been caching setting
2016-09-05 01:26:08 +02:00
1022d682dc
Normalized data in Redux, fix for asset URLs when rendered outside request
2016-09-04 14:04:26 +02:00
92afd29650
The frontend will now be an OAuth app, auto-authorized. The frontend will use an access token for API requests
...
Adding better errors for the API controllers, posting a simple status works from the frontend now
2016-08-26 19:12:19 +02:00
44e57f64dd
Improving statuses, adding a composer drawer, which doesn't work yet
2016-08-25 19:52:55 +02:00
bc0692d75b
Removing mini-profiler that doesn't work, formatting timelines a bit better
2016-08-24 19:23:37 +02:00
49520d6e62
Adding React.js, Redux, revamping dashboard
2016-08-24 17:56:44 +02:00
68c93f8b85
Final fix for ActionCable origin issues
2016-08-18 18:51:50 +02:00
8985f8e66c
Fixing more configuration issues with ActionCable
2016-08-18 18:39:35 +02:00
5a8c149f6b
Fix ActionCable origin checking
2016-08-18 18:08:25 +02:00
8459acd123
Fix for force SSL issue with websockets
2016-08-18 17:48:57 +02:00
6426819b6f
Fix tests
2016-08-18 17:22:44 +02:00
6deb9f966e
Live timelines using ActionCable
2016-08-18 15:49:51 +02:00
10ba09f546
Upgrade to Rails 5.0.0.1
2016-08-17 17:58:00 +02:00
6c480c8429
Oops, typo
2016-03-26 13:52:40 +01:00
85b00d19b8
Moving Salmon notifications to background processing, fixing mini-profiler
...
behaviour with Turbolinks enabled, optimizing Rabl for production
2016-03-26 13:42:10 +01:00
5764d52b04
Fix Sidekiq pooling issues. Remove API docs from homepage, replace with
...
a basic home timeline
2016-03-25 16:10:14 +01:00
bb98ee489d
Up the number of pooled DB connections to cover both Sidekiq and Puma workers
2016-03-25 15:10:34 +01:00
318886287b
Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1 query
2016-03-25 15:09:40 +01:00
36f3da3cde
Adjust down the number of Sidekiq threads to 5 (default of 25 is way too high)
2016-03-25 14:20:31 +01:00
e24bfbde1a
Fixing FanOutOnWriteService, fixing Sidekiq not having enough DB connections
...
in the pool, adding a throttle of 60rpm per IP, adding mini profiler, adding
admin status to users
2016-03-25 14:12:24 +01:00
42dcb0d4cb
Adding Sidekiq for background processing (firstly just of mailers)
2016-03-25 02:50:48 +01:00
f14f462eaf
Adding Turbolinks, adding status posting form on homepage
2016-03-21 18:26:47 +01:00
9d55529318
Fix text color in dashboard inputs, sanitize remote status content in UI,
...
simplify FanOutOnWriteService, add /api/accounts/lookup method
2016-03-21 17:02:16 +01:00
253ab26520
Adding more tests for helpers
2016-03-20 13:50:22 +01:00
b640f35621
Writing out more tests, fixed some bugs
2016-03-20 13:03:06 +01:00
e2b846f630
Adding letter opener for development and Rack::Attack for future rate limiting implementations
2016-03-19 14:57:30 +01:00
71ae4dd3d2
Adding public following and followers pages, fix #3
2016-03-19 14:02:30 +01:00
9cb690c706
Access tokens no longer expire, case-insensitive local username validation, as well as case-insensitive Webfinger look-up
2016-03-16 18:29:52 +01:00
48d66a2055
Fixing the docker container setup (with assets compilation &co)
2016-03-16 12:57:01 +01:00
2c374cd97c
Adding e-mail configuration
2016-03-16 12:13:40 +01:00
b17202ca0f
Adding a docker-compose template for running Mastodon easily
2016-03-14 21:39:39 +01:00
6fec8afc3f
Bind oauth applications to users
2016-03-14 17:49:13 +01:00
3441361568
Adding simple_form, adding profile settings, header image
2016-03-12 20:47:22 +01:00
1aa477ac2f
Customized more doorkeeper views, only logged in users can create oauth apps
2016-03-12 19:46:06 +01:00
aab9f57e36
Adding config for puma, dashboard layout, fixing some queries
2016-03-12 16:21:53 +01:00
447cfef62d
Improving feed queries, switching API to doorkeeper authentication
2016-03-11 16:47:36 +01:00
b919f39b31
Customizing doorkeeper views for authorizing app
2016-03-11 01:58:55 +01:00
6c4c84b161
Distrubute statuses as a fan-out-on-write system, with optional precomputing
2016-03-08 20:20:45 +01:00
fe57f6330f
API methods for retrieving home and mentions timelines
2016-03-07 13:25:26 +01:00
f099bc6091
Adding API for favouriting a status
2016-03-07 12:58:42 +01:00
ab6696e855
Adding doorkeeper, adding a REST API
...
POST /api/statuses Params: status (text contents), in_reply_to_id (optional)
GET /api/statuses/:id
POST /api/statuses/:id/reblog
GET /api/accounts/:id
GET /api/accounts/:id/following
GET /api/accounts/:id/followers
POST /api/accounts/:id/follow
POST /api/accounts/:id/unfollow
POST /api/follows Params: uri (e.g. user@domain)
OAuth authentication is currently disabled, but the API can be used with HTTP Auth.
2016-03-07 12:42:33 +01:00
c605b828b5
Adding routes to follow, unfollow, favourite and reblog (locally known models)
2016-03-06 12:51:55 +01:00
6045b6cb18
Customizing devise views and controllers
2016-03-05 22:43:05 +01:00
7e93da3f8d
Removing grape and adding devise
2016-03-05 13:12:24 +01:00
23d08c6749
Changing the use of config constants to the Rails configuration object
2016-02-29 20:06:39 +01:00
0e8f59c16f
Refactoring Grape API methods into normal controllers & other things
2016-02-29 19:42:08 +01:00
ee73d35eea
Incoming Salmon requests can be turned into follows and unfollows
2016-02-23 22:17:07 +01:00
fa33750105
Adding reblogs, favourites, improving atom generation
2016-02-23 19:17:37 +01:00
3b0bc18db9
Improved Atom rendering templates, added README
2016-02-23 13:08:01 +01:00
2bc48e9064
Individual atom entries
2016-02-22 19:11:07 +01:00
1dad72bf13
Fixes and general progress
2016-02-22 18:10:30 +01:00
709c6685a9
Made some progress
2016-02-22 16:00:20 +01:00
9c4856bdb1
Initial commit
2016-02-20 22:53:20 +01:00
Matt Jankowski