1522 Commits (ffb486648ccfab92a65163803f6fef27d3d2af15)

Author	SHA1	Message	Date
Claire	ffb486648c	Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream	1 year ago
Claire	fbbe9f1c12	Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream	1 year ago
Claire	c8aa3d6d06	Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream	1 year ago
Claire	21ec596dab	Fix sign up steps progress layout in right-to-left locales (#26728)	1 year ago
Eugen Rochko	10b06436d1	Fix colors and typography on hashtag bar in web UI (#26666)	1 year ago
Eugen Rochko	bceb893159	Add search options to search popout in web UI (#26662)	1 year ago
Claire	32e67e78a3	Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream	1 year ago
Claire	b6b68b44a1	Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream ... Conflicts: - `Vagrantfile`: Upstream bumped a bunch of values, including one that was already bumped by glitch-soc. Took upstream's version. - `lib/paperclip/transcoder.rb`: glitch-soc already had a partial fix for this. Took upstream's version.	1 year ago
Claire	296b3d1560	Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream re-generated the file, while glitch-soc has a specific ignore for some file. Updated the file as upstream did and kept our extra ignore. - `config/webpack/shared.js`: Upstream added a plugin, but our files are pretty different. Added the plugin as well. - `spec/helpers/application_helper_spec.rb`: Upstream refactored tests, but part of them were different because of glitch-soc's theming system. Applied the refactoring to glitch-soc's change.	1 year ago
Claire	fbfc4145fd	Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there.	1 year ago
Antonin Del Fabbro	9a8190da4a	Change opacity of the delete icon in the search field to be more visible (#26449)	1 year ago
Claire	613cfd625c	Change hashtag bar tags to be de-emphasized (#26606)	1 year ago
Claire	10404aece8	Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream	1 year ago
Claire	2126812f65	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.	1 year ago
Claire	fe31571965	Fix layout of the closed registrations modal (#26593)	1 year ago
Christian Schmidt	bb23116e8d	Fix profile picture preview (#26538)	1 year ago
Santiago Kozak	85ecadb630	Fix hashtag bar display when status is in a thread (#26497)	1 year ago
Claire	df6e719898	Add display of out-of-band hashtags in the web interface (#26492) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	1 year ago
Claire	d9c21293aa	Fix unfollow icon styling in advanced column (#26482)	1 year ago
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Claire	44a5f1b64a	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README	1 year ago
Eugen Rochko	e325443b02	Change header of hashtag timelines in web UI (#26362)	1 year ago
Claire	79936c584f	Fix report modal secondary buttons style (#26341)	1 year ago
Trevor Wolf	93372fee1e	Fix light theme select option for hashtags (#26311)	1 year ago
Eugen Rochko	04e7efac3f	Change design of hidden media overlay (again) in web UI (#26330)	1 year ago
Trevor Wolf	6308dca76a	change column link to add a better keyboard focus indicator (#26278)	1 year ago
Eugen Rochko	2cbdff97ce	Change design of role badges in web UI (#26281) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Eugen Rochko	01f0cffc2c	Fix line clamp for link previews in web UI (#26286)	1 year ago
Eugen Rochko	4c999a736c	Fix wrong border radius on link cards in web UI (#26287)	1 year ago
Claire	92fa9d34b0	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.	1 year ago
Claire	bd349cb850	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	1 year ago
Claire	b2515feb29	Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	1 year ago
Claire	42f36aa55a	Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream fixed an issue that was not present in glitch-soc. Kept our version.	1 year ago
Eugen Rochko	d4807a5e64	Change aspect ratios on link previews in web UI (#26250)	1 year ago
Claire	bbea052935	Fix emoji picker button scrolling with textarea content in single-column view (#25304)	1 year ago
Claire	b4e739ff0f	Change interaction modal in web UI (#26075) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	1 year ago
Claire	1e4ccc655a	Add role badges to the WebUI (#25649)	1 year ago
Claire	ce1f35d7e2	Revert poll colors to green outside of compose form (#26164)	1 year ago
Trevor Wolf	49d2e8979f	fix poll input active style (#26162)	1 year ago
Eugen Rochko	f826a95f6e	Add published date and author to news on the explore screen in web UI (#26155)	1 year ago
Eugen Rochko	714a20697f	Fix missing action label on sensitive videos and embeds in web UI (#26135)	1 year ago
Eugen Rochko	d1a9f601c7	Fix missing border on error screen in light theme in web UI (#26152)	1 year ago
gol-cha	9a567ec1d1	Fix UI Overlap with the loupe icon in the Explore Tab (#26113)	1 year ago
Trevor Wolf	80809ef33e	change poll form element colors to fit with the rest of the ui (#26139)	1 year ago
Eugen Rochko	6b2952d1dd	Change design of link previews in web UI (#26136)	1 year ago
Eugen Rochko	4d01d1a1ee	Remove 16:9 cropping from web UI (#26132)	1 year ago
Eugen Rochko	cfd50f30bb	Fix focus and hover styles in web UI (#26125)	1 year ago
Trevor Wolf	59478a1b46	change focus ui for keyboard only input (#25935)	1 year ago
Claire	c943f17b1b	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Michael Stanclift	97ce47e451	Fix for "follows you" indicator in light web UI not readable (#25993)	1 year ago