14996496a5
Fix error in warning e-mail template ( #11698 )
2019-08-30 01:34:59 +02:00
22ce4778eb
Fix uncaught parameter missing exceptions and missing error templates ( #11702 )
2019-08-30 01:34:47 +02:00
8ee4a2892c
Fix non-GET requests to / not being matched ( #11704 )
2019-08-30 01:34:33 +02:00
18e37bee16
Fix JSON-LD deprecation warning in log output ( #11699 )
2019-08-30 01:34:21 +02:00
2848c08953
Merge pull request #1208 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-30 00:18:08 +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
969d043851
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 20:53:51 +02:00
7802ebd5f3
Revert bcrypt to 3.1.12, again ( #11693 )
...
Same reasons as in #11555
2019-08-29 20:51:30 +02:00
f3ac4a4411
Fix clicking on the new audioplayer opening the toot in detailed view
2019-08-29 17:32:22 +02:00
6ee2501991
[Glitch] Change window resize handler to switch to/from mobile layout as soon as needed
...
Port bd4099d976
2019-08-29 17:32:22 +02:00
b90bd31cfd
[Glitch] Fix more visual issues with the audio player
...
Port 2e99e3cab3
2019-08-29 17:32:22 +02:00
84d4d75c91
[Glitch] Fix public page crash due to audio player, fix unpause in audio player
...
Port e72bac7576
2019-08-29 17:32:22 +02:00
3aeaf9b897
[Glitch] Add audio player
...
Port 4190e31626
2019-08-29 17:32:22 +02:00
04de74c992
[Glitch] Add special alert for throttled requests
...
Port 81f864d4da
2019-08-29 17:32:22 +02:00
f11e9d5524
[Glitch] Add confirmation modal when logging out from the web app
...
Port fd3d45d38f
2019-08-29 17:32:22 +02:00
7c22e32562
Remove sign out link from getting started columns, as it is already in the footer
2019-08-29 14:56:40 +02:00
48b8a1f414
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb
All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
79725f659d
Fix crashes from favico.js crashing the entire web app
2019-08-29 12:03:05 +02:00
956c1cf82a
Refactor the Columns Area code to be closer to upstream
2019-08-29 12:02:20 +02:00
3282bbe454
Add option to rewrite mentions to mentioned user's username or acct
...
Fixes #666
2019-08-29 11:59:29 +02:00
4500dc2385
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 ( #11683 )
...
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep ) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases )
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-28 10:56:20 +09:00
81f864d4da
Add special alert for throttled requests ( #11677 )
...
* Add special alert for throttled requests
* Use an extra attribute instead of an array
2019-08-27 16:50:39 +02:00
a033679eed
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 ( #11675 )
...
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils ) from 1.3.1 to 1.4.2. **This update includes a security fix.**
- [Release notes](https://github.com/mysticatea/eslint-utils/releases )
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-27 04:17:44 +09:00
fd3d45d38f
Add confirmation modal when logging out from the web app ( #11671 )
...
* [WiP] Add a confirmation modal before logging out from the web interface
* Add confirmation to logout link in getting started footer
* Please CodeClimate
2019-08-26 18:24:10 +02:00
2b853158dc
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
eb66af538a
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
ac2b485e46
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
49810ba1dc
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
8a39bde967
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
4b6978d556
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
89b574aa6c
Add translation target for hashtag ( #11657 )
...
* Add translation target for hashtag.
* run `yarn manage:translations en`
2019-08-25 16:22:20 +02:00
91582937f3
Fix crash when switching back/from mobile layout ( #11655 )
...
Fixes #11630
2019-08-25 15:49:02 +02:00
bd4099d976
Change window resize handler to switch to/from mobile layout as soon as needed ( #11656 )
2019-08-25 15:48:50 +02:00
2e99e3cab3
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
e72bac7576
Fix public page crash due to audio player, fix unpause in audio player ( #11652 )
2019-08-25 02:13:40 +02:00
aa6b5b42df
Fix slow local timeline query ( #11648 )
...
Fix #11643
2019-08-24 04:12:27 +02:00
4190e31626
Add audio player ( #11644 )
2019-08-23 22:38:02 +02:00
73ca0bb925
Add option to include reported statuses in warning e-mail ( #11639 )
2019-08-23 22:37:23 +02:00
37f612074e
Fix items in StatusContent render list not all having a key ( #11645 )
2019-08-23 21:02:59 +02:00
4ef8d8b77c
Add header to trends section and change refresh rate to 15 minutes ( #11641 )
2019-08-23 05:05:21 +02:00
282ea17078
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
5ab1e0e738
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
97192d9a77
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
e9c3d1ef46
Fix the whitelist mode display not being enabled in the admin dashboard ( #11634 )
2019-08-21 12:35:40 +02:00
d857d0d14d
Fix trending hashtags being fetched every 36 seconds instead of every hour ( #11631 )
2019-08-21 00:18:07 +02:00
284a1562fb
Fix typo
2019-08-20 21:44:09 +02:00
317fa43d9a
Add support for <sup> formatting element
...
This is based of 3e095cab83https://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-20 21:44:09 +02:00
da7e0d4f55
Merge pull request #1200 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-08-20 21:33:57 +02:00
f1528ea3c4
[Glitch] Fix handling of audio files in account media gallery
...
Port b48c7ee059
2019-08-20 20:38:42 +02:00
81d2d71094
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-20 20:30:44 +02:00
Eugen Rochko