luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-15 19:33:32 +00:00
Code Issues Projects Releases Wiki Activity
15880 commits 1 branch 0 tags 248 MiB
Commit graph

5335 commits

Author SHA1 Message Date
Claire d3879c07b1 Rename flavours/glitch/util into flavours/glitch/utils 2022-10-11 11:31:11 +02:00
Claire 1be97ce17f Remove unneeded change in flavours/glitch/api 2022-10-11 11:30:54 +02:00
Claire c285546052 Move flavours/glitch/util/api to flavours/glitch/api 2022-10-11 11:30:52 +02:00
Claire 64342a87b4 Refactor initial_state to isolate glitch-soc changes 2022-10-11 10:27:14 +02:00
Claire 26b687160b Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2022-10-11 10:17:04 +02:00
Eugen Rochko d04fbe6fe0 [Glitch] Change font size of active users in server banner to be larger in web UI 
Port 0e41d360c0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 20:45:26 +02:00
trwnh 0d0fac939d [Glitch] Fix crash in report modal 
Port 99a43f0282 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 20:31:46 +02:00
Eugen Rochko 757e16a0b5 [Glitch] Add server banner to web app 
Port d2528b26b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 20:26:15 +02:00
Eugen Rochko bf3cb42da7 Add server banner to web app, add GET /api/v2/instance to REST API (#19294) 
Cherry-picked d2528b26b6

Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream changed stuff, we had extra attributes.
  Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
  Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
  so updated that file by keeping our extra attributes, and took upstream's
  version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
  Took upstream's version.
 2022-10-09 19:51:39 +02:00
Eugen Rochko c9fadb3cae [Glitch] Add interaction modal to logged-out web UI 
Port 7fb738c837 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Eugen Rochko 90c6b0aed6 [Glitch] Fix trying to connect to streaming API when logged out in web UI 
Port d4b0aa7450 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Eugen Rochko 60e2cdd81a [Glitch] Fix various issues with logged-out web UI 
Port part of e2b561e3a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Yamagishi Kazutoshi f4fe985a03 [Glitch] Fix missing await 
Port fc3d248df7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Yamagishi Kazutoshi cc93cd5d6c [Glitch] Disable push notification when not logged in 
Port 216dbaedaf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Eugen Rochko 9ee2746a36 [Glitch] Add dynamic document title to WebUI 
Port part of 43b5d5e38d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Eugen Rochko 1ddd2186de [Glitch] Add sign-up button to logged-out web UI 
Port e623c302d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Eugen Rochko b38361a347 [Glitch] Fix various issues with logged-out Web UI 
Port fixes from e623c302d5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Claire 3f0505ea15 Fix logged-out UI not using single-column interface 2022-10-09 15:29:14 +02:00
Eugen Rochko 0ff1d62c7a [Glitch] Add logged-out access to the web UI 
Port part of 43b5d5e38d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 15:29:14 +02:00
Eugen Rochko 022547fbdf [Glitch] Fix wrong logo on start screen in web UI 
Port c8245e64c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 13:23:36 +02:00
Eugen Rochko 52e056cd61 [Glitch] Fix logo on /web/start 
Partial port from 43b5d5e38d

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 13:12:37 +02:00
Eugen Rochko 9cbb51e897 [Glitch] Add empty message for “Explore” tabs 
Port part of 43b5d5e38d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 13:11:18 +02:00
Claire 7ba5905416 Restore ability to discard interactions-based follow suggestions 2022-10-09 11:23:06 +02:00
Claire d4f13b9041 Change “Explore” tab to only provide search when trends are disabled 2022-10-08 20:49:02 +02:00
Eugen Rochko da67e0660a [Glitch] Add pagination for trending statuses in web UI 
Port f382192862 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
Eugen Rochko 9b17b26df4 [Glitch] Fix crash when search fails in web UI 
Port 8751c3c495 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
Eugen Rochko de9700a71a [Glitch] Fix public timelines being inaccessible on one stage of responsive layout in web UI (#17760) 
Port fa47c37f13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
mayaeh 815bf3753a [Glitch] Change the "Explore" icon from fa-globe to fa-hashtag 
Port e38a01c41a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
mayaeh 2097fd9008 [Glitch] Add menu column of explore to getting-started 
Port e52085246f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
Eugen Rochko 5854540e8c [Glitch, partial] Change appearance of account cards in web UI 
Port remaining changes from dba4be1038 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
Eugen Rochko c1fbef0965 [Glitch] Remove profile directory link from main navigation panel 
Port 54d4ece743 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
Eugen Rochko 6e208a817d [Glitch] Fix not showing loading indicator when searching in web UI 
Port cb2e198d89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
Eugen Rochko 058b74dc0a [Glitch] Add explore page to web UI 
Port d4592bbfcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
Eugen Rochko 870f0aae48 [Glitch] Fix pop-out player appearing on mobile screens in web UI 
Port 18ca4e0e9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00
Claire 30f4268f32
[Glitch] Add ability to select all accounts matching search for batch (#1857) 
Port SCSS changes from 5b0e8cc92b

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2022-10-08 16:24:35 +02:00
Claire 46224385e2 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-08 15:49:40 +02:00
prplecake c19a3517a0
Clarify language RE secondary toot button (#1851) 2022-10-05 14:10:15 +02:00
Eugen Rochko 240beed171
New Crowdin updates (#19255) 
* New translations en.yml (Thai)

* New translations en.yml (Greek)

* New translations en.yml (Afrikaans)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

* New translations en.yml (Bulgarian)

* New translations en.json (Catalan)

* New translations en.yml (Catalan)

* New translations en.json (Danish)

* New translations en.yml (Danish)

* New translations en.json (Greek)

* New translations en.json (Frisian)

* New translations en.json (Spanish)

* New translations en.yml (Frisian)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.json (Finnish)

* New translations en.yml (Finnish)

* New translations en.json (Irish)

* New translations en.yml (Irish)

* New translations en.yml (Hebrew)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.json (Afrikaans)

* New translations en.yml (French)

* New translations en.json (Hebrew)

* New translations en.json (Czech)

* New translations en.json (Thai)

* New translations en.yml (German)

* New translations en.yml (Czech)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Ido)

* New translations en.json (Bulgarian)

* New translations en.json (Ido)

* New translations en.json (German)

* New translations en.json (Tamil)

* New translations en.json (Esperanto)

* New translations en.yml (Spanish)

* New translations en.json (French)

* New translations en.yml (Turkish)

* New translations en.json (Dutch)

* New translations en.json (Albanian)

* New translations en.yml (Albanian)

* New translations en.yml (Ukrainian)

* New translations en.json (Japanese)

* New translations en.json (Indonesian)

* New translations en.json (Sinhala)

* New translations en.json (Romanian)

* New translations en.yml (Romanian)

* New translations en.json (Armenian)

* New translations en.yml (Armenian)

* New translations en.json (Urdu (Pakistan))

* New translations en.json (Serbian (Cyrillic))

* New translations en.yml (Serbian (Cyrillic))

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Urdu (Pakistan))

* New translations en.json (Slovenian)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.json (Galician)

* New translations en.yml (Galician)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.json (Persian)

* New translations en.yml (Slovenian)

* New translations en.yml (Slovak)

* New translations en.json (Italian)

* New translations en.yml (Dutch)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.json (Georgian)

* New translations en.yml (Georgian)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.json (Lithuanian)

* New translations en.yml (Lithuanian)

* New translations en.json (Macedonian)

* New translations en.yml (Macedonian)

* New translations simple_form.en.yml (Dutch)

* New translations en.json (Slovak)

* New translations en.json (Norwegian)

* New translations en.yml (Norwegian)

* New translations en.json (Punjabi)

* New translations en.yml (Punjabi)

* New translations en.json (Polish)

* New translations en.yml (Polish)

* New translations en.json (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations en.yml (Persian)

* New translations en.yml (Tamil)

* New translations en.yml (Malayalam)

* New translations en.yml (Welsh)

* New translations en.yml (Esperanto)

* New translations en.json (Uyghur)

* New translations en.yml (Uyghur)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.json (Tatar)

* New translations en.yml (Tatar)

* New translations en.json (Malayalam)

* New translations en.json (Breton)

* New translations en.yml (English, United Kingdom)

* New translations en.yml (Breton)

* New translations en.yml (Sinhala)

* New translations en.json (Cornish)

* New translations en.yml (Cornish)

* New translations en.json (Kannada)

* New translations en.yml (Kannada)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations en.json (Asturian)

* New translations en.yml (Asturian)

* New translations en.json (Welsh)

* New translations en.json (English, United Kingdom)

* New translations en.json (Spanish, Argentina)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (Spanish, Mexico)

* New translations en.yml (Spanish, Mexico)

* New translations en.json (Bengali)

* New translations en.yml (Bengali)

* New translations en.json (Marathi)

* New translations en.yml (Marathi)

* New translations en.json (Croatian)

* New translations en.yml (Croatian)

* New translations en.json (Norwegian Nynorsk)

* New translations en.json (Kazakh)

* New translations en.yml (Telugu)

* New translations en.yml (Kazakh)

* New translations en.json (Estonian)

* New translations en.yml (Estonian)

* New translations en.json (Latvian)

* New translations en.yml (Latvian)

* New translations en.json (Hindi)

* New translations en.yml (Hindi)

* New translations en.json (Malay)

* New translations en.yml (Malay)

* New translations en.json (Telugu)

* New translations en.json (Occitan)

* New translations en.yml (Occitan)

* New translations en.json (Sanskrit)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.yml (Silesian)

* New translations en.json (Silesian)

* New translations en.yml (Taigi)

* New translations en.json (Taigi)

* New translations en.yml (Kabyle)

* New translations en.json (Kabyle)

* New translations en.yml (Sanskrit)

* New translations en.yml (Sardinian)

* New translations en.json (Serbian (Latin))

* New translations en.json (Sardinian)

* New translations en.yml (Corsican)

* New translations en.json (Corsican)

* New translations en.yml (Sorani (Kurdish))

* New translations en.json (Sorani (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Standard Moroccan Tamazight)

* New translations en.json (Dutch)

* New translations en.json (Japanese)

* New translations en.json (Catalan)

* New translations en.json (Italian)

* New translations en.json (Korean)

* New translations en.yml (Dutch)

* New translations en.json (Slovenian)

* New translations en.json (Ukrainian)

* New translations en.json (Icelandic)

* New translations activerecord.en.yml (Dutch)

* New translations en.json (German)

* New translations en.json (Dutch)

* New translations en.json (Japanese)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations activerecord.en.yml (Dutch)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (German)

* New translations en.yml (Vietnamese)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Vietnamese)

* New translations en.json (Czech)

* New translations simple_form.en.yml (Czech)

* New translations en.json (Latvian)

* New translations en.yml (Asturian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Ido)

* New translations en.json (Chinese Traditional)

* New translations en.json (Danish)

* New translations en.json (Galician)

* New translations en.json (Turkish)

* New translations en.json (Albanian)

* New translations en.json (Italian)

* New translations en.json (Russian)

* New translations en.json (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.json (Spanish)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.json (Polish)

* New translations en.yml (Polish)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2022-10-04 16:42:40 +09:00
Yamagishi Kazutoshi fc3d248df7
Fix missing await (#19273) 2022-10-03 23:08:38 +02:00
Yamagishi Kazutoshi 216dbaedaf
Disable push notification when not logged in (#19272) 2022-10-03 18:15:47 +02:00
Claire 22af8f7563 Fix clicking bookmark column header not scrolling to top in single-column 2022-10-03 09:54:24 +02:00
Claire b76cef6212 Fix clicking List timeline header not scrolling to top in single-column 2022-10-03 09:54:24 +02:00
Claire 37eaa7fc01
Fix “Change subscribed languages” crashing in some situations (#19268) 2022-10-03 02:56:12 +02:00
Claire 6ee768b7b2 Fix “Change subscribed languages” crashing in some situations 2022-10-02 19:48:24 +02:00
Eugen Rochko f416e36f0f [Glitch] Add ability to filter followed accounts' posts by language 
Port 50948b46aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-02 19:36:29 +02:00
Eugen Rochko d25de7f01e [Glitch] Change path of privacy policy page 
Port 36f4c32a38 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-02 19:36:29 +02:00
Claire e18ba67727 [Glitch] Add privacy icons to report modal 
Port d2f7e30a28 to glitch-soc
 2022-10-02 19:36:29 +02:00
Claire bfc539cfb4 Revert "Change "Allow trends without prior review" setting to include statuses (#17977)" 
This reverts commit 546672e292.
 2022-10-02 18:46:28 +02:00
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
 2022-10-02 18:46:22 +02:00
Eugen Rochko c55219efa8
Remove volume number from hashtags in web UI (#19253) 2022-09-30 01:14:37 +02:00