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
bc0399d54d
Ensure pack is set when rendering OTP prompt
...
Fixes #1230
2019-10-10 17:08:00 +02:00
a57ac0723f
Update changelog for 3.0.1 ( #12139 )
2019-10-10 07:03:05 +02:00
45eccaf8c5
Fix preloaded JSON-LD context for identity not being used ( #12138 )
...
Regression from #11316
2019-10-10 06:48:53 +02:00
6ebd74f4fa
Fix media editing modal changing dimensions when image loads ( #12131 )
2019-10-10 05:21:38 +02:00
915f3712ae
Fix admin setting to auto-approve hashtags not affecting query ( #12130 )
...
Follow-up to #12122
2019-10-10 02:22:04 +02:00
30a28a2eb7
Fix not showing if emoji has a local counterpart in admin UI ( #12135 )
...
Fix #12132
2019-10-10 02:21:52 +02:00
e6d111f38b
Bump version to 3.0.1 ( #12116 )
2019-10-09 07:36:57 +02:00
b5f7e12817
Remove auto-silence behaviour from spam check ( #12117 )
...
Fix #12113
2019-10-09 07:11:23 +02:00
354fdd317e
Fix attachment not being re-downloaded even if file is not stored ( #12125 )
...
Change the behaviour of remotable concern. Previously, it would skip
downloading an attachment if the stored remote URL is identical to
the new one. Now it would not be skipped if the attachment is not
actually currently stored by Paperclip.
2019-10-09 07:10:46 +02:00
538db85d3c
Remove `lang` attribute from individual statuses ( #12124 )
...
Fix #10930
2019-10-09 03:45:05 +02:00
c8bcf5cbfd
Add admin setting to auto-approve hashtags ( #12122 )
...
Change inaccurate labels on other admin settings
2019-10-09 00:30:15 +02:00
19cdc62765
Remove fallback to long description on sidebar and meta description ( #12119 )
...
Fix #12114
2019-10-08 22:08:55 +02:00
4a98e77d0e
Change `tootctl media refresh` to skip already downloaded attachments ( #12118 )
2019-10-08 05:59:10 +02:00
0aaa3afc2d
Add `tootctl media usage` command ( #12115 )
2019-10-07 20:04:56 +02:00
d2f7b8685c
Merge pull request #1229 from ThibG/glitch-soc/features/upstream-scroll-behavior
...
Merge upstream changes to scroll behavior in single column
2019-10-07 12:02:20 +02:00
ebe574d5b5
Fix old migration trying to use new column due to default status scope ( #12095 )
...
Fix #12087
2019-10-07 06:05:14 +02:00
6c9b4f6b77
Fix tootctl not allocating enough database connections for main thread ( #12097 )
2019-10-07 05:05:02 +02:00
0336621c80
Update AUTHORS.md ( #12096 )
2019-10-07 04:36:32 +02:00
95f21ab87f
Add missing back button header for invalid account ( #12094 )
...
Should fix #6786
2019-10-07 04:33:31 +02:00
38b6c34e32
Fix issues with tootctl's parallelization and progress reporting ( #12093 )
2019-10-07 04:24:05 +02:00
b5be067c88
Fix existing user records with now-renamed `pt` locale ( #12092 )
...
Fix #12082
2019-10-07 04:14:36 +02:00
8386d9ec10
Fix hashtag timeline REST API accepting too many hashtags ( #12091 )
2019-10-07 03:56:21 +02:00
a582185625
Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode ( #12089 )
2019-10-06 22:11:29 +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
efda126914
Fix spelling error in README ( #12086 )
...
fix a spelling error
2019-10-06 21:36:26 +02:00
a7917269d3
add loglevel fatal to video and audio styles ( #12088 )
2019-10-06 19:48:26 +02:00
086fc7ed77
Fix S3 adapter retrying failing uploads with exponential backoff ( #12085 )
...
The default limit of 10 retries with exponential backoff meant
that if the S3 server was timing out, you would be stuck with it
for much, much longer than the 5 second read timeout we expect.
The uploading happens within a database transaction, which means
a failing S3 server could negatively affect database performance
2019-10-06 06:20:57 +02:00
c4fbfaf0b8
Remove unused option from tootctl accounts cull ( #12074 )
2019-10-06 04:30:07 +02:00
0fbe36e3fb
Partially revert scrollbar handling on mobile, since its width-based and wrong
...
Have to investigate as to whether it was actually needed on mobile, doesn't
seem to be the case from Firefox's Responsive Design Mode
2019-10-06 00:32:06 +02:00
fe6864a73a
Apply scroll changes to Bookmark column
2019-10-06 00:32:06 +02:00
bd54ee294a
[Glitch] Add refresh button to list of rebloggers/favouriters in web UI
...
Port b0323d0888
2019-10-06 00:32:06 +02:00
7d79e1f31c
[Glitch] Do not add margin light when opening modal on mobile
...
Port 0a49b26793
2019-10-06 00:32:06 +02:00
4b181eba13
[Glitch] Fix left side of single column layout being cropped on smaller screens
...
Port 37ccafec8f
2019-10-06 00:32:06 +02:00
7fc6213bfe
[Glitch] Fix thread column showing pin button
...
Port 129bc871a0
2019-10-06 00:32:06 +02:00
0d42111671
[Glitch] Fix scroll position resetting when opening media modals in web UI
...
Port 50755a47b4
2019-10-06 00:32:06 +02:00
e7fd43c27c
[Glitch] Fix loading bar being obscured by other elements in web UI
...
Port 2b4e2616ea
2019-10-06 00:32:06 +02:00
90bdbddbfe
[Glitch] Fix scroll to top in single column UI
...
Port 2dee293c4c
2019-10-06 00:32:06 +02:00
fdadd520b1
[Glitch] Fix column header scrolling with the page
...
Port 706a48ee1f
2019-10-05 22:53:20 +02:00
3edb816eb0
[Glitch] Fix tabs bar scrolling along with content on mobile
...
Port 4cc29eb5ad
2019-10-05 22:53:20 +02:00
81b6ffa8f1
[Glitch] Fix scrolling in single-column mode on Chrome
...
Port fb1b710e8d
2019-10-05 22:53:20 +02:00
9e2e623ebe
[Glitch] Change single-column mode to scroll the whole page
...
Port aa22b38fdb
2019-10-05 22:53:20 +02:00
3921125e55
Merge pull request #1228 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-10-05 18:04:36 +02:00
bc8543d9af
Fix audio modal closing immediately
2019-10-04 21:07:45 +02:00
1bbba0016a
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
360234d1bf
[Glitch] Fix audio attachments opening in video modal from media tab in web UI
...
Port c9b8ba50f8
2019-10-04 19:25:25 +02:00
c274774d06
[Glitch] Scroll into search bar when focus
...
Port 66fda37fd0
2019-10-04 19:22:11 +02:00
79388a52aa
[Glitch] Fix issues in RTL layout in web UI
...
Port 9184522cb4
2019-10-04 19:16:41 +02:00
7ca6153c0c
[Glitch] Fix media editing modal and profile directory in light theme
...
Port f51f99c3c2
2019-10-04 19:12:54 +02:00
4592c69b07
Bump capistrano from 3.11.1 to 3.11.2 ( #12012 )
...
* Bump capistrano from 3.11.1 to 3.11.2
Bumps [capistrano](https://github.com/capistrano/capistrano ) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/capistrano/capistrano/releases )
- [Commits](https://github.com/capistrano/capistrano/compare/v3.11.1...v3.11.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Bump capistrano from 3.11.1 to 3.11.2
2019-10-04 11:11:36 +09:00
Thibaut Girka