djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,586 Commits 69 Branches 20 Tags 353 MiB
Commit Graph

10586 Commits

Author SHA1 Message Date
ThibG 759448c24c [Glitch] Change detailed status child ordering to sort self-replies on top 
Port 6914482d0a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-30 13:45:46 +02:00
Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
 2019-08-30 13:38:41 +02:00
ichi_i 49f57b5534 Add TLS v1.3 support (#11603) 
Maintain TLS v1.2 compatibility (might want to drop this later) and add support for TLS v1.3
 2019-08-30 07:42:50 +02:00
abcang f6e7f94146 node v12 support (#11706) 2019-08-30 07:41:38 +02:00
Eugen Rochko 9871904172
Change layout of public profile directory to be the same as in web UI (#11705) 2019-08-30 07:41:16 +02:00
umonaca 7235f538c6 Add more media formats (#11687) 
* Add more media formats

* Removed amr file type
 2019-08-30 04:30:29 +02:00
Eugen Rochko 5f591d979c
Fix non-numbers being passed to Redis and causing an error (#11697) 2019-08-30 02:49:54 +02:00
Eugen Rochko 70ae77895f
Fix error in REST API for an account's statuses (#11700) 2019-08-30 02:49:44 +02:00
Eugen Rochko 60e684af5f
Fix uncaught error when resource param is missing in Webfinger request (#11701) 2019-08-30 02:49:33 +02:00
Eugen Rochko b54b725d6b
Fix uncaught domain normalization error in remote follow (#11703) 2019-08-30 02:19:17 +02:00
ThibG 6914482d0a Change detailed status child ordering to sort self-replies on top (#11686) 
Fixes #11679
 2019-08-30 01:57:38 +02:00
Eugen Rochko bfca58d137
Fix encoding error when checking e-mail MX records (#11696) 2019-08-30 01:35:12 +02:00
Eugen Rochko 14996496a5
Fix error in warning e-mail template (#11698) 2019-08-30 01:34:59 +02:00
Eugen Rochko 22ce4778eb
Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
Eugen Rochko 8ee4a2892c
Fix non-GET requests to / not being matched (#11704) 2019-08-30 01:34:33 +02:00
Eugen Rochko 18e37bee16
Fix JSON-LD deprecation warning in log output (#11699) 2019-08-30 01:34:21 +02:00
ThibG 2848c08953
Merge pull request #1208 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-08-30 00:18:08 +02:00
Eugen Rochko 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
Thibaut Girka 969d043851 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 20:53:51 +02:00
ThibG 7802ebd5f3 Revert bcrypt to 3.1.12, again (#11693) 
Same reasons as in #11555
 2019-08-29 20:51:30 +02:00
Thibaut Girka f3ac4a4411 Fix clicking on the new audioplayer opening the toot in detailed view 2019-08-29 17:32:22 +02:00
ThibG 6ee2501991 [Glitch] Change window resize handler to switch to/from mobile layout as soon as needed 
Port bd4099d976 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Eugen Rochko b90bd31cfd [Glitch] Fix more visual issues with the audio player 
Port 2e99e3cab3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Eugen Rochko 84d4d75c91 [Glitch] Fix public page crash due to audio player, fix unpause in audio player 
Port e72bac7576 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Eugen Rochko 3aeaf9b897 [Glitch] Add audio player 
Port 4190e31626 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
ThibG 04de74c992 [Glitch] Add special alert for throttled requests 
Port 81f864d4da to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
ThibG f11e9d5524 [Glitch] Add confirmation modal when logging out from the web app 
Port fd3d45d38f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-08-29 17:32:22 +02:00
Thibaut Girka 7c22e32562 Remove sign out link from getting started columns, as it is already in the footer 2019-08-29 14:56:40 +02:00
Thibaut Girka 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
Thibaut Girka 79725f659d Fix crashes from favico.js crashing the entire web app 2019-08-29 12:03:05 +02:00
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