mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-02 13:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16024 commits 5 branches 147 tags 265 MiB
Commit graph

16024 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeremy Kescher
db5e2e5caf
Merge remote-tracking branch 'upstream/main' into develop 2022-10-28 18:32:30 +02:00
Claire
371563b0e2
Revert notification design (#1875) 2022-10-28 10:30:14 +02:00
Claire
19765216a1
Fix status prepend design (#1874) 
* Fix status prepend design

* Adjust status prepend styling a bit
 2022-10-28 08:47:10 +02:00
Jeremy Kescher
e7dad22750
Merge remote-tracking branch 'upstream/main' into develop 2022-10-21 17:00:08 +02:00
prplecake
b3030187a4
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
1e772c984b
Actually fix config/locales-glitch not overriding translation strings (#1872) 2022-10-19 22:08:10 +02:00
Claire
f7155becd0
Fix config/locales-glitch not overriding translation strings (#1871) 2022-10-19 19:53:47 +02:00
Jeremy Kescher
19413ebb0b
v3.5.3+1.0.9 2022-10-13 22:39:51 +02:00
Jeremy Kescher
e333716df0
Merge remote-tracking branch 'upstream/main' into develop 2022-10-13 22:39:25 +02:00
Claire
7e62688a0e
Fix notification cleaning mode causing notifications to get stuck (#1868) 2022-10-13 20:00:20 +02:00
Claire
27a2edcb79
Fix issues with notification cleaning mode when there is a disconnection gap (#1867) 2022-10-13 08:55:00 +02:00
Jeremy Kescher
727da8dcc9
v3.5.3+1.0.8 2022-10-13 06:52:46 +02:00
Jeremy Kescher
a0ac183609
Merge remote-tracking branch 'upstream/main' into develop 2022-10-13 06:52:27 +02:00
Claire
2bb443c7d5
Port various forgotten fixes from upstream (#1864) 
* [Glitch] Fix crash when failing to load emoji picker

Port bd3420b139 to glitch-soc

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

* [Glitch] Remove duplicate frequently used emojis

Port 98146281e1 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
Jeremy Kescher
b153ef2672
Merge remote-tracking branch 'upstream/main' into develop 2022-10-12 07:25:19 +02:00
Claire
18f210aff6
Fix accidentally importing vanilla code in glitch-soc flavor (#1863) 2022-10-11 19:35:37 +02:00
Claire
b01faa7375
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
e1db6cf320 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
b728b25c10 Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji 2022-10-11 12:43:19 +02:00
Claire
b75bf336bd Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
Claire
2535ec4fcb Remove unused redux_helpers module 2022-10-11 12:15:29 +02:00
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
Jeremy Kescher
a33508f687
v3.5.3+1.0.7 2022-10-10 06:46:48 +02:00
Jeremy Kescher
f314520459
Merge remote-tracking branch 'upstream/main' into develop 2022-10-10 06:45:32 +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
Jeremy Kescher
d09dd82fbd
Remove/update old "tootsuite" references, except those needed for Docker 2022-10-09 13:37:40 +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