Commit Graph

149 Commits (03f50f2f00a129da0cc021369b975ecfccf1327f)

Author SHA1 Message Date
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
2 years ago
Claire 0be6da42d3 Change glitch-soc composer classes to match upstream 2 years ago
Sunny Ripert 93ccb4a29e [Glitch] Fix JavaScript console error on upload editing status
Port c95d9aab56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher 9c8fb2d475
Improve min poll options, expose value in API 2 years ago
Jeremy Kescher 7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
2 years ago
Eugen Rochko ebfe393e9c [Glitch] Fix upload progress not communicating processing phase in web UI
Port 30ef110224 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko eb307ec1bd [Glitch] Fix logged out search and changed logged-in search placeholder
Port 55af04b253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 89fdfb8fe6 [Glitch] Fix redirecting to `/publish` when compose form is visible in web UI
Port 5452af2188 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 9363e5c24e [Glitch] Change public accounts pages to mount the web UI
Port 839f893168 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 206e9593ac [Glitch] Fix logged-out web UI on smaller screens
Port e2b561e3a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher a0ac183609
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
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>
2 years ago
Jeremy Kescher b153ef2672
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Claire e1db6cf320 Move flavours/glitch/features/emoji_picker back to flavours/glitch/features/compose/containers/emoji_picker_dropdown_container 2 years ago
Claire b75bf336bd Move more modules from flavours/glitch/utils to flavours/glitch 2 years ago
Claire 0f4a4d7527 Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/compose/util/ 2 years ago
Claire 015e798394 Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/ui/util/ 2 years ago
Claire d3879c07b1 Rename flavours/glitch/util into flavours/glitch/utils 2 years ago
Claire 26b687160b Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2 years ago
Jeremy Kescher 7d927f3c19
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Claire 0b733ca790 [Glitch] Add ability to filter individual posts
Port 50487db122 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher f2fef712b3
Web UI: Allow removing a second poll choice 2 years ago
Eugen Rochko 7bf37551c8 [Glitch] Change label of publish button to be "Publish" again
Port 628c177ebe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire 4ab3ad3bef
Fix crash in glitch-soc search results when Elasticsearch is disabled (#1780) 2 years ago
Eugen Rochko 2e5fb45be5 [Glitch] Add language dropdown to compose in web UI
Port 0cdb077570 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire 3dd4f40a0e Fix backend terms link not being used 2 years ago
Claire e4bec702ac [Glitch] Rename toots to posts in various places, add or reword DM warnings
Port part of be0bc9acbf and 7e244879fe
to glitch-soc
2 years ago
Eugen Rochko 91e6df7026 [Glitch] Add hint about missing media attachment description in web UI
Port 4e9855e09a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire 8e04ba87b7 [Glitch] Fix reply button on media modal not giving focus to compose form
Port 2cd31b3177 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire f3429d7354 [Glitch] Fix controls for unchangeable properties on status edit not being disabled
Port 38845592c4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Holly 27803cd2b7 Make the settings button go to settings when opened in a new tab 2 years ago
Eugen Rochko 5e67858fbc [Glitch] Add editing for published statuses
Port 63002cde03 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire 0bb3d445ab Please Codeclimate 2 years ago
Claire e1a4590bca Rework actions modal to bring it closer to upstream and fix modal stacking issue 2 years ago
Claire bc2eaf3581 Remove unused noModal prop 2 years ago
Claire f03dc97070 Some more refactoring 2 years ago
Claire f87ce13afc Refactor dropdown and action modal code slightly
Simplify it a bit and make it closer to upstream
2 years ago
Claire 4dd4fc2e5e [Glitch] Fix text being incorrectly pre-selected in composer textarea on /share
Port 3a103cd317 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 7aec1bc308 [Glitch] Add graphs and retention metrics to admin dashboard (#16829)
Port 07341e7aa6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Eugen Rochko a7f6524c6b [Glitch] Change routing paths to use usernames in web UI
Port 52e5c07948 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Takeshi Umeda 8681ef85d0 [Glitch] Fix logout link not working in safari
Port b2875b1864 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Claire 34a573ac27 [Glitch] Add confirmation modal when closing media edit modal with unsaved changes
Port a8a7066e97 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Claire a85eb7d930 Fix follow suggestions scrolling on mobile view
Also simplify the CSS a bit and bring it closer to upstream.
3 years ago
Eugen Rochko 5fa4138bd8 [Glitch] Fix "You might be interested in" flashing while searching in web UI
Port 0a3fa034fc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Takeshi Umeda b1d4f21db0 [Glitch] Fix not to show follow button in global suggestion
Port baed52c2a7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Eugen Rochko e6501d5112 [Glitch] Add cold-start follow recommendations
Port front-end changes from f7117646af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Noiob 39b9a0619a Remove superfluous toot length check 3 years ago
Claire 5ea53b6158 [Glitch] Fix compose form behavior in mobile view
Port 034f37b85a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Claire 49eef466b8 [Glitch] Add dropdown for boost privacy in boost confirmation modal
Port 07b46cb332 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
3 years ago
Claire 9213b02656 Refactor privacy dropdown to have an interface closer to upstream's 3 years ago