me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9171 commits 2 branches 0 tags 429 MiB
Commit graph

6430 commits

Author SHA1 Message Date
Alex Gessner
da3d516fcf compare usernames case-insensitively on new proof creation flow (#10544) 
* compare usernames case-insensitively on new proof creation flow

* Fix code style issue
 2019-04-10 18:05:11 +02:00
Aditoo17
db70d35c3f I18n: Final Czech translation 🇨🇿 (#10542) 
* I18n: Update Czech translation

* I18n: Why do you want to join translation

* I18n: Translating a bunch of more stuff
 2019-04-10 14:52:08 +02:00
Marek Ľach
aced669796 Updates the grammar of the SK translation (#10541) 2019-04-10 14:50:39 +02:00
Eugen Rochko
771dc9235a [Glitch] Fix glitched out "not found" message for non-existing profiles in web UI 
Port 403338108e to glitch-soc
 2019-04-10 09:33:47 +02:00
Eugen Rochko
c97a40647a [Glitch] Add "why do you want to join" field to invite requests 
Port SCSS changes from 7eb05b8724 to glitch-soc
 2019-04-10 09:22:45 +02:00
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
753bb5e701 Change HTML validator to ignore all errors except unmatched tags (#10534) 2019-04-10 03:34:16 +02:00
Eugen Rochko
6d5b05e3d5 Add invite request to pending account notification e-mail (#10528) 
Fix sorting of the pending accounts page
 2019-04-10 00:36:01 +02:00
Eugen Rochko
13c1b5bac8 Add preference to disable e-mails about new pending accounts (#10529) 2019-04-10 00:35:49 +02:00
Yağızhan
6286ace752 Fixed terrible grammar and translated the most (#10527) 
The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.

I'll come back and finish the translation.
 2019-04-09 20:42:01 +02:00
Hinaloe
da343470c4 Allow set the voting period to just 5 minutes (#10525) 
* Add spec of PollValidator for #10190

* Raise fraction less than 1 second

* format

* simplify time initialize
 2019-04-09 17:02:12 +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
Eugen Rochko
55f25ceda3 Fix permission denied bug on approve all/reject all pending accounts (#10519) 2019-04-09 07:19:52 +02:00
Eugen Rochko
403338108e Fix glitched out "not found" message for non-existing profiles in web UI (#10517) 2019-04-09 05:02:48 +02:00
Quentí
5c9f6740c6 [i18n] Update and correction (#10511) 
* [i18n] Update and correction

* Update oc.json

* Update oc.json
 2019-04-09 07:39:50 +09:00
Thibaut Girka
0405e42c4a Add column title to “Favourited by” and “Boosted by” columns 2019-04-08 21:59:30 +02:00
ThibG
a604f766e0 Fix batch actions not working on pending accounts (#10508) 2019-04-08 18:35:41 +02:00
Thibaut Girka
85ab126f88 Fix pending accounts management 2019-04-08 16:40:11 +02:00
ashleyhull-versent
85a9a248f9 [Glitch] Duplicate values 
Port 8037fa7d2e to glitch-soc
 2019-04-08 16:22:20 +02:00
Eugen Rochko
2b965f8d17 [Glitch] Port SCSS changes from "Improve blocked view of profiles" 
Port public pages SCSS changes from c84c30c542
 2019-04-08 16:20:46 +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
Takeshi Umeda
21193ed31e Fix config serializer regex (#10487) 2019-04-08 07:55:38 +02:00
ThibG
110dbb5286 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
d035f4af41 Translate Korean (#10499) 2019-04-08 12:35:37 +09:00
mayaeh
4f8beb3717 i18n: Update Japanese translations (#10494) 
* Update Japanese translations

* Update Japanese translations.
 2019-04-08 09:16:14 +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
c34a7f5bd2 Add batch actions for approving and rejecting pending accounts (#10469) 2019-04-06 17:53:45 +02:00
Eugen Rochko
d48f53cf1a 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
1409a529dd Improve sk translation further (#10484) 
* Further improving Slovak translation

* Update sk.json
 2019-04-06 23:26:51 +09:00
ashleyhull-versent
b0348d0f92 tinyfix 2: unrequired arguments (#10471) 
* unrequired argument

* unrequired argument
 2019-04-06 12:02:03 +09: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
Marek Ľach
705a2b7615 Updates the Slovak translation (#10477) 
* Update sk.json

* Update sk.json

* Update sk.json
 2019-04-05 22:16:28 +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
ashleyhull-versent
8037fa7d2e Duplicate values (#10470) 2019-04-04 23:22:55 +09:00
ThibG
3964cc964d Merge pull request #981 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-04-04 15:13:18 +02:00
ThibG
729b3841c3 [Glitch] Update poll remaining time just like with status timestamps 
Port 6e024f0d7a to glitch-soc
 2019-04-04 14:58:11 +02: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
ThibG
4fa0b331ae Cache featured collections, as well as outbox, followers and following (#10467) 2019-04-04 01:30:44 +02:00
Thibaut Girka
b83e693c40 Do not handle clicks in detailed status content 2019-04-03 19:58:18 +02:00
ThibG
e87214826b 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
6e024f0d7a Update poll remaining time just like with status timestamps (#10466) 2019-04-03 18:16:55 +02:00
ThibG
aa7fe3101f Hopefully fix input text selection quirks on iOS (#10463) 
Fix #10448 (hopefully)
 2019-04-03 17:54:54 +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
ThibG
0317f37c6f Fix filtering of favourited_by, reblogged_by, followers and following (#10447) 2019-04-01 21:24:28 +02:00
ThibG
4cd944d364 Hide blocking accounts from blocked users (#10442) 
* Revert "Add indication that you have been blocked in web UI (#10420)"

This reverts commit d31affe69b.

* Revert "Add `blocked_by` relationship to the REST API (#10373)"

This reverts commit a8bb10633d.

* Hide blocking accounts from search results

* Filter blocking accouts from account followers

* Filter blocking accouts from account's following accounts

* Filter blocking accounts from “reblogged by” and “favourited by” lists

* Remove blocking account from URL search

* Return 410 on trying to fetch user data from a user who blocked us

* Return 410 in /api/v1/account/statuses for suspended or blocking accounts

* Fix status filtering when performing URL search

* Restore some React improvements

Restore some cleanup from d31affe69b

* Refactor by adding `without_blocking` scope
 2019-04-01 20:06:13 +02:00
slice
67cd7abbb1 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
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
ThibG
65930be714 Ensure request.body isn't emptied out before signature verification (#10432) 
Fixes #10429
 2019-03-31 17:27:24 +02:00
slice
0aea1c0775 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
a547a214fd [Glitch] Fix transparent avatars showing underlying elements in avatar stack and profile 
Port 9a12568a33 to glitch-soc
 2019-03-30 18:19:40 +01:00
Eugen Rochko
2393504c23 [Glitch] Fix search in web UI not setting a limit, restore limit of 10 
Port 20769a332a to glitch-soc, but changing
the 5 limit to 10, since that's what we had previously
 2019-03-30 12:56:34 +01:00
Thibaut Girka
99336afaff Merge branch 'master' into glitch-soc/merge-upstream 2019-03-30 12:36:24 +01:00
Jeong Arm
1289e86116 Remove unused code (#10426) 2019-03-30 15:47:25 +09:00
Eugen Rochko
a82bc7f5ae 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
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
Eugen Rochko
9a12568a33 Fix transparent avatars showing underlying elements in avatar stack and profile (#10422) 2019-03-30 01:13:19 +01:00
Eugen Rochko
20769a332a 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
d31affe69b Add indication that you have been blocked in web UI (#10420) 2019-03-30 00:43:29 +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
Masoud Abkenar
c2e0b3487d l10n update: fa (#10417) 2019-03-29 22:04:55 +09:00
Alex Gessner
d1b617374c [Glitch] squashed identity proof updates 
Port JS from be7c92061c to glitch-soc
 2019-03-29 10:13:44 +01:00
Thibaut Girka
b29731bb10 Fix background color transition in destructive buttons 2019-03-28 20:45:10 +01:00
ThibG
4211c9b8d3 [Glitch] Fix opacity of relationship tags 
Port ddd7a9e44b to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka
773c600c26 Fix left border of profile navigation tab 2019-03-28 19:56:40 +01:00
Thibaut Girka
751739337d Add fa-info-circle to disclaimer 2019-03-28 19:56:40 +01:00
Thibaut Girka
a23e513f79 Fix double border for account disclaimer 2019-03-28 19:56:40 +01:00
slice
5900b0b206 [Glitch] Add rel='noopener' to redesigned profile column header avatar link 
Port da47c30eac to glitch-soc
 2019-03-28 19:56:40 +01:00
ThibG
fb17e24352 [Glitch] Move the account dropdown menubar to the right, make sure it doesn't move 
Port 2e5ec8b7c8 to glitch-soc
 2019-03-28 19:56:40 +01:00
Aditoo17
6df0d0fd51 [Glitch] Make clicking on avatar open public profile in new tab 
Port 70a78d968f to glitch-soc
 2019-03-28 19:56:40 +01:00
mayaeh
a338bde550 [Glitch] Fix menu items that don't action 
Port 798d9a6b4a to glitch-soc
 2019-03-28 19:56:40 +01:00
Eugen Rochko
cfbadfa392 [Glitch] Redesign profile column in web UI to match design on public pages 
Port 858bc12635 to glitch-soc
 2019-03-28 19:56:40 +01:00
Thibaut Girka
22d45fe6b9 Fix centering on public pages 2019-03-28 19:56:03 +01:00
Thibaut Girka
177a0ef2ec Fix padding and centering of display names 2019-03-28 19:56:03 +01:00
Thibaut Girka
1476826aba Port search results styling to glitch-soc 2019-03-28 19:56:03 +01:00
Thibaut Girka
1600aeb6cb Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 18:35:25 +01:00
ThibG
ddd7a9e44b Fix opacity of relationship tags (#10411) 2019-03-28 18:33:26 +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
Eugen Rochko
6e163d5b2a Fix alternative relay support regression (#10398) 
Fix #10324
 2019-03-27 19:58:24 +01:00
slice
da47c30eac Add rel='noopener' to redesigned profile column header avatar link (#10393) 2019-03-27 17:08:26 +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
d72bc923e9 Revert "[Glitch] fix: update to emoji-mart 2.10.0" 
This reverts commit b0e478fcc5.
 2019-03-27 14:04:52 +01:00
Thibaut Girka
910fd88da2 Revert "Fix compilation after emoji-picker change" 
This reverts commit 05b79f07fa.
 2019-03-27 14:04:46 +01:00
Thibaut Girka
add1f52864 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-27 14:01:19 +01:00