Thibaut Girka
f09150f2a9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
d73c1df33b
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
e968dcea13
Fix app-wide hotkeys randomly failing to work
6 years ago
mayaeh
bcb43baf50
Add Japanese translations. ( #8927 )
6 years ago
Thibaut Girka
683608dd60
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh
96a313d02b
Fixed error occurrence when pinning the DM column. ( #8922 )
6 years ago
Thibaut Girka
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
3f68e9ed11
Move “Show action buttons in collapsed toots” option
6 years ago
Thibaut Girka
caa56b01a9
Switch from selects to radio buttons for local settings, improve styling
6 years ago
Eugen Rochko
c9b5168ebd
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
6 years ago
Thibaut Girka
58cbb9ef8f
[Glitch] Change documentation URL
...
Port 7635a136c9
to glitch-soc
6 years ago
Thibaut Girka
52f97080e7
[Glitch] RTL: fix margins of public-account-header__tabs
...
Port e2065ceead
to glitch-soc
6 years ago
Thibaut Girka
bdbbbb1bdb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
b4bab7eb35
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.
6 years ago
Marcin Mikołajczak
07d123fd3c
i18n: Update Polish translation ( #8901 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
Eugen Rochko
7635a136c9
Change documentation URL ( #8898 )
...
* Change documentation URL
* Fix hardcoded documentation URL in locales
6 years ago
Masoud Abkenar
e2065ceead
RTL: fix margins of public-account-header__tabs ( #8897 )
...
* RTL: fix margins of public-account-header__tabs
* fix style
* even more stylish code :)
6 years ago
Thibaut Girka
463f250f26
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
72305816ea
[Glitch] Add a confirmation dialog when hitting reply and the compose box isn't empty
6 years ago
ThibG
d6df42df16
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
6 years ago
Thibaut Girka
1476e653ec
Make hidden media clickable in account media gallery
6 years ago
Thibaut Girka
c2f963256c
Add media description (or status spoiler) in account media gallery
6 years ago
Thibaut Girka
a62e47672e
Fix account gallery hidden media background color in mastodon-light
6 years ago
Thibaut Girka
e9f2659066
[Glitch] Honour displayMedia setting in accountMedia gallery
...
Inspired by aeca336e22
6 years ago
Thibaut Girka
536d95ae7c
[Glitch] Add support for new display_media setting
...
Port bb8afc4608
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"
6 years ago
Thibaut Girka
56714ef14c
[Glitch] RTL: fix margins: public-layout.header.nav-button
...
Port bf20094a3f
to glitch-soc
6 years ago
Thibaut Girka
9bec970736
[Glitch] RTL: fix statubar action buttons/counter margins
...
Port b837c636ac
to glitch-soc
6 years ago
Thibaut Girka
9617c07724
[Glitch] Separate font-family into variable
...
Port 8913189055
to glitch-soc
6 years ago
Thibaut Girka
f5eaefc485
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
6 years ago
Eugen Rochko
db1a581491
Double the threshold for "read more" functionality ( #8835 )
6 years ago
Spencer Alves
981a41ca2c
Add option to hide action bar in collapsed toots
6 years ago
David Yip
d698c06aa8
Merge pull request #681 from ThibG/glitch-soc/fixes/accessibility
...
Port various accessibility improvements from upstream
6 years ago
David Yip
278d21bb0b
Merge pull request #755 from ThibG/glitch-soc/features/optional-reply-selection
...
Make pre-selection of usernames optional when replying to a toot
6 years ago
David Yip
dc8da22a73
Merge pull request #754 from ThibG/glitch-soc/fixes/scroll-compose-into-view
...
Scroll to textarea when composing a toot
6 years ago
David Yip
a469f72e3b
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
6 years ago
Masoud Abkenar
bf20094a3f
RTL: fix margins: public-layout.header.nav-button ( #8823 )
...
* RTL: fix margins: public-layout.header.nav-button
* add empty line to meet style guides
6 years ago
Thibaut Girka
e7ddcf50ab
Make pre-selection of usernames optional when replying to a toot
...
Fixes #751
6 years ago
Thibaut Girka
39b29ae6eb
Fix styling issue in “Compose box options” local settings page
6 years ago
Thibaut Girka
d27b7d7645
Scroll to textarea when composing a toot
6 years ago
Thibaut Girka
c454db6f11
[Glitch] Adjust beforeUnload conditions
...
Port 05f90e3695
to glitch-soc
6 years ago
Thibaut Girka
acf5099504
Fix maxCharacters in vanilla front-end
6 years ago
Eugen Rochko
ad0670fe87
Revert Font Awesome 5 upgrade ( #8810 )
...
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796 )"
This reverts commit c8a1e945d9
.
* Revert "Migrate to font-awesome 5.0. (#8799 )"
This reverts commit ae20afbc80
.
* Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792 )"
This reverts commit 30b1bb0704
.
* Revert "Update the icon name changed by the Font Awesome 5. (#8776 )"
This reverts commit 84bcf89764
.
* Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484 )"
This reverts commit cc784f3c16
.
6 years ago
mayaeh
c8a1e945d9
Fix some icon names changed by the Font Awesome 5. ( #8796 )
6 years ago
Maciek Baron
4a2fe07e28
Add test for AutosuggestEmoji ( #8805 )
6 years ago
Colin Dean
417b0416e8
Adds follow action timestamp to notification ( #8756 )
...
Fixes #8755
6 years ago
Naoki Kosaka
ae20afbc80
Migrate to font-awesome 5.0. ( #8799 )
6 years ago
Haelwenn Monnier
ec1119d2c9
Show "read more" link on overly long in-stream statuses ( #8205 )
...
Show "read more" link on overly long in-stream statuses
6 years ago
theboss
30b1bb0704
Fix some icons names, unavailable in fontawesome5 (free license). ( #8792 )
...
- pencil => pencil-alt
- sliders => sliders-h
related: #8484 #8776
6 years ago
rhoio
45e5864062
remove meta label in settings column ( #8704 )
6 years ago
mayaeh
84bcf89764
Update the icon name changed by the Font Awesome 5. ( #8776 )
6 years ago