Thibaut Girka
cde0ac1aa7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
No real conflict, upstream changes too close to glitch-specific
theming system changes.
- config/navigation.rb
Upstream redesigned the settings navigation, took those changes
and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
Eugen Rochko
75ab8cef8f
Change the groupings of menu items in settings navigation ( #10533 )
...
* Change the groupings of menu items in settings navigation
Fix #10307
* Remove unused translations
2019-04-10 03:47:11 +02:00
Eugen Rochko
13c1b5bac8
Add preference to disable e-mails about new pending accounts ( #10529 )
2019-04-10 00:35:49 +02:00
Eugen Rochko
7eb05b8724
Add "why do you want to join" field to invite requests ( #10524 )
...
* Add "why do you want to join" field to invite requests
Fix #10512
* Remove unused translations
* Fix broken registrations when no invite request text is submitted
2019-04-09 23:06:30 +09:00
Alix Rossi
fb93400e7d
i18n: Update Corsican translations ( #10510 )
...
* i18n: Update Corsican translations
* i18n: Update Corsican translations
2019-04-08 19:01:41 +02:00
ThibG
a604f766e0
Fix batch actions not working on pending accounts ( #10508 )
2019-04-08 18:35:41 +02:00
Thibaut Girka
5c8f9a3220
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/pl.yml
Conflict caused by new upstream string too close to glitch-specific
“flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
koyu
c66a043591
Updated German locales ( #10505 )
...
* Updated German locales
* Added account approval locales (German)
* Updated JSON locales (German)
2019-04-08 21:14:08 +09:00
Alix Rossi
a5a7780ad1
i18n: Update Corsican translations ( #10504 )
2019-04-08 21:12:06 +09:00
Aditoo17
20040927fc
i18n: Update Czech translation ( #10506 )
2019-04-08 21:11:39 +09:00
Jeong Arm
d035f4af41
Translate Korean ( #10499 )
2019-04-08 12:35:37 +09:00
Hugo "Slaynash" Flores
5858035e39
Updated french translations ( #10498 )
...
* updated "Invalid email or password" french translation
* Updated FR translations ("instance" in now "serveur")
2019-04-08 09:22:09 +09:00
mayaeh
4f8beb3717
i18n: Update Japanese translations ( #10494 )
...
* Update Japanese translations
* Update Japanese translations.
2019-04-08 09:16:14 +09:00
Alix Rossi
6893b404f2
i18n: Update Corsican translations ( #10496 )
...
* Update Corsican translation
* Fix brackets typo
2019-04-07 21:32:27 +09:00
Eugen Rochko
c84c30c542
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 0317f37c6f
.
* Revert "Hide blocking accounts from blocked users (#10442 )"
This reverts commit 4cd944d364
.
* Improve blocked view of profiles
- Change "You are blocked" to "Profile unavailable"
- Hide following/followers in API when blocked
- Disable follow button and show "Profile unavailable" on public profile as well
2019-04-07 04:59:13 +02:00
Eugen Rochko
1ed2c9c16e
Add rate limit for media proxy requests ( #10490 )
...
30 per 30 minutes, like media uploads
2019-04-07 04:26:43 +02:00
Aditoo17
12ebe48505
I18n: Update Czech translation ( #10489 )
2019-04-07 09:34:52 +09:00
koyu
59de320605
Updated German locales ( #10488 )
2019-04-07 03:13:03 +09:00
Eugen Rochko
c34a7f5bd2
Add batch actions for approving and rejecting pending accounts ( #10469 )
2019-04-06 17:53:45 +02:00
marcin mikołajczak
0e7c4d0c69
i18n: Update Polish translation ( #10479 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
2019-04-06 02:51:13 +09:00
jeroenpraat
4c20f5376a
Dutch (nl) translation ( #10474 )
...
* Translation Dutch
* Update activerecord.nl.yml
* Update devise.nl.yml
* Update nl.yml
* Update nl.yml
* Update devise.nl.yml
* Update nl.yml
2019-04-05 06:12:08 +09:00
Thibaut Girka
a835ea0e8f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/following_accounts_controller.rb
Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
Some code has been change upstream, but it has been
moved to app/javascript/core/settings.js in glitch-soc.
Applied the changes there.
2019-04-04 14:53:52 +02:00
spla
f46cd7f002
i18n: update Catalan translation ( #10458 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
2019-04-04 10:25:20 +09:00
Jeong Arm
e09e68b656
Translate Korean (devise) ( #10464 )
2019-04-04 01:31:08 +02:00
Jeong Arm
7deedcc0cf
Esperanto translations ( #10461 )
...
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
2019-04-03 18:19:10 +09:00
Renato "Lond" Cerqueira
a0eaf51ad4
Re-dd PT-br translations ( #10459 )
2019-04-03 07:24:39 +09:00
spla
8cc94c38cf
i18n: update catalan translations ( #10455 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
2019-04-03 01:31:36 +09:00
Aditoo17
445568eff3
I18n: Improve Czech translation ( #10454 )
2019-04-03 00:10:27 +09:00
Thibaut Girka
5eb2632410
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
2019-04-01 21:28:31 +02:00
mayaeh
0615bc56aa
i18n: Update Japanese translations ( #10427 )
...
* Update Japanese translations.
run yarn manage:translations && i18n-tasks add-missing
* Update Japanese translations.
* Fix mistake
* Change to be concise.
2019-04-01 05:50:05 +02:00
Thibaut Girka
99336afaff
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-30 12:36:24 +01:00
Eugen Rochko
ed2862e249
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 ( #10413 )
...
Fix #10315
This reverts commit e781d842a5
.
2019-03-30 01:41:35 +01:00
Aditoo17
0c334481cc
I18n: Update Czech translation ( #10419 )
2019-03-29 16:59:48 +01:00
Jeong Arm
6c39082e87
Add missing Korean translations ( #10416 )
...
* Fix Korean translation
* Add missing translation
2019-03-29 22:14:24 +09:00
Alix Rossi
1ce9bd86b3
Update Corsican translations ( #10418 )
...
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
2019-03-29 22:06:16 +09:00
Thibaut Girka
1600aeb6cb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-28 18:35:25 +01:00
Aditoo17
2a740c3e9a
I18n: Update Czech translation ( #10410 )
2019-03-28 18:01:28 +01:00
Alex Gessner
be7c92061c
squashed identity proof updates ( #10375 )
2019-03-28 18:01:09 +01:00
Thibaut Girka
0117de0a01
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +01:00
Eugen Rochko
364e49ae1f
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status ( #10401 )
...
Also, fix some n+1 queries
Resolve #10365
2019-03-28 04:44:59 +01:00
Eugen Rochko
7aeb50cc89
Add order options to relationship manager UI ( #10404 )
2019-03-28 02:16:01 +01:00
Eugen Rochko
f1a582dc15
Revert locales touched by automated translations ( #10399 )
...
* Revert ruined translations
Regression from #10362
* yarn manage:translations
2019-03-28 00:30:47 +01:00
Aditoo17
02d5017d85
Fix interpolations in some localizations ( #10397 )
2019-03-27 17:07:35 +01:00
Eugen Rochko
367ab6764f
Remove unused ActivityPub `@context` values depending on response ( #10378 )
...
Fix #8078
2019-03-27 15:55:23 +01:00
Thibaut Girka
451a79bda3
Revert "fix: update to emoji-mart 2.10.0 ( #10281 )"
...
This reverts commit e781d842a5
.
2019-03-27 14:04:58 +01:00
Thibaut Girka
cab7e62235
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-26 17:39:20 +01:00
ThibG
cffb8cb38d
Fix HTML validation ( #10354 )
...
* Fix HTML validation
* Report first HTML error instead on validation error
2019-03-26 17:33:26 +01:00
Thibaut Girka
1f70b51fff
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
Thibaut Girka
e97d76632d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb
Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
2019-03-26 16:01:59 +01:00
Eugen Rochko
88a85f2574
Change icons of features on admin dashboard to remove bias ( #10366 )
...
Red crosses implied that it was bad/unexpected that certain features
were not enabled. In reality, they are options, so showing a green
or grey power-off icon is more appropriate.
Add status of timeline preview as well
Fix sample accounts changing too frequently due to wrong query
Sample accounts are intended to be sorted by popularity
2019-03-26 01:24:19 +01:00