beatrix-bitrot
ddafde942c
Merge remote-tracking branch 'upstream/master'
7 years ago
m4sk1n
da42bfadb5
i18n: E-mail notifications to admins about new reports (pl) ( #3975 )
7 years ago
Eugen Rochko
42b8220632
Fix #1624 - Send e-mail notifications to admins about new reports ( #3949 )
7 years ago
m4sk1n
646de92781
i18n: Updated Polish translation ( #3956 )
...
* i18n: Updated Polish translation
* Update pl.yml
7 years ago
m4sk1n
ae2b722f55
i18n: Warning to look into the spam folder (pl) ( #3955 )
7 years ago
Alda Marteau-Hardi
f53ed108b0
Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )
7 years ago
Eugen Rochko
5e8d037e27
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
8 years ago
Eugen Rochko
ed7dc1704d
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
8 years ago
amazedkoumei
436ce03772
fix unnecessary variable ( #3947 )
8 years ago
Eugen Rochko
d821aba002
Rename "Credentials" page to "Security" for clarity ( #3941 )
...
* Rename "Credentials" page to "Security" for clarity
* Change "security" icon from cog to lock
8 years ago
amazedkoumei
87efa38721
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
8 years ago
Eugen Rochko
f7301bd5b9
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
8 years ago
unarist
68dca26a5d
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.
8 years ago
unarist
138e5a0b1e
Fix webpack config for Windows ( #3926 )
8 years ago
Charlotte Fields
b27842dc70
cybre cleanup
8 years ago
Chronister
65528fc54e
All cybrespace changes through 5/28
8 years ago
beatrix-bitrot
9bc593d675
update local modifications for cors and cp
8 years ago
Beatrix Bitrot
a337c5dbe5
CORS tweaks
8 years ago
Sorin Davidoi
2211e8d1cd
Revocable sessions ( #3616 )
...
* feat: Revocable sessions
* fix: Tests using sign_in
* feat: Configuration entry for the maximum number of session activations
8 years ago
Nolan Lawson
3783cadf2d
Apply babel to react-intl to remove prop-types ( #3914 )
8 years ago
Nolan Lawson
e078919f07
Upgrade to Webpack 3 with module concatenation ( #3912 )
8 years ago
Ratmir Karabut
9ca02a00a6
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
8 years ago
Quent-in
98fab24bea
Update of doorkeeper.oc.yml ( #3896 )
...
Just some adjustements
8 years ago
m4sk1n
da6fa029f6
i18n: Fixed typo in Polish translation ( #3864 )
8 years ago
のら
5cc7cd8518
Add Japanese translation "Action taken by" ( #3850 )
8 years ago
masarakki
ff142eb64d
setting-for-account-deletable ( #3852 )
8 years ago
Yamagishi Kazutoshi
500e28442f
Re-add disableHostCheck (regression #3729 ) ( #3854 )
...
ref #2790
8 years ago
spla
4367443287
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
8 years ago
Eugen Rochko
f3be605286
Rename FollowRemoteAccountService to ResolveRemoteAccountService ( #3847 )
...
Rename Activitypub to ActivityPub
8 years ago
Yamagishi Kazutoshi
53e42bf91e
Upgrade Webpacker to version 2.0 ( #3729 )
8 years ago
Quent-in
8fd931dc12
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
8 years ago
m4sk1n
6f34fdb616
updated Polish translation ( #3751 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years ago
unarist
da0333f1cb
Add Japanese translation for Account deletion ( #3747 )
8 years ago
m4sk1n
98eacb2238
i18n: updated Polish translation ( #3744 )
8 years ago
Eugen Rochko
4a618908e8
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
8 years ago
Eugen Rochko
85af2405cf
Exclude packs/custom.js from webpack compilation to prevent breakage ( #3719 )
...
due to the change in #3373
8 years ago
Ratmir Karabut
9e53fe5c29
Update Russian translation ( #3692 )
8 years ago
Yamagishi Kazutoshi
3690f04e4a
Remove comments for eslint-disable ( #3691 )
8 years ago
Matt Jankowski
2925372ff4
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
8 years ago
m4sk1n
778430b54a
i18n: Minor fixes in Polish translation ( #3674 )
...
* i18n
* i18n
* i18n
* i18n
* i18n
8 years ago
Matt Jankowski
5282ba862a
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
8 years ago
m4sk1n
1a065fb146
i18n: updated Polish translation ( #3670 )
8 years ago
Yamagishi Kazutoshi
1be48dd805
Refactor views/admin/reports/show.html.haml ( #3656 )
8 years ago
unarist
65d8c73bae
Add Japanese translation for #3640 ( #3650 )
8 years ago
Eugen Rochko
8902e265b4
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
8 years ago
nullkal
b8ea28d6d0
Support multiple trusted proxy ip addresses ( #3639 )
...
* Support multiple trusted proxy ip addresses
* correct coding style
8 years ago
Yamagishi Kazutoshi
7d2b4186c3
Add Japanese translations ( #3635 )
8 years ago
m4sk1n
90689190a3
i18n: Update Polish translation ( #3637 )
8 years ago
Sorin Davidoi
8acadeea76
fix: Warn if JavaScript is disabled ( #3634 )
8 years ago
jeroenpraat
92bb166246
Rest of 2FA translated + small fix ( #3630 )
8 years ago