c8ba75b963
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ca8944728f
Add message telling FTS is disabled when no toot can be found because of this ( #11112 )
...
* Add message telling FTS is disabled when no toot can be found because of this
Fixes #11082
* Remove info icon and reword message
5 years ago
ddd875ad99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
Upstream added a few fields
- config/application.rb
Upstream added a different paperclip transcoder
5 years ago
49ebda4d49
Change audio format from ogg to mp3 for wider compatibility ( #11141 )
...
* Change audio format from ogg to mp3 for wider compatibility
* Add media description as title to links of unknown media attachments
5 years ago
60adda7e59
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
b4d67fe57a
Fix ordering of keyboard access between CW field, textarea and emoji picker ( #11066 )
5 years ago
faafc3ae25
Fix border-bottom of active tab bars ( #11068 )
5 years ago
7065ba5930
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
92b572e2a3
Fix list not being automatically unpinned when it returns 404 in web UI ( #11045 )
6 years ago
1b0ff4cd69
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
6 years ago
9add88a920
Fix position of search icon ( #11003 )
6 years ago
241a8e7b5f
Fix more issues in the light theme ( #10996 )
...
* Fix tabs bar in light theme
* Fix borders on small screens in light theme
6 years ago
20dda5cca0
Change full logo to use primary text color of the given theme ( #10994 )
...
* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme
6 years ago
f4bc77f290
Improve light theme ( #10992 )
6 years ago
25f93f4097
Fix RTL layout not being RTL within the columns area ( #10990 )
6 years ago
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
cdb420862e
Fix display of alt-text when a media attachment is not available ( #10981 )
6 years ago
1db4117030
Change preferences page into appearance, notifications, and other ( #10977 )
6 years ago
c672676c03
Fix sass-lint config ( #10982 )
6 years ago
c402c291f4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
6 years ago
ed19f33440
Fix margins on profile metadata in single column mode ( #10961 )
6 years ago
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
6 years ago
e13e4b28db
Fix profile picture preview ( #10931 )
6 years ago
d93b82af87
Improvement variable height in single column layout ( #10917 )
...
* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas
6 years ago
7c1ca0c37b
Center 2-columns layout without side effect ( #10915 )
6 years ago
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7f203f7c49
Fix safari post field display issue in single column layout ( #10883 )
6 years ago
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
6 years ago
20d01a954e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
6 years ago
4168aeb234
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
6 years ago
1e5532e693
Add responsive panels to the single-column layout ( #10820 )
...
* Add responsive panels to the single-column layout
* Fixes
* Fix not being able to save the preference
* Fix code style issues
* Set max-height on the compose textarea and add a link to relationship manager
6 years ago
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
6 years ago
84dc21d55d
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
6 years ago
c0dc247bce
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/account.rb
- app/views/settings/profiles/show.html.haml
- spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Conflicts were due to an increase in account bio length upstream, which
is already covered in glitch-soc through `MAX_BIO_CHARS`.
6 years ago
9ddeb30f90
Add `forceSingleColumn` prop to `<UI />` ( #10807 )
...
* Move TabsBar rendering logic from CSS to the ColumnsArea component
* Add forceSingleColumn mode
* Add unread notifications counter to tabs bar
* Add toggle to control `forceSingleColumn`
* Increase paddings in mobile layout responsively at large sizes
6 years ago
8a378d4c3d
Fix stacking order of emoji picker ( #10801 )
6 years ago
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4ab094d35e
Adds click-able div that expands status ( #10733 ) ( #10766 )
...
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
6 years ago
3e15a845c1
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
6 years ago
2b97d9d780
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6dc9baad2a
Change icon and label depending on whether media is marked as sensitive ( #10748 )
...
* Change icon and label depending on whether media is marked as sensitive
* WiP use a checkbox
6 years ago
68629f2773
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
6 years ago
f2be71c293
Add emoji suggestions to CW and poll option fields ( #10555 )
...
* Refactor selectComposeSuggestion so that different paths can be updated
* Add suggestions in CW field
* Add emoji suggestion to poll options
* Attempt to fix CSS
* Hide suggestions by default
They will be enabled if the input has focus
6 years ago
0402c52f28
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
6 years ago
09eea46631
Bring back crossed eye icon on gallery ( #10715 )
6 years ago
5c82d660d1
Fix some colors of high contrast theme ( #10711 )
...
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
6 years ago
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
21209c2b52
Make sure the instance banner is never cropped ( #10702 )
6 years ago
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
Eugen Rochko
Yamagishi Kazutoshi
Takeshi Umeda
Jeong Arm
Hanage999
Mélanie Chauvel (ariasuni)
nzws
Neil Moore
Maciek Baron
nzws
Baptiste Gelez