196ad08e2d
Bump bullet from 6.0.1 to 6.0.2 ( #11666 )
...
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.1...6.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 23:05:19 +09:00
244a0e61c0
Bump devise from 4.6.2 to 4.7.0 ( #11667 )
...
Bumps [devise](https://github.com/plataformatec/devise ) from 4.6.2 to 4.7.0.
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.2...v4.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 23:04:52 +09:00
2a1e43dffc
Bump rubocop-rails from 2.3.0 to 2.3.1 ( #11665 )
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 22:46:09 +09:00
e705d20ee5
Bump webpack-cli from 3.3.6 to 3.3.7 ( #11663 )
...
Bumps [webpack-cli](https://github.com/webpack/webpack-cli ) from 3.3.6 to 3.3.7.
- [Release notes](https://github.com/webpack/webpack-cli/releases )
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.7/CHANGELOG.md )
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.6...v3.3.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 22:40:38 +09:00
006d3d5828
Bump @babel/plugin-proposal-class-properties from 7.5.0 to 7.5.5 ( #11661 )
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel ) from 7.5.0 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 22:39:42 +09:00
6a2ae52fdf
Bump react-redux from 7.1.0 to 7.1.1 ( #11664 )
...
Bumps [react-redux](https://github.com/reduxjs/react-redux ) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases )
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.0...v7.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26 18:54:51 +09:00
9676ae2219
Add translation target for hashtag ( #11657 )
...
* Add translation target for hashtag.
* run `yarn manage:translations en`
2019-08-25 16:22:20 +02:00
2673b89971
Fix crash when switching back/from mobile layout ( #11655 )
...
Fixes #11630
2019-08-25 15:49:02 +02:00
15a82d48ea
Change window resize handler to switch to/from mobile layout as soon as needed ( #11656 )
2019-08-25 15:48:50 +02:00
eaa759ffd4
Fix more visual issues with the audio player ( #11654 )
...
* Fix more visual issues with the audio player
- Add horizontal baseline in the middle of waveform
- Fix audio player colors in light theme
- Use audio element instead of web audio API
- Do not render any bars until the file is loaded
- Do not allow interactions with waveform until the file is loaded
* Fix code style issue
2019-08-25 15:09:19 +02:00
c8df53b75f
Fix public page crash due to audio player, fix unpause in audio player ( #11652 )
2019-08-25 02:13:40 +02:00
9c65b122fc
Fix slow local timeline query ( #11648 )
...
Fix #11643
2019-08-24 04:12:27 +02:00
f13761d84b
Add audio player ( #11644 )
2019-08-23 22:38:02 +02:00
9959cdc79f
Add option to include reported statuses in warning e-mail ( #11639 )
2019-08-23 22:37:23 +02:00
0b19014089
Fix items in StatusContent render list not all having a key ( #11645 )
2019-08-23 21:02:59 +02:00
cf56532ced
Add header to trends section and change refresh rate to 15 minutes ( #11641 )
2019-08-23 05:05:21 +02:00
32c781ec6b
Add soft delete for statuses for instant deletes through API ( #11623 )
...
* Add soft delete for statuses to allow them to appear instant
* Allow reporting soft-deleted statuses and show them in the admin UI
* Change index for getting an account's statuses
2019-08-22 21:55:56 +02:00
d94a4763f6
Restore hashtag suggestions from local tag history ( #11632 )
...
* Restore hashtag suggestions from local tag history
* Append local hashtag suggestions instead of prepending them
* Do not display inaccurate usage statistics for hashtags not retrieved from API
* Fixup
2019-08-22 04:37:18 +02:00
e4605bbb4a
Fix remote and staff-removed statuses leaving media behind for a day ( #11638 )
...
The reason for unattaching media instead of removing it is to support
delete & redraft functionality, but remote or staff-removed statuses
will never be redrafted, so the media should be deleted immediately
2019-08-22 04:17:12 +02:00
2a49f9f5f5
Fix the whitelist mode display not being enabled in the admin dashboard ( #11634 )
2019-08-21 12:35:40 +02:00
db5c84ce4b
Fix trending hashtags being fetched every 36 seconds instead of every hour ( #11631 )
2019-08-21 00:18:07 +02:00
e9106c361f
Fix typo
2019-08-20 21:44:09 +02:00
64aa99b3a2
Add support for <sup> formatting element
...
This is based of 81c9377c7dhttps://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-20 21:44:09 +02:00
efc72fc80d
Merge pull request #1200 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-20 21:33:57 +02:00
c36ee7b85f
[Glitch] Fix handling of audio files in account media gallery
...
Port 73b23ef7be
2019-08-20 20:38:42 +02:00
0f22699c02
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-20 20:30:44 +02:00
73b23ef7be
Fix handling of audio files in account media gallery ( #11629 )
...
Fixes #11627
2019-08-20 19:46:41 +02:00
a8ffa84a40
Merge pull request #1199 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-20 12:09:11 +02:00
c2ecfa969b
Add button to edit media description from missing description confirmation dialog
2019-08-20 11:33:35 +02:00
cec23a0de6
Remove code for giving focus to first media without description
...
Since the textarea is in a modal, now…
2019-08-20 10:55:03 +02:00
f065048070
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/initializers/content_security_policy.rb
(took our version)
2019-08-20 10:33:24 +02:00
101b2695c6
Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 ( #11609 )" ( #11625 )
...
This reverts commit 5c310a43ef
2019-08-20 02:19:01 +02:00
e81a8dcd85
Fix composer options colors in glitch-soc light theme
2019-08-19 22:18:43 +02:00
f82b1bb158
Fix connect-src policy for Tesseract
2019-08-19 22:02:35 +02:00
031fe56133
Use public pack in about controller to handle blockpage JS
2019-08-19 21:56:25 +02:00
2d84897916
Move character counter to the options box to match upstream styling
2019-08-19 21:56:25 +02:00
558aa2bcfd
[Glitch] Fix hidden statuses losing focus
...
Port d8153b99b3
2019-08-19 21:56:25 +02:00
ec9ae03ad7
[Glitch] Improve focal point modal on mobile
...
Port dc83169865
2019-08-19 21:56:25 +02:00
e27d8efacf
[Glitch] Allow clicking behind preview
...
Port a886bf3808
2019-08-19 21:56:25 +02:00
6f3f392e8a
[Glitch] Fix edit media modal on small screens, touch events
...
Port 375f2f3864
2019-08-19 21:56:25 +02:00
66af3222be
[Glitch] Fix tesseract.js being part of the common chunk
...
Port fe52fca65c
2019-08-19 21:56:25 +02:00
b3f63b601a
[Glitch] Add OCR tool to media editing modal
...
Port 41b188dce6
2019-08-19 21:56:25 +02:00
f20d417448
Refactor character counter to match upstream
2019-08-19 21:56:25 +02:00
4982885bfa
[Glitch] Add media editing modal
...
Port da208e7d9b
2019-08-19 21:56:25 +02:00
199d7ce136
[Glitch] Add explanation to featured hashtags page and profile
...
Port SCSS changes from 8e76c759c1
2019-08-19 21:56:25 +02:00
98df5f8fc2
[Glitch] Add public blocks to /about/blocks
...
Port SCSS changes from 867b9f3e9c
2019-08-19 21:56:25 +02:00
150d3f7104
[Glitch] Fix client-side resizing of image uploads
...
Port 0fd7f8315f
2019-08-19 21:49:39 +02:00
1d666bf95b
[Glitch] Fix short number formatting for numbers above million in web UI
...
Port 954840740e
2019-08-19 21:49:39 +02:00
c060523dc2
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
5a122f1450
Fix CSP needlessly allowing blob URLs in script-src ( #11620 )
2019-08-19 20:36:58 +02:00
dependabot-preview[bot]