alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,883 Commits
9 Branches
0 Tags
183 MiB
Commit Graph

15883 Commits (0f4a4d7527433eef6e95c51edea47bcfa33bbf7c)

Author SHA1 Message Date
Claire 0f4a4d7527 Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/compose/util/ 2022-10-11 12:15:08 +02:00
Claire 7097a459be Move flavours/glitch/utils/ready to flavours/glitch/ready 2022-10-11 11:31:11 +02:00
Claire 015e798394 Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/ui/util/ 2022-10-11 11:31:11 +02:00
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
Claire 94713940c7
Merge pull request #1861 from ClearlyClaire/glitch-soc/features/logged-out-webui 
Port logged-out Web UI to glitch-soc
 2022-10-09 23:26:02 +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 d86cb4cab8 [Glitch] Allow non-logged users to access /web 
Port 43b5d5e38d 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 44486db912
Merge pull request #1859 from ClearlyClaire/glitch-soc/features/trends-tab 
Port “Explore” tab to glitch-soc
 2022-10-09 11:48:06 +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 33b945e373
Merge pull request #1856 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-10-08 16:24:18 +02:00
Claire 46224385e2 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-08 15:49:40 +02:00
Claire 2c8d1880cc
Fix /privacy-policy not using the appropriate resource packs (#1853) 
Fixes #1852

This was an oversight from last upstream merge, failing to account for
glitch-soc's theming system.
 2022-10-07 11:35:31 +02:00
prplecake c19a3517a0
Clarify language RE secondary toot button (#1851) 2022-10-05 14:10:15 +02:00
dependabot[bot] 6580ac7241
Bump stylelint from 14.12.1 to 14.13.0 (#19280) 
Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.12.1 to 14.13.0.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint/compare/14.12.1...14.13.0)

---
updated-dependencies:
- dependency-name: stylelint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-04 21:18:59 +09:00
dependabot[bot] 971279efa8
Bump rspec_junit_formatter from 0.5.1 to 0.6.0 (#19286) 
Bumps [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter) from 0.5.1 to 0.6.0.
- [Release notes](https://github.com/sj26/rspec_junit_formatter/releases)
- [Changelog](https://github.com/sj26/rspec_junit_formatter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sj26/rspec_junit_formatter/compare/v0.5.1...v0.6.0)

---
updated-dependencies:
- dependency-name: rspec_junit_formatter
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-04 20:57:31 +09:00
dependabot[bot] 33b018648a
Bump postcss from 8.4.16 to 8.4.17 (#19279) 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.16 to 8.4.17.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.16...8.4.17)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-04 20:57:11 +09:00
dependabot[bot] 3093611f09
Bump blurhash from 2.0.0 to 2.0.3 (#19278) 
Bumps [blurhash](https://github.com/woltapp/blurhash) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/woltapp/blurhash/releases)
- [Commits](https://github.com/woltapp/blurhash/commits)

---
updated-dependencies:
- dependency-name: blurhash
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-04 20:56:13 +09:00
dependabot[bot] f0e8e67e47
Bump dotenv from 16.0.2 to 16.0.3 (#19276) 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 16.0.2 to 16.0.3.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v16.0.2...v16.0.3)

---
updated-dependencies:
- dependency-name: dotenv
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-04 20:42:26 +09:00