6cfb357940
Make hashtag search results link to the hashtag URL ( #9810 )
...
Currently, middle-clicking on a hashtag search result will open a new
instance of the WebUI, which is inconsistent with middle-clicking on
an account result, or a hashtag in a toot.
2019-01-14 23:29:21 +01:00
c5b8824a3e
Fix hashtag timeline on mobile ( #9806 )
...
Instead of forcing 90vh for the scrollable part of the timeline's height as
in #9781 (which may be off), use `display: flex`, exactly like on desktop.
2019-01-14 17:30:31 +01:00
2648645d05
Display a double reply arrow on public pages for toots that are replies ( #9808 )
2019-01-14 17:29:04 +01:00
5c5e14c816
Fix undefined method error in sidekiq ( #9807 )
...
* Fix undefined method error in sidekiq
Body can be not nil but still be empty, which causes a
`NoMethodError: undefined method `[]' for nil:NilClass` further in the
code. This checks for an empty body to avoid the issue.
* Fix codeclimate issue
2019-01-14 17:28:41 +01:00
b4e6384aea
Bump aws-sdk-s3 from 1.30.0 to 1.30.1 ( #9799 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.30.0 to 1.30.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-15 00:34:43 +09:00
a04b2bc728
Bump pg from 1.1.3 to 1.1.4 ( #9798 )
...
Bumps [pg](https://bitbucket.org/ged/ruby-pg ) from 1.1.3 to 1.1.4.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/default/History.rdoc )
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.1.4..v1.1.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-15 00:34:27 +09:00
077639c274
Merge pull request #886 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-14 11:48:36 +01:00
5ac425ad28
Bump sidekiq-unique-jobs from 5.0.10 to 6.0.8 ( #9801 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 5.0.10 to 6.0.8.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v5.0.10...v6.0.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-14 09:18:55 +00:00
12307c5648
Bump nokogiri from 1.10.0 to 1.10.1 ( #9802 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.0...v1.10.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-14 09:16:43 +00:00
f074d2f690
Bump nsa from 0.2.4 to 0.2.7 ( #9800 )
...
Bumps [nsa](https://github.com/localshred/nsa ) from 0.2.4 to 0.2.7.
- [Release notes](https://github.com/localshred/nsa/releases )
- [Commits](https://github.com/localshred/nsa/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-14 09:15:55 +00:00
944de8a6c9
Bump dotenv-rails from 2.5.0 to 2.6.0 ( #9803 )
...
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-14 09:13:34 +00:00
d6433b3931
make draggingOver state off correctly ( #9797 )
...
* make draggingOver stat off correctly
* ignore safari and Edge
* Revert "ignore safari and Edge"
This reverts commit b9b93ea3674877670161207a3f9b3a4f82b68a2d.
* Revert "make draggingOver stat off correctly"
This reverts commit f5fd6b94dc1d4b812e0b910b2b4f35792c3ea3a1.
* clear drag stack when drop
2019-01-14 07:44:26 +00:00
4cec7a77c3
[Glitch] Adjust admin UI right panel size
...
Port 9ee9cb549b
2019-01-13 20:41:38 +01:00
2c5f0f12ac
[Glitch] change height on narrow view to take 100% of screen
...
Port 1183246043
2019-01-13 20:40:46 +01:00
278ff1318f
[Glitch] Add attachment list fallback to public pages
...
Port JS changes from 4fb94c758e
2019-01-13 14:42:50 +01:00
eff1c94744
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-13 14:41:06 +01:00
4fb94c758e
Add attachment list fallback to public pages ( #9780 )
...
* Add attachment list fallback to public pages
Fixes #6714
* Refactor attachments lists
2019-01-13 09:23:54 +00:00
9ee9cb549b
Adjust admin UI right panel size ( #9768 )
...
* Adjust admin UI right panel size
* Fix typo
2019-01-11 10:15:44 +00:00
2cfa55185a
Merge pull request #885 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-11 10:53:58 +01:00
1183246043
change height on narrow view to take 100% of screen ( #9781 )
...
* change height on narrow view to take 100% of screen
* add empty line before @media
2019-01-11 07:30:19 +00:00
c3a657223f
Hide CWed content in notifications and fix sensitive images without CWs ( #9778 )
...
Fixes #9634
2019-01-11 07:29:17 +00:00
c059999ab3
Add a spec for Admin::ActionLog ( #9775 )
2019-01-11 07:28:09 +00:00
43ff92dfc8
Bump sidekiq from 5.2.3 to 5.2.5 ( #9765 )
...
Bumps [sidekiq](https://github.com/mperham/sidekiq ) from 5.2.3 to 5.2.5.
- [Release notes](https://github.com/mperham/sidekiq/releases )
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md )
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.3...v5.2.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-11 07:27:04 +00:00
b7ace49a73
Bump webpush from 0.3.5 to 0.3.6 ( #9783 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.5 to 0.3.6.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.5...v0.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-11 07:26:25 +00:00
09c3c96607
Add specs for Admin::AccountAction ( #9767 )
2019-01-11 07:26:03 +00:00
394525e329
[Glitch] Postpone scroll-to-detailed status after react components are loaded
...
Port 70801b850c
2019-01-10 21:00:33 +01:00
7cc800d0df
[Glitch] Redesign admin instances area
...
Port SCSS changes from 1c6588accc
2019-01-10 21:00:33 +01:00
e03813cf0a
[Glitch] Stop gifv timeline preview explicitly when open the media gallery
...
Port cf3c0fc38c
2019-01-10 21:00:33 +01:00
147f4f9fd2
[Glitch] refactored account.js
...
Port 57c91fbbed
2019-01-10 21:00:33 +01:00
ec441e0299
[Glitch] Fix embed play icons regression
...
Port bd5a8c7765
2019-01-10 21:00:33 +01:00
2b2584a37b
[Glitch] Display fallback link card thumbnail when none is given
...
Port 1512af2811
2019-01-10 21:00:33 +01:00
a2a64ecd3e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .eslintrc.yml
Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
Minor code cleanup when porting one of our features.
- app/models/account.rb
Note length validation has changed upstream.
We now use upstream's validation (dropped legacy glitch-soc
account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
Upstream has added support for scheduled toots, refactoring
the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
fb0c906c71
Revert "Revert "Add handler for Move activity ( #9629 )""
...
This reverts commit bb96a74637
2019-01-10 18:46:17 +01:00
d1da0a1086
Port a few public.js changes from upstream, move some code around
...
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
2019-01-10 18:45:17 +01:00
70801b850c
Postpone scroll-to-detailed status after react components are loaded ( #9773 )
2019-01-10 15:13:30 +01:00
5104b61b6b
Downgrade react-redux-loading-bar to 4.0.8 to fix media modal ( #9771 )
2019-01-10 15:13:00 +01:00
61ecda1575
Not to skip executable specs ( #9753 )
...
* Not to skip executable specs
* Combine specs
Combine specs to one to reduce multiple slow http post.
2019-01-10 15:12:31 +01:00
e8ae77236b
[Glitch] Only consider mouse move in scrolling on item insertion
...
Port cc1f13dfd0
2019-01-10 12:09:12 +01:00
825decbf9e
[Glitch] Identify manual scrolling to cancel scroll to top reset on mouse idle
...
Port 2f86fc5e0a
2019-01-10 12:09:12 +01:00
19c64a49f7
[Glitch] Cancel list scroll reset after mouse move on wheel scroll
...
Port 9cfd610484
2019-01-10 12:09:12 +01:00
21f27e6579
[Glitch] Temporarily hold timeline if mouse moved recently
...
Port 6a1216d2cd
2019-01-10 12:09:12 +01:00
af74491bc8
i18n: Update Polish translation ( #9674 )
...
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n-tasks normalize
* Update config/locales/pl.yml
Co-Authored-By: m4sk1n <me@m4sk.in>
2019-01-09 09:52:01 +09:00
3a0b12cbfe
Fix how flavour screenshots are displayed in the vanilla flavour
2019-01-08 20:20:35 +01:00
20fd855830
Update glitch-soc admin page style from upstream
...
Port SCSS changes from e55dce3176
2019-01-08 20:20:35 +01:00
bc3a6dd597
Update AUTHORS ( #9764 )
2019-01-08 18:17:56 +01:00
6686d2b7a7
Update changelog for 2.7.0rc1 ( #9763 )
2019-01-08 18:12:10 +01:00
a269ffdfa5
Change "federation" admin UI link to point to "limited" domains ( #9762 )
2019-01-08 17:41:27 +01:00
a6c27eaa5e
Remove obsolete web UI translations ( #9761 )
2019-01-08 17:31:58 +01:00
266d4cb92b
Changed not to display DISCOVER subheader via single column layout. ( #9759 )
2019-01-08 14:32:36 +01:00
15aed1ee6c
Bump version to 2.7.0rc1 ( #9718 )
2019-01-08 14:10:54 +01:00
ThibG