ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,306 Commits
10 Branches
15 Tags
251 MiB
Commit Graph

10306 Commits (0014a32c19bb6d3ab83aad65506f6b1cf66f93a9)

Author SHA1 Message Date
Thibaut Girka 956c1cf82a Refactor the Columns Area code to be closer to upstream 2019-08-29 12:02:20 +02:00
Thibaut Girka 3282bbe454 Add option to rewrite mentions to mentioned user's username or acct 
Fixes #666
 2019-08-29 11:59:29 +02:00
dependabot-preview[bot] 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
ThibG 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
dependabot-preview[bot] 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
ThibG 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
dependabot-preview[bot] 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
dependabot-preview[bot] 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
dependabot-preview[bot] 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
dependabot-preview[bot] 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
dependabot-preview[bot] 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
dependabot-preview[bot] 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
mayaeh 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
ThibG 91582937f3 Fix crash when switching back/from mobile layout (#11655) 
Fixes #11630
 2019-08-25 15:49:02 +02:00
ThibG bd4099d976 Change window resize handler to switch to/from mobile layout as soon as needed (#11656) 2019-08-25 15:48:50 +02:00
Eugen Rochko 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
Eugen Rochko e72bac7576
Fix public page crash due to audio player, fix unpause in audio player (#11652) 2019-08-25 02:13:40 +02:00
Eugen Rochko aa6b5b42df
Fix slow local timeline query (#11648) 
Fix #11643
 2019-08-24 04:12:27 +02:00
Eugen Rochko 4190e31626
Add audio player (#11644) 2019-08-23 22:38:02 +02:00
Eugen Rochko 73ca0bb925
Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
ThibG 37f612074e Fix items in StatusContent render list not all having a key (#11645) 2019-08-23 21:02:59 +02:00
Eugen Rochko 4ef8d8b77c
Add header to trends section and change refresh rate to 15 minutes (#11641) 2019-08-23 05:05:21 +02:00
Eugen Rochko 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
ThibG 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
Eugen Rochko 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
mayaeh e9c3d1ef46 Fix the whitelist mode display not being enabled in the admin dashboard (#11634) 2019-08-21 12:35:40 +02:00
ThibG d857d0d14d Fix trending hashtags being fetched every 36 seconds instead of every hour (#11631) 2019-08-21 00:18:07 +02:00
ThibG 284a1562fb Fix typo 2019-08-20 21:44:09 +02:00
Haelwenn (lanodan) Monnier 317fa43d9a Add support for <sup> formatting element 
This is based of 3e095cab83

Related: https://git.pleroma.social/pleroma/pleroma/issues/1191
 2019-08-20 21:44:09 +02:00
ThibG da7e0d4f55
Merge pull request #1200 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-20 21:33:57 +02:00
ThibG f1528ea3c4 [Glitch] Fix handling of audio files in account media gallery 
Port b48c7ee059 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-20 20:38:42 +02:00
Thibaut Girka 81d2d71094 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-20 20:30:44 +02:00
ThibG b48c7ee059 Fix handling of audio files in account media gallery (#11629) 
Fixes #11627
 2019-08-20 19:46:41 +02:00
ThibG bce46f2057
Merge pull request #1199 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-20 12:09:11 +02:00
Thibaut Girka fae9e34484 Add button to edit media description from missing description confirmation dialog 2019-08-20 11:33:35 +02:00
Thibaut Girka dff4ccd7e9 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
Thibaut Girka df150da435 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
ThibG 97af209c31 Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609)" (#11625) 
This reverts commit 2e44b81166.
 2019-08-20 02:19:01 +02:00
Thibaut Girka 1d40325e7c Fix composer options colors in glitch-soc light theme 2019-08-19 22:18:43 +02:00
Thibaut Girka 9e17f9e95a Fix connect-src policy for Tesseract 2019-08-19 22:02:35 +02:00
Thibaut Girka f00a0f35ee Use public pack in about controller to handle blockpage JS 2019-08-19 21:56:25 +02:00
Thibaut Girka a334cbcb20 Move character counter to the options box to match upstream styling 2019-08-19 21:56:25 +02:00
Thibaut Girka ed4317b549 [Glitch] Fix hidden statuses losing focus 
Port 0d13a9cd13 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG ab0961fe9a [Glitch] Improve focal point modal on mobile 
Port 2ca6b2bb6c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
ThibG fcd2244015 [Glitch] Allow clicking behind preview 
Port d37126fd03 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko 91d968bf72 [Glitch] Fix edit media modal on small screens, touch events 
Port 1bea318197 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko 5c35c9c409 [Glitch] Fix tesseract.js being part of the common chunk 
Port dfe6059889 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Eugen Rochko 41c7fec796 [Glitch] Add OCR tool to media editing modal 
Port 28636f43e4  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00
Thibaut Girka 066034c62e Refactor character counter to match upstream 2019-08-19 21:56:25 +02:00
Eugen Rochko ab019800f8 [Glitch] Add media editing modal 
Port 23f7afa562 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-19 21:56:25 +02:00