7065ba5930
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-11 21:55:00 +02:00
92b572e2a3
Fix list not being automatically unpinned when it returns 404 in web UI ( #11045 )
2019-06-11 02:26:37 +02:00
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
2019-06-10 18:59:53 +02:00
9add88a920
Fix position of search icon ( #11003 )
2019-06-09 01:59:42 +02:00
241a8e7b5f
Fix more issues in the light theme ( #10996 )
...
* Fix tabs bar in light theme
* Fix borders on small screens in light theme
2019-06-08 22:32:59 +02:00
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
2019-06-08 15:30:06 +02:00
f4bc77f290
Improve light theme ( #10992 )
2019-06-08 10:23:41 +02:00
25f93f4097
Fix RTL layout not being RTL within the columns area ( #10990 )
2019-06-07 23:35:26 +02:00
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
cdb420862e
Fix display of alt-text when a media attachment is not available ( #10981 )
2019-06-07 12:41:08 +02:00
1db4117030
Change preferences page into appearance, notifications, and other ( #10977 )
2019-06-07 03:39:24 +02:00
c672676c03
Fix sass-lint config ( #10982 )
2019-06-06 18:51:46 +02:00
c402c291f4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
2019-06-06 12:30:14 +02:00
ed19f33440
Fix margins on profile metadata in single column mode ( #10961 )
2019-06-04 23:11:57 +02:00
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
e13e4b28db
Fix profile picture preview ( #10931 )
2019-06-02 18:04:41 +02:00
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
2019-06-02 10:05:54 +02:00
7c1ca0c37b
Center 2-columns layout without side effect ( #10915 )
2019-06-01 07:59:21 +03:00
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-30 13:31:01 +02:00
7f203f7c49
Fix safari post field display issue in single column layout ( #10883 )
2019-05-29 12:03:56 +03:00
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
2019-05-27 03:33:39 +02:00
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”.
2019-05-26 15:41:40 +02:00
4168aeb234
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
2019-05-25 23:19:39 +02:00
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
2019-05-25 21:27:00 +02:00
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
84dc21d55d
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
2019-05-23 20:01:10 +02:00
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`.
2019-05-23 19:01:30 +02:00
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
2019-05-23 01:35:22 +02:00
8a378d4c3d
Fix stacking order of emoji picker ( #10801 )
2019-05-22 18:00:34 +02:00
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
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.
2019-05-15 06:53:23 +02:00
3e15a845c1
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
2019-05-12 05:15:42 +02:00
2b97d9d780
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-11 18:23:46 +02:00
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
2019-05-10 17:59:57 +02:00
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
2019-05-10 17:09:12 +02:00
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
2019-05-09 22:10:27 +02:00
0402c52f28
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
2019-05-09 22:03:32 +02:00
09eea46631
Bring back crossed eye icon on gallery ( #10715 )
2019-05-08 18:01:33 +02:00
5c82d660d1
Fix some colors of high contrast theme ( #10711 )
...
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
2019-05-07 23:53:58 +02:00
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-05 12:28:10 +02:00
21209c2b52
Make sure the instance banner is never cropped ( #10702 )
2019-05-05 01:07:15 +02:00
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-04 19:15:50 +02:00
7aa749ab46
Fix transition: all ( #10699 )
2019-05-04 17:39:53 +02:00
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
63b1388fef
Change font weight of sensitive button to 500 ( #10682 )
2019-05-03 20:44:20 +02:00
011b032300
Provide a link to existing domain block when trying to block an already-blocked domain ( #10663 )
...
* When trying to block an already-blocked domain, provide a link to the block
* Fix styling for links in flash messages
* Allow blocks to be upgraded but not downgraded
2019-05-03 20:36:36 +02:00
eb63217210
Add button to view context to media modal ( #10676 )
...
* Add "view context" button to media modal when opened from gallery
* Add "view context" button to video modal
Allow closing the video modal by navigating back in the browser,
just like the media modal
2019-05-03 16:16:30 +02:00
05ef3462ba
Make the "mark media as sensitive" button more obvious in web UI ( #10673 )
...
* Make the "mark media as sensitive" button more obvious in web UI
* Use eye-slash icon instead of eye icon to mean "hide"
2019-05-03 04:34:55 +02:00
967e419f8f
Fix alignment of items in the account gallery in web UI and load more per page ( #10674 )
2019-05-03 04:02:55 +02:00
Thibaut Girka
Eugen Rochko
Yamagishi Kazutoshi
Takeshi Umeda
Jeong Arm
Hanage999
Mélanie Chauvel (ariasuni)
nzws
Neil Moore
Maciek Baron
nzws
Baptiste Gelez