1488be7d96
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
2b4e2616ea
Fix loading bar being obscured by other elements in web UI ( #11598 )
2019-08-18 14:57:05 +02:00
cd660d374a
Fix hashtag autosuggestions line breaks for long suggestions ( #11588 )
2019-08-17 22:04:31 +02:00
2ca6b2bb6c
Improve focal point modal on mobile ( #11575 )
...
* Reduce padding around report modal and focal point modal title
* Increase max allowed height for focal point modal content
2019-08-15 22:49:00 +02:00
d37126fd03
Allow clicking behind preview ( #11576 )
2019-08-15 22:47:51 +02:00
1bea318197
Fix edit media modal on small screens, touch events ( #11573 )
2019-08-15 20:28:56 +02:00
a5a5a0adec
Fix trending counter width ( #11569 )
...
Trending counter used to be constant 100px in width, which caused
issues in languages like Russian, where because of that, "talking"
text was cut to the size where actual count is not visible at all:
> 6 people talking
> Популярно у...
2019-08-15 20:20:02 +02:00
28636f43e4
Add OCR tool to media editing modal ( #11566 )
2019-08-15 15:13:26 +02:00
23f7afa562
Add media editing modal ( #11563 )
...
Move media description input to a modal and unite that modal with
the focal point modal. Add a hint about choosing focal points, as
well as a preview of a 16:9 thumbnail. Enable the user to watch
the video next to the media description input.
Fix #8320
Fix #6713
2019-08-14 04:07:32 +02:00
04534604c6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
9072fe5ab6
Add trends UI with admin and user settings ( #11502 )
2019-08-06 17:57:52 +02:00
e50554391a
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-05 13:13:28 +02:00
c8fd823327
Change icon button styles to make hover/focus states more obvious ( #11474 )
...
* Change icon buttons styles to make hover/focused states more obvious
* Fix CW button size inconsistency
* Fix icon button background color consistency
2019-08-03 19:10:50 +02:00
2dee293c4c
Fix scroll to top in single column UI ( #11463 )
2019-08-01 19:17:17 +02:00
706a48ee1f
Fix column header scrolling with the page ( #11458 )
...
Regression from aa22b38
2019-08-01 12:26:58 +02:00
c4043ba2f2
Fix jumping of toot date when clicking spoiler button ( #11449 )
...
* Fix jumping of toot date when clicking spoiler button
* Fix lint
2019-07-31 10:06:58 +02:00
bca3825c17
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
cfb2ed7823
Add autosuggestions for hashtags ( #11422 )
2019-07-28 14:37:52 +02:00
10e78ecf57
Change contrast of status links that are not mentions nor hashtags ( #11406 )
2019-07-28 06:00:51 +02:00
4cc29eb5ad
Fix tabs bar scrolling along with content on mobile ( #11418 )
2019-07-27 19:25:15 +02:00
8a4674f2c3
Add search results pagination to web UI ( #11409 )
...
* Add search results pagination to web UI
Fix #10737
* Fix code style issue
2019-07-27 05:49:50 +02:00
2d35e4460a
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-24 16:23:53 +02:00
fb1b710e8d
Fix scrolling in single-column mode on Chrome ( #11395 )
...
Fixes #11389
2019-07-23 15:47:18 +02:00
249991c498
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
aa22b38fdb
Change single-column mode to scroll the whole page ( #11359 )
...
Fix #10840
2019-07-19 09:25:22 +02:00
c8ba75b963
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-28 12:11:45 +02:00
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
2019-06-27 21:12:26 +02:00
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
2019-06-24 15:02:59 +02:00
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
2019-06-21 22:59:44 +02:00
60adda7e59
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-13 22:23:20 +02:00
b4d67fe57a
Fix ordering of keyboard access between CW field, textarea and emoji picker ( #11066 )
2019-06-13 17:07:43 +02:00
faafc3ae25
Fix border-bottom of active tab bars ( #11068 )
2019-06-13 00:14:27 +02:00
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
f4bc77f290
Improve light theme ( #10992 )
2019-06-08 10:23:41 +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
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
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
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
Thibaut Girka