treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
15,897 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

15897 Commits (6e553c64671968ef90b73b187c9f47cd0d8c2968)

Author SHA1 Message Date
Claire 6e553c6467 Revert notification design (#1875) 2022-10-28 10:30:14 +02:00
Claire 7379f8aa14 Fix status prepend design (#1874) 
* Fix status prepend design

* Adjust status prepend styling a bit
 2022-10-28 08:47:10 +02:00
prplecake 8be820a7c5 Use DEFAULT_FIELDS_SIZE/MAX_PROFILE_FIELDS value in settings form hint (#1870) 
Use `Account::DEFAULT_FIELDS_SIZE` in the hint, which would fallback to
4 if the environment variable isn't set.
 2022-10-21 12:01:37 +02:00
Claire 7259b6bad7 Actually fix config/locales-glitch not overriding translation strings (#1872) 2022-10-19 22:08:10 +02:00
Claire 230bd02970 Fix config/locales-glitch not overriding translation strings (#1871) 2022-10-19 19:53:47 +02:00
Claire 001e6a8d57 Fix notification cleaning mode causing notifications to get stuck (#1868) 2022-10-13 20:00:20 +02:00
Claire 96a738e51f Fix issues with notification cleaning mode when there is a disconnection gap (#1867) 2022-10-13 08:55:00 +02:00
Claire dc4e84cebd Port various forgotten fixes from upstream (#1864) 
* [Glitch] Fix crash when failing to load emoji picker

Port 09b322872a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

* [Glitch] Remove duplicate frequently used emojis

Port f7c306596f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Harmon <Harmon758@gmail.com>
 2022-10-12 19:03:28 +02:00
Claire 1ce75c18e0 Fix accidentally importing vanilla code in glitch-soc flavor (#1863) 2022-10-11 19:35:37 +02:00
Claire 859d917a89 Merge pull request #1862 from ClearlyClaire/glitch-soc/refactor/upstream-discrepancies 
Refactor glitch-soc front-end to limit discrepancies with upstream
 2022-10-11 19:22:48 +02:00
Claire 74e5dc13d8 Move flavours/glitch/features/emoji_picker back to flavours/glitch/features/compose/containers/emoji_picker_dropdown_container 2022-10-11 14:17:27 +02:00
Claire d540cfc73f Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji 2022-10-11 12:43:19 +02:00
Claire bf6b66bf32 Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
Claire 3f30353684 Remove unused `redux_helpers` module 2022-10-11 12:15:29 +02:00
Claire 61c3d9fc75 Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/compose/util/ 2022-10-11 12:15:08 +02:00
Claire bd82ae6aaa Move flavours/glitch/utils/ready to flavours/glitch/ready 2022-10-11 11:31:11 +02:00
Claire 812b755bcb Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/ui/util/ 2022-10-11 11:31:11 +02:00
Claire 874cd0e883 Rename flavours/glitch/util into flavours/glitch/utils 2022-10-11 11:31:11 +02:00
Claire 7691829703 Remove unneeded change in flavours/glitch/api 2022-10-11 11:30:54 +02:00
Claire 619601a94b Move flavours/glitch/util/api to flavours/glitch/api 2022-10-11 11:30:52 +02:00
Claire 9c54b00c13 Refactor initial_state to isolate glitch-soc changes 2022-10-11 10:27:14 +02:00
Claire 3bf201ddaa Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2022-10-11 10:17:04 +02:00
Claire 93efea5049 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 e86db22726 [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 bde98fd0a0 [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 7fbd7deefa [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 dac14696a0 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 f1599cb808 [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 4160cefccf [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 790ee76c1c [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 e047eabd87 [Glitch] Fix missing await 
Port 782154a762 to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Eugen Rochko a56ab9f111 [Glitch] Allow non-logged users to access /web 
Port babebc4e8a to glitch-soc

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

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

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

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

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

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

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

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

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

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

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

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-08 20:49:02 +02:00