41a98b6543
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
Upstream moved account helpers to their own file, we had extra
helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
9b36f62df6
Add download button to audio and video players ( #12179 )
...
* Add download button for audio player
* Add download button for video player
* fix padding for download button in Audio component
2019-10-25 11:48:20 +02:00
3a929dbedd
Replace fav icon animation with CSS ( #12175 )
...
Fixes #12151
2019-10-24 22:47:48 +02:00
547a5bac9d
don't show outline of full-screen video ( #12176 )
2019-10-24 22:47:37 +02:00
aa884e0484
Fix batch actions being hidden from mobile view ( #12183 )
...
On mobile, batch actions are hidden from the settings/admin interface,
but there are several places those actions can only be performed through
batch actions.
This may not look great, but at least it makes the actions available again.
2019-10-24 22:46:59 +02:00
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
6ebd74f4fa
Fix media editing modal changing dimensions when image loads ( #12131 )
2019-10-10 05:21:38 +02:00
f665901e3c
Fix performance of home feed regeneration ( #12084 )
...
Fetching statuses from all followed accounts at once takes too long
within Postgres. Fetching them one by one and merging in Ruby
could be a lot less resource-intensive
Because the query for dynamically fetching the home timeline is so
heavy, we can no longer offer it when the home timeline is missing
2019-10-06 22:11:17 +02:00
a84aedb7a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
c9b8ba50f8
Fix audio attachments opening in video modal from media tab in web UI ( #12056 )
...
Fix video attachments having a GIF label in media tab in web UI
2019-10-03 03:34:58 +02:00
9184522cb4
Fix issues in RTL layout in web UI ( #12060 )
2019-10-03 03:17:41 +02:00
f51f99c3c2
Fix media editing modal and profile directory in light theme ( #12059 )
...
Also:
- Fix embed modal in light theme
- Fix confirmation modal in light theme
2019-10-03 03:17:29 +02:00
733a3d20b0
Fix bad word breaking on conversations ( #12039 )
...
* Fix bad word breaking
* Fix style
* Fix style
2019-10-02 00:39:56 +02:00
cbaea097be
Add error description and button to copy stack trace to web UI ( #12033 )
2019-10-01 20:48:49 +02:00
c35376132b
Fix long domain block descriptions breaking table layout ( #12029 )
2019-10-01 04:54:29 +02:00
12c4ec0c83
Fix and remove ugly css around the conversation component ( #12022 )
2019-09-30 17:12:33 +02:00
16ff7c5627
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
9027bfff0c
Add explanation to mute dialog, refactor and clean up mute/block UI ( #11992 )
...
* Add some explanation to the mute modal dialog
* Remove `isSubmitting` from mute modal code, this wasn't used
* Refactor block modal
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
* Refactor SCSS a bit
* Put mute modal toggle to the same side as in the report dialog for consistency
* Reword mute explanation
* Fix mute explanation styling
* Left-align all text in mute confirmation modal
2019-09-29 21:46:05 +02:00
d51201a75a
Fix muted text color not applying to all text ( #11996 )
...
Pleroma generates polls without p tag
2019-09-29 16:54:24 +02:00
bd9685f798
Fix public list of domain blocks being too verbose on about page ( #11967 )
2019-09-29 16:23:01 +02:00
b0cda7a504
Fix vote checkmark in poll results ( #11990 )
2019-09-28 19:41:36 +02:00
f31530b74d
Fix overflow on conversations ( #11965 )
...
* Fix: overflow on conversations
* Fix: overflow on conversations
2019-09-27 02:14:49 +02:00
b359974d9b
Show user what options they have voted ( #11195 )
...
* Add own_votes field to poll results in REST API
Fixes #10679
* Display user votes in WebUI
* Update styling
* Add vote checkmark to public pages
2019-09-22 14:15:18 +02:00
26b810561a
Fix ugly TOC when title is too long ( #11916 )
...
* Fix ugly TOC when title is too long
* Fix TOC using grid, minmax
2019-09-22 12:58:29 +02:00
bc5678d015
Change conversations UI ( #11896 )
...
Fix #11414 , fix #9860 , fix #10434
2019-09-21 20:01:16 +02:00
b9a8b38844
Fix page body not being scrollable in admin layout ( #11893 )
...
Hide navigation behind hamburger icon on small screens in admin layout
2019-09-20 10:52:14 +02:00
37ccafec8f
Fix left side of single column layout being cropped on smaller screens ( #11894 )
...
Fix #11476
2019-09-20 10:51:52 +02:00
b6df9c1067
Fix placeholder colors for inputs not being explicitly defined ( #11890 )
...
Fix #11841
2019-09-19 19:58:40 +02:00
d930eb88b6
Add table of contents to about page ( #11885 )
...
Move public domain blocks information to about page
2019-09-19 11:09:05 +02:00
5cadb47238
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
e1066cd431
Add password challenge to 2FA settings, e-mail notifications ( #11878 )
...
Fix #3961
2019-09-18 16:37:27 +02:00
d41494226d
Fix poll options checkboxes/radio buttons not being vertically centered ( #11833 )
2019-09-16 16:12:18 +02:00
cfd4c55c88
Fix profile fields overflowing page width ( #11828 )
...
Fix #11720
2019-09-13 19:15:59 +02:00
74c5b2bd08
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
cf2b708e6b
Fix display of long poll options ( #11717 )
2019-09-13 16:04:09 +02:00
45f44ef4d3
Fix unused CSS ( #11824 )
...
Fix #11689
2019-09-13 16:00:47 +02:00
c7f71b974f
Fix flavour screenshot styling in vanilla flavour
2019-09-10 22:38:07 +02:00
1110ea1a91
Add batch actions and categories to admin UI for custom emojis ( #11793 )
2019-09-09 22:44:17 +02:00
ec2a439a22
Add account bio to account admin view ( #11473 )
...
* Add account bio to account admin view
* Change styling to make bio fields / content more readable
2019-09-09 14:15:52 +02:00
261e52268c
Add batch approve/reject for pending hashtags in admin UI ( #11791 )
2019-09-09 12:50:09 +02:00
5088eb8388
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
7db2c2e2ba
Fix line breaks in hashtag autosuggestions in web UI ( #11764 )
2019-09-05 06:14:06 +02:00
43f56f1291
Change account deletion page to have better explanations ( #11753 )
...
Fix deletion of unconfirmed account not freeing up the username
Add prefill of logged-in user's email in the reconfirmation form
2019-09-04 04:13:54 +02:00
34adc8784a
Fix uncached media in web UI not being clickable ( #11745 )
2019-09-03 04:56:40 +02:00
0ea53122f2
Fix Mastodon logo style on hover on public pages' footer ( #11735 )
...
Fixes #11690
2019-09-02 18:12:12 +02:00
6493f4ffae
Fix height of dashboard counters ( #11736 )
2019-09-02 18:11:34 +02:00
d344289431
Add "not available" label on unknown media attachments ( #11715 )
2019-09-01 19:43:35 +02:00
9044a2b051
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/directories/index.html.haml
Upstream has redesigned the profile directory, and we
had a glitch-soc-specific change to hide follower counts.
Ported that change to the new design.
2019-08-30 13:38:41 +02:00
9871904172
Change layout of public profile directory to be the same as in web UI ( #11705 )
2019-08-30 07:41:16 +02:00
cb447b28c4
Add profile directory to web UI ( #11688 )
...
* Add profile directory to web UI
* Add a line of bio to the directory
2019-08-30 00:14:36 +02:00
Thibaut Girka