Thibaut Girka
f5f6d23d55
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
3f036ac6b8
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
6e111152e0
i18n: Update Corsican translations ( #10504 )
2019-04-08 21:12:06 +09:00
Aditoo17
ae58bbd705
i18n: Update Czech translation ( #10506 )
2019-04-08 21:11:39 +09:00
Takeshi Umeda
a4d5e15327
Fix config serializer regex ( #10487 )
2019-04-08 07:55:38 +02:00
ThibG
cb71c95e22
Export and import show_reblogs together with following list ( #10495 )
...
* Refactor imports
* Export show_reblogs when exporting list of followed users
* Add support for importing show_reblogs with following collection
* Fix tests
2019-04-08 07:28:27 +02:00
Jeong Arm
619bbc23ef
Translate Korean ( #10499 )
2019-04-08 12:35:37 +09:00
mayaeh
a265696991
i18n: Update Japanese translations ( #10494 )
...
* Update Japanese translations
* Update Japanese translations.
2019-04-08 09:16:14 +09:00
Eugen Rochko
67b3b62b98
Improve blocked view of profiles ( #10491 )
...
* Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447 )"
This reverts commit 120544067f#10442 )"
This reverts commit 62bafa20a1
2019-04-07 04:59:13 +02:00
Eugen Rochko
e1d0390e29
Add batch actions for approving and rejecting pending accounts ( #10469 )
2019-04-06 17:53:45 +02:00
Eugen Rochko
2c63e0292a
Fix admin validation being too strict about usernames ( #10449 )
...
* Fix admin validation being too strict about usernames
Fix #10446
* Strip Setting.site_contact_username consistently throughout the codebase
2019-04-06 17:53:17 +02:00
Marek Ľach
78a8a99b0b
Improve sk translation further ( #10484 )
...
* Further improving Slovak translation
* Update sk.json
2019-04-06 23:26:51 +09:00
ashleyhull-versent
2b68fe5442
tinyfix 2: unrequired arguments ( #10471 )
...
* unrequired argument
* unrequired argument
2019-04-06 12:02:03 +09:00
marcin mikołajczak
4be7952892
i18n: Update Polish translation ( #10479 )
...
Signed-off-by: Marcin Mikołajczak <m4sk1n@m4sk1n.nazwa.pl>
2019-04-06 02:51:13 +09:00
Marek Ľach
e0137c5884
Updates the Slovak translation ( #10477 )
...
* Update sk.json
* Update sk.json
* Update sk.json
2019-04-05 22:16:28 +09:00
jeroenpraat
48a52c9372
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
ashleyhull-versent
bd365cc38b
Duplicate values ( #10470 )
2019-04-04 23:22:55 +09:00
ThibG
30500dff7c
Merge pull request #981 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-04-04 15:13:18 +02:00
ThibG
be6885eb93
[Glitch] Update poll remaining time just like with status timestamps
...
Port daab45d4ae
2019-04-04 14:58:11 +02:00
Thibaut Girka
1682ac5717
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
26bd9fa508
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
ThibG
cc6e3c3900
Cache featured collections, as well as outbox, followers and following ( #10467 )
2019-04-04 01:30:44 +02:00
Thibaut Girka
14bad3f472
Do not handle clicks in detailed status content
2019-04-03 19:58:18 +02:00
ThibG
d4882aa64a
Export and import hide_notifications alongside user mutes ( #10335 )
...
* Export hide_notifications along with user mutes
* Import hide_notifications along with muted users list
* Add headers for CSV exports
2019-04-03 18:17:43 +02:00
ThibG
daab45d4ae
Update poll remaining time just like with status timestamps ( #10466 )
2019-04-03 18:16:55 +02:00
ThibG
d07b0c038f
Hopefully fix input text selection quirks on iOS ( #10463 )
...
Fix #10448 (hopefully)
2019-04-03 17:54:54 +02:00
Jeong Arm
f984f2ea4e
Esperanto translations ( #10461 )
...
* Esperanto translations
* Translate untranslated Esperanto strings
* Normalize eo translation
2019-04-03 18:19:10 +09:00
Renato "Lond" Cerqueira
83190fffc7
Re-dd PT-br translations ( #10459 )
2019-04-03 07:24:39 +09:00
spla
3f75b0929e
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
0705e4b177
I18n: Improve Czech translation ( #10454 )
2019-04-03 00:10:27 +09:00
Thibaut Girka
12dae9d583
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
ThibG
120544067f
Fix filtering of favourited_by, reblogged_by, followers and following ( #10447 )
2019-04-01 21:24:28 +02:00
ThibG
62bafa20a1
Hide blocking accounts from blocked users ( #10442 )
...
* Revert "Add indication that you have been blocked in web UI (#10420 )"
This reverts commit bd02ec6daa#10373 )"
This reverts commit 9745de883bbd02ec6daa
2019-04-01 20:06:13 +02:00
slice
85973f4f37
Improvements to image upload validation and creation ( #10431 )
...
* Check if image value is nil? before creating an image
Check if uploaded images aren't nil before creating SiteUpload models
for them.
* Validate presence of file in SiteUpload
* Fix file presence validation
* Fabricate SiteUpload#file
* Add link to Creative Commons license
2019-04-01 07:30:46 +02:00
mayaeh
abdf225353
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
ThibG
68c797bece
Ensure request.body isn't emptied out before signature verification ( #10432 )
...
Fixes #10429
2019-03-31 17:27:24 +02:00
slice
59cce07601
Add thumbnail, hero, and mascot back to Form::AdminSettings::KEYS ( #10430 )
...
These will allow these images to be uploaded again on the admin settings
page.
2019-03-31 05:03:56 +02:00
Eugen Rochko
b9b472d519
[Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile
...
Port 79227d153b
2019-03-30 18:19:40 +01:00
Eugen Rochko
59551ece31
[Glitch] Fix search in web UI not setting a limit, restore limit of 10
...
Port 379c3e237f
2019-03-30 12:56:34 +01:00
Thibaut Girka
4444d8f9b3
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-30 12:36:24 +01:00
Jeong Arm
51625d3423
Remove unused code ( #10426 )
2019-03-30 15:47:25 +09:00
Eugen Rochko
1714ea5978
Add ActivityPub representation for identity proofs ( #10414 )
...
* Add ActivityPub representation for identity proofs
* Add tests
2019-03-30 02:12:06 +01:00
Eugen Rochko
8fb69f1366
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 ( #10413 )
...
Fix #10315
This reverts commit db06b25376
2019-03-30 01:41:35 +01:00
Eugen Rochko
79227d153b
Fix transparent avatars showing underlying elements in avatar stack and profile ( #10422 )
2019-03-30 01:13:19 +01:00
Eugen Rochko
379c3e237f
Fix search in web UI not setting a limit, restore limit of 5 ( #10421 )
...
The search API now supports returning more results and pagination,
but until the web UI implements pagination, it makes no sense to
dump so many results at once. This fix restores the behaviour
before the API change
2019-03-30 00:43:38 +01:00
Eugen Rochko
bd02ec6daa
Add indication that you have been blocked in web UI ( #10420 )
2019-03-30 00:43:29 +01:00
Aditoo17
1d62b88f8d
I18n: Update Czech translation ( #10419 )
2019-03-29 16:59:48 +01:00
Jeong Arm
e5d79d1635
Add missing Korean translations ( #10416 )
...
* Fix Korean translation
* Add missing translation
2019-03-29 22:14:24 +09:00
Alix Rossi
34090a85e4
Update Corsican translations ( #10418 )
...
* Update Corsican translation
* Update Corsican YML
* Corsican JSON fix
* Update co.yml
2019-03-29 22:06:16 +09:00
Masoud Abkenar
2a326940e8
l10n update: fa ( #10417 )
2019-03-29 22:04:55 +09:00
