cdcb74ffb6
Merge remote-tracking branch 'upstream/master'
2017-06-27 20:46:13 +00:00
e88228f0eb
i18n: E-mail notifications to admins about new reports (pl) ( #3975 )
2017-06-27 22:21:35 +02:00
d0221b05bc
Fix #1624 - Send e-mail notifications to admins about new reports ( #3949 )
2017-06-27 00:04:00 +02:00
196bd78b60
i18n: Updated Polish translation ( #3956 )
...
* i18n: Updated Polish translation
* Update pl.yml
2017-06-26 17:18:45 +02:00
f37382eb68
i18n: Warning to look into the spam folder (pl) ( #3955 )
2017-06-26 17:10:54 +02:00
103f87f9ae
Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )
2017-06-26 13:04:36 +02:00
b90a44b6d0
Fix #3910 - Require OTP authentication to disable 2FA ( #3935 )
...
* Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability
to generate new OTP backup codes *after* initial backup codes were handed
out during activation
* Restore recovery code re-generation
* Improve display of some 2FA elements
2017-06-25 23:51:46 +02:00
ad531f90b1
Bind web UI access tokens to sessions ( #3940 )
...
* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test
* Fix #2347 - Bind web UI access token to session
When you logout, session also destroys the access token, so it's no longer
valid. If access token is destroyed some other way, the session is also
destroyed, requiring a re-login.
Fix #1681 - Add scheduler to remove revoked access tokens and grants
* Fix test
2017-06-25 23:51:32 +02:00
b686b4350c
fix unnecessary variable ( #3947 )
2017-06-25 23:29:22 +02:00
7814133f0a
Rename "Credentials" page to "Security" for clarity ( #3941 )
...
* Rename "Credentials" page to "Security" for clarity
* Change "security" icon from cog to lock
2017-06-25 22:13:02 +02:00
a1fd5d7f61
more free pgconfig by .env ( #3909 )
...
* more free pgconfig for streaming by .env
* fix wrong default values
* database.yml read ENV as same as streaming server
2017-06-25 18:13:31 +02:00
c465c5b3a8
Add overview of active sessions ( #3929 )
...
* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test
2017-06-25 16:54:30 +02:00
7968c69df4
Fix react-intl/locale-data import issue on production build ( #3937 )
...
Webpack seems to fail to import `react-intl/locale-data/*.js` if those
files has been proceed by babel, and this also breaks applying our translation.
Note that this won't be a problem on English locale, because react-intl
includes it as default and works fine without manually added locale-data.
Also this issue seems to only occurs on production build, but I'm not sure
about reason.
2017-06-25 12:49:53 +02:00
741fd15f4e
Fix webpack config for Windows ( #3926 )
2017-06-24 14:03:52 +02:00
a7a7613e71
cybre cleanup
2017-06-23 21:45:14 +00:00
2edadd7fe7
All cybrespace changes through 5/28
2017-06-23 21:45:14 +00:00
4f54d53a84
update local modifications for cors and cp
2017-06-23 21:45:14 +00:00
6a5afc6fe8
CORS tweaks
2017-06-23 21:45:14 +00:00
1280559503
Revocable sessions ( #3616 )
...
* feat: Revocable sessions
* fix: Tests using sign_in
* feat: Configuration entry for the maximum number of session activations
2017-06-23 18:50:53 +02:00
9c246cac5c
Apply babel to react-intl to remove prop-types ( #3914 )
2017-06-23 18:21:33 +02:00
61634505c1
Upgrade to Webpack 3 with module concatenation ( #3912 )
2017-06-23 17:44:55 +02:00
d9eeb1340d
Update Russian translation ( #3902 )
...
* 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
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line
2017-06-22 23:28:58 +02:00
b0debe35d6
Update of doorkeeper.oc.yml ( #3896 )
...
Just some adjustements
2017-06-22 13:39:13 +02:00
3c355ed26b
i18n: Fixed typo in Polish translation ( #3864 )
2017-06-20 18:34:27 +02:00
8b65b64428
Add Japanese translation "Action taken by" ( #3850 )
2017-06-19 15:12:41 +02:00
d947978192
setting-for-account-deletable ( #3852 )
2017-06-19 15:12:31 +02:00
0a2e331bd5
Re-add disableHostCheck (regression #3729 ) ( #3854 )
...
ref #2790
2017-06-19 14:01:31 +02:00
7a96f422db
Added new Catalan strings ( #3843 )
...
* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Update ca.json
Removed :
<<<<<<< HEAD
"getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master
2017-06-19 10:29:18 +02:00
8bed91d94c
Rename FollowRemoteAccountService to ResolveRemoteAccountService ( #3847 )
...
Rename Activitypub to ActivityPub
2017-06-19 01:51:04 +02:00
dece663cd0
Upgrade Webpacker to version 2.0 ( #3729 )
2017-06-18 02:57:09 +02:00
d792a958fb
l10n update for account deletion ( #3820 )
...
* l10n update for acount deletion
* l10n little change
* l10n little changes
Less passive voice, more natural.
* Update oc.yml
Correction, " added
2017-06-17 20:21:25 +02:00
a15a1827ab
updated Polish translation ( #3751 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-06-15 02:00:23 +02:00
54addd93c5
Add Japanese translation for Account deletion ( #3747 )
2017-06-14 22:00:08 +02:00
cc22f75a94
i18n: updated Polish translation ( #3744 )
2017-06-14 20:08:00 +02:00
1c7e2ddd65
Account deletion ( #3728 )
...
* Add form for account deletion
* If avatar or header are gone from source, remove them
* Add option to have SuspendAccountService remove user record, add tests
* Exclude suspended accounts from search
2017-06-14 18:01:27 +02:00
baf07bc83b
Exclude packs/custom.js from webpack compilation to prevent breakage ( #3719 )
...
due to the change in #3373
2017-06-13 03:55:36 +02:00
0962301493
Update Russian translation ( #3692 )
2017-06-11 10:43:01 +02:00
eb34081815
Remove comments for eslint-disable ( #3691 )
2017-06-11 10:42:42 +02:00
e31cd944c2
Move create/destroy actions for api/v1/statuses to namespace ( #3678 )
...
Each of mute, favourite, reblog has been updated to:
- Have a separate controller with just a create and destroy action
- Preserve historical route names to not break the API
- Mild refactoring to break up long methods
2017-06-10 09:39:26 +02:00
8ceff751e2
i18n: Minor fixes in Polish translation ( #3674 )
...
* i18n
* i18n
* i18n
* i18n
* i18n
2017-06-09 23:08:09 +02:00
dc717cf425
Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers ( #3646 )
...
* Add specs for api statuses routes
* Update favourited_by and reblogged_by api routes
* Move methods into new controllers
* Use load_accounts methods to simplify index actions
* Clean up load_accounts methods
* Clean up link header generation
* Check for link headers in specs
* Remove unused actions from api/v1/statuses controller
* Remove specs for moved actions
2017-06-09 14:12:40 -04:00
caa3d4acbd
i18n: updated Polish translation ( #3670 )
2017-06-09 19:15:55 +02:00
7f99456ab0
Refactor views/admin/reports/show.html.haml ( #3656 )
2017-06-09 15:08:06 +02:00
6c2359ce87
Add Japanese translation for #3640 ( #3650 )
2017-06-09 03:14:15 +02:00
9eefd60136
Add explit admin actions to (re)subscribe/unsubscribe remote accounts ( #3640 )
...
* Add explit admin actions to (re)subscribe/unsubscribe remote accounts
and re-download avatar/header
* Improve how admin NSFW toggle looks
2017-06-08 14:58:22 +02:00
9335e15763
Support multiple trusted proxy ip addresses ( #3639 )
...
* Support multiple trusted proxy ip addresses
* correct coding style
2017-06-08 14:33:28 +02:00
26e4a2cc3c
Add Japanese translations ( #3635 )
2017-06-08 13:23:56 +02:00
28c83a27f3
i18n: Update Polish translation ( #3637 )
2017-06-08 13:23:40 +02:00
4ce6597e3a
fix: Warn if JavaScript is disabled ( #3634 )
2017-06-08 00:52:56 +02:00
fa04340b99
Rest of 2FA translated + small fix ( #3630 )
2017-06-07 20:08:34 +02:00
beatrix-bitrot