Commit Graph

2515 Commits (3d5d899094ecf389ce6cf31a6f33dcf1894e662d)

Author SHA1 Message Date
ThibG 0075964244
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
7 years ago
Thibaut Girka bb1103d974 Really fix HotKeys 7 years ago
Thibaut Girka a02244f17c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
7 years ago
mayaeh e50cb5f4bd Fix that the copy button of verify link did not work. (#8938) 7 years ago
Thibaut Girka 269edc0e48 Fix CW icon color in local-settings modal 7 years ago
Thibaut Girka 721aec40cd Define some local-settings hints 7 years ago
Thibaut Girka 26409f3e8e Add support for hints (or extended descriptions) in local-settings pages 7 years ago
Thibaut Girka 5f308a7f05 When screen width is too narrow, hide local-settings page text, keep only icons 7 years ago
Thibaut Girka 6cd793f0ac Change “preferences” icon to match settings page icon 7 years ago
Thibaut Girka edb9ec8543 Add icons for each of the local-setting pages 7 years ago
Thibaut Girka 122ac9cd1d Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
ThibG 4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
7 years ago
Thibaut Girka d0b1369a85 Fix app-wide hotkeys randomly failing to work 7 years ago
mayaeh 87abbb07f3 Add Japanese translations. (#8927) 7 years ago
Thibaut Girka b368d3c15d Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
mayaeh 770e337497 Fixed error occurrence when pinning the DM column. (#8922) 7 years ago
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
Thibaut Girka 96c3d26870 Move “Show action buttons in collapsed toots” option 7 years ago
Thibaut Girka faecb35fe0 Switch from selects to radio buttons for local settings, improve styling 7 years ago
Eugen Rochko 774ac47373
Add conversations API (#8832)
* Add conversations API

* Add web UI for conversations

* Add test for conversations API

* Add tests for ConversationAccount

* Improve web UI

* Rename ConversationAccount to AccountConversation

* Remove conversations on block and mute

* Change last_status_id to be a denormalization of status_ids

* Add optimistic locking
7 years ago
Thibaut Girka a3677a828d [Glitch] Change documentation URL
Port 28401962ca to glitch-soc
7 years ago
Thibaut Girka b4ba1058b8 [Glitch] RTL: fix margins of public-account-header__tabs
Port 185cb2dc3a to glitch-soc
7 years ago
Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
Thibaut Girka 7cc7843109 Do not scroll timelines when *closing* media modals
Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases.
7 years ago
Marcin Mikołajczak 2fb692ea45 i18n: Update Polish translation (#8901)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Eugen Rochko 28401962ca Change documentation URL (#8898)
* Change documentation URL

* Fix hardcoded documentation URL in locales
7 years ago
Masoud Abkenar 185cb2dc3a RTL: fix margins of public-account-header__tabs (#8897)
* RTL: fix margins of public-account-header__tabs

* fix style

* even more stylish code :)
7 years ago
Thibaut Girka 98bb6815a7 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
Thibaut Girka c6e4c48942 [Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty 7 years ago
ThibG 42aecb4c13 Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893)
* Add a confirmation dialog when hitting reply and the compose box isn't empty

Fixes #878

* Performance improvement
7 years ago
Thibaut Girka a9e8f98a9d Make hidden media clickable in account media gallery 8 years ago
Thibaut Girka d82c495c0f Add media description (or status spoiler) in account media gallery 8 years ago
Thibaut Girka bd1f08fa9a Fix account gallery hidden media background color in mastodon-light 8 years ago
Thibaut Girka eb85427576 [Glitch] Honour displayMedia setting in accountMedia gallery
Inspired by b79ab15859
8 years ago
Thibaut Girka 6ad7606909 [Glitch] Add support for new display_media setting
Port f7a6f9489d to glitch-soc

[API] [vanilla required] [glitch-soc optional] initial_state show_sensitive_media boolean changed to show_media string with options "default", "hide_all", "show_all"
8 years ago
Thibaut Girka 15197a831c [Glitch] RTL: fix margins: public-layout.header.nav-button
Port df2f4052b8 to glitch-soc
8 years ago
Thibaut Girka 884a898442 [Glitch] RTL: fix statubar action buttons/counter margins
Port 9f6662fcc9 to glitch-soc
8 years ago
Thibaut Girka 36d426cec9 [Glitch] Separate font-family into variable
Port d0d65b5a28 to glitch-soc
8 years ago
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
8 years ago
Eugen Rochko 5d5d1b528e
Double the threshold for "read more" functionality (#8835) 8 years ago
Spencer Alves 4e60a0d543 Add option to hide action bar in collapsed toots 8 years ago
David Yip c065717b67
Merge pull request #681 from ThibG/glitch-soc/fixes/accessibility
Port various accessibility improvements from upstream
8 years ago
David Yip 2bb3c8c944
Merge pull request #755 from ThibG/glitch-soc/features/optional-reply-selection
Make pre-selection of usernames optional when replying to a toot
8 years ago
David Yip 19968912fa
Merge pull request #754 from ThibG/glitch-soc/fixes/scroll-compose-into-view
Scroll to textarea when composing a toot
8 years ago
David Yip 5b43d7bcbf
Merge pull request #745 from ThibG/glitch-soc/fixes/grey-out-button
Disable the “TOOT” button (and secondary toot button) if the toot text is empty
8 years ago
Masoud Abkenar df2f4052b8 RTL: fix margins: public-layout.header.nav-button (#8823)
* RTL: fix margins: public-layout.header.nav-button

* add empty line to meet style guides
8 years ago
Thibaut Girka 86b2b009dd Make pre-selection of usernames optional when replying to a toot
Fixes #751
8 years ago
Thibaut Girka 15134beb1e Fix styling issue in “Compose box options” local settings page 8 years ago
Thibaut Girka 9594c68532 Scroll to textarea when composing a toot 8 years ago
Thibaut Girka fa18859b20 [Glitch] Adjust beforeUnload conditions
Port 05f90e3695 to glitch-soc
8 years ago