mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2025-01-22 05:14:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17108 commits 5 branches 150 tags 287 MiB
Commit graph

1394 commits

Author SHA1 Message Date
Jeremy Kescher
48373a71e3
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/components/status_action_bar.js
#	app/javascript/flavours/glitch/containers/status_container.js
#	app/javascript/flavours/glitch/features/status/components/action_bar.js
#	app/javascript/flavours/glitch/locales/de.json
#	app/javascript/flavours/glitch/locales/fr.json
#	app/javascript/mastodon/components/status_action_bar.js
#	app/javascript/mastodon/features/status/components/action_bar.js
#	config/locales-glitch/de.yml
#	config/locales-glitch/fr.yml
#	config/locales-glitch/simple_form.de.yml
#	config/locales-glitch/simple_form.fr.yml
 2023-01-05 23:29:53 +01:00
Claire
6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
 2023-01-05 14:16:25 +01:00
Claire
18d00055f4
Add dropdown menu item to open admin interface for remote domains (#21895) 
* Allow /admin/instances/:domain to handle IDNs

* Add dropdown menu item to open admin interface for remote domains
 2023-01-05 14:03:46 +01:00
Holden Foreman
83888739fd
Add aria-hidden to content warning field when dimmed so that it is not confusing to screen reader users (#22568) 2023-01-05 13:39:58 +01:00
Jeremy Kescher
1661561640
Merge branch 'reactions' into develop 
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/locales/de.js
#	app/javascript/flavours/glitch/locales/en.js
#	app/javascript/flavours/glitch/locales/es.js
#	app/javascript/flavours/glitch/locales/fr.js
#	app/javascript/flavours/glitch/locales/ja.js
#	app/javascript/flavours/glitch/locales/ko.js
#	app/javascript/flavours/glitch/locales/pl.js
#	app/javascript/flavours/glitch/locales/zh-CN.js
#	app/javascript/mastodon/actions/interactions.js
#	app/javascript/mastodon/locales/fr.json
#	db/migrate/20221124114030_create_status_reactions.rb
 2022-12-22 00:18:36 +01:00
Jeremy Kescher
2379efb52f
Merge remote-tracking branch 'upstream/main' into reactions 
# Conflicts:
#	app/javascript/flavours/glitch/locales/de.js
#	app/javascript/flavours/glitch/locales/en.js
#	app/javascript/flavours/glitch/locales/fr.js
#	app/javascript/mastodon/actions/interactions.js
#	app/javascript/mastodon/locales/fr.json
#	config/locales-glitch/de.yml
#	config/locales-glitch/fr.yml
#	config/locales-glitch/simple_form.de.yml
#	config/locales-glitch/simple_form.fr.yml
 2022-12-21 23:45:28 +01:00
Claire
b248aa4d3e Merge branch 'main' into glitch-soc/merge-upstream 2022-12-21 15:59:39 +01:00
fef
18e408c6af
properly disable reactions when not logged in 2022-12-20 18:27:56 +01:00
fef
a556d81cde
also disable reaction buttons in vanilla flavour 2022-12-20 18:27:55 +01:00
fef
47ac7a2e50
fix image for new custom emoji reactions 2022-12-20 18:27:55 +01:00
fef
a2db70b3c8
rename nop handler to handleNoOp 
This also adds the comment in action_bar.js to
status_action_bar.js, clarifying that a future
version could improve this code by modifying
EmojiPickerDropdown.
 2022-12-20 18:27:53 +01:00
fef
a9bb743db7
cleanup JS imports and other minor stuff 2022-12-20 18:27:53 +01:00
fef
e405eb76f4
clean up new imports in vanilla flavour 2022-12-20 18:27:52 +01:00
fef
7cbe6dc3e8
rebase with upstream 2022-12-20 18:27:51 +01:00
Nick Schonning
06b68490d1
Enable eslint:recommended ruleset (#22433) 
* Enable ESLint recommended ruleset

* Disable failing ESLint recommended rules

* Remove rules shadowed by eslint:recommended
 2022-12-19 00:51:37 +09:00
Jeremy Kescher
0406f173cf
Merge remote-tracking branch 'reactions/main' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/locales/de.js
 2022-12-17 11:09:32 +01:00
Jeremy Kescher
a1a1d08890
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
 2022-12-16 17:53:33 +01:00
Claire
f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
 2022-12-15 20:25:25 +01:00
Claire
70415714f1
Add follow request banner on account header (#20785) 
* Add requested_by to relationship maps

* Display whether an account has requested to follow you on their profile
 2022-12-15 18:50:11 +01:00
Holden Foreman
c761e7a5ef
Fix language surrounding disability in prompts for alt text and other media descriptions (#20923) 2022-12-15 18:46:13 +01:00
Bramus!
7fbc17afa2
Fix media markup (#21420) 
This brings the markup of the MediaItem component on par with the Item component from media_gallery.

Co-authored-by: Effy Elden <effy@effy.space>
 2022-12-15 18:37:47 +01:00
Rens Groothuijsen
726c7dea31
Display search popout at fixed screen position (#16463) 
* Display search popout at fixed screen position

* Attach search popout to search box
 2022-12-15 17:38:50 +01:00
Arnout Engelen
9f63c428e1
Don't autofocus the compose form (#16517) 
When opening a page such as /web/timelines/home in a desktop browser, the
cursor was automatically placed in the textarea of the compose form.

When using the keyboard for navigation (using a browser plugin like vimium or
vim vixen, or just to hit 'space' to scroll down a page), you have remember to
leave the field before using that.

Since you only visit the page to write a new post some of the time, this PR
attempts to have nothing focused initially (and require the user to click or
e.g. use 'tab' to focus the textarea).

Tested:
* /web/timeslines/home no longer autofocuses the compose box
* pressing the 'n' hotkey still focuses the compose box
* clicking 'reply' for a post still focuses the compose box
* replying to a CW'ed post still focuses the compose box
* introducing the CW field still focuses the CW field
* introducing the CW field for a reply still focuses the CW field
* removing the CW field still focuses the compose box
* /web/statuses/new still autofocuses the compose box

fixes #15862
 2022-12-15 17:37:05 +01:00
Meisam
059d64a59e
set activation for tag follow button (#21629) 
Co-authored-by: meisam <meisam@noreply.codeberg.org>
 2022-12-15 17:04:52 +01:00
Nick Schonning
72a8af8088
Fix typo in handler function call name (#21829) 2022-12-15 16:37:17 +01:00
Yamagishi Kazutoshi
58200132d0
FormattedMessage must be used directly (#20982) 
* `FormattedMessage` must be used directly

* rollback
 2022-12-15 16:20:46 +01:00
Pleclown
3a59ffde8d
Adding 12 hours option for polls (#21131) 
* Adding 12 hours option for polls

Adding 12 hours option for polls

* Adding 12 hours option for polls

Missing > on a line
 2022-12-15 16:20:34 +01:00
Alex Stine
903e5a3f45
Fix hidden label causing accessibility issue for search inputs (#21275) 
* Try unhiding search label.

* Use aria-label. Remove label as empty labels are useless.

* Remove addition of package-lock.json.
 2022-12-15 16:20:21 +01:00
Claire
47c75c29da Merge branch 'main' into glitch-soc/merge-upstream 2022-12-14 09:10:49 +01:00
cadars
52a50c5e43
Make handle more easily selectable on profile page (#21479) 
* Make handle more easily selectable on profile page

* Wrap handle in a span

* Add `user-select: all` to span

* remove whitespace
 2022-12-13 19:43:03 +01:00
fef
66ade5c1fd
properly disable reactions when not logged in 2022-12-09 23:08:45 +01:00
fef
55ba8f9c92
also disable reaction buttons in vanilla flavour 2022-12-09 23:08:44 +01:00
fef
e6c9206f5c
fix image for new custom emoji reactions 2022-12-09 23:08:44 +01:00
fef
6aa7d7fb12
rename nop handler to handleNoOp 
This also adds the comment in action_bar.js to
status_action_bar.js, clarifying that a future
version could improve this code by modifying
EmojiPickerDropdown.
 2022-12-09 23:08:42 +01:00
fef
7187d6f9cf
cleanup JS imports and other minor stuff 2022-12-09 23:08:42 +01:00
fef
a47ecf6e69
clean up new imports in vanilla flavour 2022-12-09 23:08:41 +01:00
fef
f4dbfdb9c9
rebase with upstream 2022-12-09 23:08:36 +01:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop 2022-12-07 17:49:14 +01:00
Claire
9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.
 2022-12-07 09:03:42 +01:00
Claire
51098035ed
Fix “Sign up” button with closed registrations not opening modal on mobile (#22060) 
Fixes #20840
 2022-12-07 00:25:40 +01:00
Jeremy Kescher
d23e167d0d
Merge remote-tracking branch 'upstream/main' into develop 2022-11-30 17:56:57 +01:00
Claire
fe111a8bad Merge branch 'main' into glitch-soc/merge-upstream 2022-11-30 10:29:19 +01:00
Jeremy Kescher
730a09f642
v4.0.2+1.0.6 2022-11-29 00:15:08 +01:00
Claire
2d4d99f135
Fix expanded statuses not always being scrolled into view (#21797) 2022-11-28 16:42:04 +01:00
Claire
a2e7997592 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.
 2022-11-28 11:33:34 +01:00
Connor Shea
cec1e902e0
Make the 'Trending now' header a link to Explore. (#21759) 
This keeps the same design that exists currently, but makes "Trending
now" into a link to the Hashtags section of "Explore".

Resolves #21758.
 2022-11-27 23:49:32 +01:00
Claire
3ffaa966b0
Fix infinite loading instead of soft 404 for non-existing remote accounts (#21303) 
Fixes #21278, #21021
 2022-11-27 20:48:12 +01:00
James Adney
c0dcf15d1e
fix gif autoplay on iOS (#21422) 2022-11-27 20:46:23 +01:00
Claire
fe421257e5
Fix “Share @{name}'s profile” profile menu item (#21490) 2022-11-27 20:42:17 +01:00
Jeremy Kescher
b221a857f7
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
 2022-11-17 23:38:08 +01:00