Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cargo load factor #1617

Merged
merged 3 commits into from
Sep 27, 2023
Merged

Add cargo load factor #1617

merged 3 commits into from
Sep 27, 2023

Conversation

arthurpar06
Copy link
Contributor

If enabled, this will allow a different load factor for cargo than for passengers by default. If a flight contains a custom load factor, then this custom load factor will take precedence over the default passenger/cargo load factor, and we will have a loading percentage in the same range for both passengers and cargo. If the flight does not contain a custom load factor, then we revert to the default settings, with (if enabled) a different range for the passenger load factor and the cargo load factor.

@nabeelio
Copy link
Owner

nabeelio commented Sep 27, 2023

Is there a setting now for the pax load factor? I can't remember, I'm looking at this on mobile

@arthurpar06
Copy link
Contributor Author

arthurpar06 commented Sep 27, 2023

For now we have a global load factor (pax + cargo), which (if enabled) will become the pax one and we'll have another one for cargo. If not enabled the global remains global

@nabeelio nabeelio merged commit da80417 into nabeelio:dev Sep 27, 2023
6 checks passed
@arthurpar06 arthurpar06 deleted the cgoLoadFactor branch October 8, 2023 09:10
nabeelio added a commit that referenced this pull request Jul 16, 2024
* Bump word-wrap from 1.2.3 to 1.2.4 (#1565)

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Bump semver from 5.7.1 to 5.7.2 (#1564)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add IAS column for ACARS updates (#1604)

* Improved UX of Search Labels being associated to the correct inputs. (#1609)

* Update Flight Resource (#1608)

* Update Flight Resource

* Add atc as model attribute

* Update callsign displays

Callsign was already there in the blade, used model driven callsign display and added simbrief callsign settings to match flight resource results.

* Update resource

To use same settings as blades

* Update Flight.php

* Add atc attribute to user model

Same as flight model, if a user has an alphanumeric callsign, VA's should be able to use it easily too when needed.

If no callsign is defined, ident is used.

(padding with zero's are not used in atc attribute 'cause this can be just FDX1 or DLH72 without a leading zero as atc callsign)

* Update auth.php (#1611)

* Add cargo load factor (#1617)

* Add cargo load factor

* Style CI

* Settings changes

* Elevation and Region (#1618)

* Elevation and Region

Add elevation and region data to model, which is already being returned during lookup.

Provide export/import for these new fields

Implement sortable columns to admin airports table.

* Improve import test (airport)

* Update airports > show.blade.php

Added elevation to the title

* Cleanup artisan createconfigs

* Fix import of users and airports from legacy (#1621)

* Fix import of users and airports from legacy

* Style fixes

* Dead code

* More dead code removal

* Fuel cost import bug

* Importer fixes for dirty fields (#1623)

* Importer fixes for dirty fields

* Code cleanup

* Bump composer/composer from 2.3.10 to 2.6.4 (#1619)

Bumps [composer/composer](https://github.com/composer/composer) from 2.3.10 to 2.6.4.
- [Release notes](https://github.com/composer/composer/releases)
- [Changelog](https://github.com/composer/composer/blob/main/CHANGELOG.md)
- [Commits](composer/composer@2.3.10...2.6.4)

---
updated-dependencies:
- dependency-name: composer/composer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Bump postcss and tailwindcss (#1622)

Bumps [postcss](https://github.com/postcss/postcss) to 8.4.31 and updates ancestor dependency [tailwindcss](https://github.com/tailwindlabs/tailwindcss). These dependencies need to be updated together.


Updates `postcss` from 8.4.16 to 8.4.31
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.16...8.4.31)

Updates `tailwindcss` from 0.5.3 to 3.3.3
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](tailwindlabs/tailwindcss@v0.5.3...v3.3.3)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
- dependency-name: tailwindcss
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update the public tld list

* Fix for roles importing (#1624)

* Fix for roles importing

* Style fixes

* Rename ImporterService to LegacyImporterService

* Check for unique among non-deleted items for subfleets (#1626)

* Check for unique among non-deleted items for subfleets

* Style fixes

* Migration fix for missing soft deletes (#1627)

* Migration fix for missing soft deletes

* Style fixes

* Fix Email Verification (#1629)

* fix registration flow

* Add buttons to request new email verification / to verify email in admin

* Request new email verification when email changes

* Apply fixes from StyleCI

* Fix tests

* Use build-in laravel method for email verification

* Send a verification email to user when admin requests new verification

* Fix tests and dispatch Verified event on manual email verification

* Override verification logic

* Apply fixes from StyleCI

* Force user to active state

* Remove forced state change

* Remove unused service in VerificationController

* Apply fixes from StyleCI

* fix getNextAvailablePilotId (#1630)

* fixModuleMigration (#1631)

* Add the additional airport import fields (#1632)

* Set imported users emails to verified

* StyleCI fixe

* Composer dependency updates (#1633)

* Fix Ranks Seeder (#1636)

* Fix Ranks Seeder

* Create default rank with rank table

* Apply fixes from StyleCI

* Fix tests with new ranks id

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

* Add more infos about sail in README (#1637)

* Add more infos about sail in README.md

* Update Makefile

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* ReCycle Bin feature (#1615)

* ReCycle Bin feature

Provide ReCycle Bin (aka Trash) display with the ability to restore or permanently delete records.

* Requested changes

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add api info page (#1635)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Bump @babel/traverse from 7.18.13 to 7.23.2 (#1634)

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.18.13 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update Aviation WX Services (#1640)

* Add ignore rows option if exists for seeder (#1642)

* Add the ability to add several subfleets at once to a rank (#1644)

* Add the ability to add several subfleets at once to a rank

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

* Update fields.blade.php (#1646)

* Legacy Pirep Importer > Add missing fields (#1653)

* Add missing fields

* Force test runs

* Last re-run attempt then I am off :)

* Set ARRIVED status for imported pireps

* Handle Diversion (#1638)

* Add auto handle diversion system

* Add discord notification for diversion

* Apply fixes from StyleCI

* Make query more readable in FlightService

* Apply fixes from StyleCI

* Add PirepDiverted Event

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

* Update Model attribute (#1659)

Always return full url with the attribute even if admins/staff use short paths like `image/rank1.jpg` while defining rank images.

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update TLD list via cron (#1643)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Fix Flight Importer/Exporter and Aircraft Importer (#1649)

* Row fixes

* Fix FIN field

* Fix test files

* fix files again for typo

* Again !

* Fix distance calculation

* Attempt to fix FirstOrNew

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Controller and Blade update (#1656)

Allow selection of multiple subfleets to add while editing flights manually.

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update FlightController.php (#1663)

Adjust controller to show open (non-restricted by rank/type rating) flights too when restrictions are in place.

This will allow VA's to have both open to all and limited/restricted flights. And those flights should be able to be selected, operated by pilots.

* Update UserImport.php (#1672)

Allow importing transfer hours from legacy to v7

* Fix Controllers (#1673)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update FlightImporter.php (#1671)

* Fix for Ledger Import being in wrong unit (#1678)

* Fix for Ledger Import being in wrong unit

* Style fixes

* Fix filterSubfleets for booked aircrafts (#1680)

* Auto select bid aircraft for sb ofp (#1682)

* Sort the aircraft by putting the bidded aircraft on top (#1683)

* Sort the aircraft by putting the bidded aircraft on top

* Style fixes

* If there's an aircraft on a bid, return only that

* Filter selected aircraft for bids

* Style fixes

* Fix filtering

* Style fix

* Unused parameters

* Use mysq

* Use a root password

* Add wait for mysql

* wait fix

* Fix password

* Root password

* Update the mysqladmin ping command

* Change mysql host

* Fix passwsrd

* Fixed Pages Cancel Button Link & Changed CKEditor Options (#1686)

* Fixed Pages Cancel Button Link

Cancel Button Redirected to Roles, instead of Pages. Fixed.

* Added allowedContent flag

* Fix order and eager load user (#1696)

* Sortable Admin Pireps List (#1694)

* Controller, Model, Blade changes

* Update table.blade.php

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Controller, Model, Blade Changes (#1693)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add Laravel Backup (#1692)

* Add Laravel Backup

* Schedule backup automatically if enabled

* Apply fixes from StyleCI

* Disable success notifications by default for backups

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Controller, Model, Blade Changes (#1691)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Controller, Blade Changes (#1690)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Sortable Admin Users List (#1689)

* Controller, Model, Blade changes

* fix pagination

* Warn admins about mail verification

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Allow verification settings for smtp (#1697)

* Add morphable properties to Flight model (#1698)

* Add morphable properties to Flight #1681

* Fix field names

* Fix factory

* Remove ReferenceTrait

* Remove ref model from controller

* Fix module cache (#1699)

* Improve Modules Statuses cache

* Fix modules cache

* Apply fixes from StyleCI

* Fix cache time

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

* Sortable Admin Awards (with User Details) (#1701)

* Model, Controller, Blade changes

sortable results with award users display

* StyleCI Fix

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update fields.blade.php (#1702)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Fix Pirep Score (#1707)

* Fix removeExpiredRepositionFlights (#1703)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Check Stat and Rank Change Before Dispatching Notifications (#1704)

* Check Stat and Rank Change

No need to spam discord when the rank is not changed and the dispatched event is not related to ranks at all.

* Remove model/id check

As it is already done in event itself

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Move SESSION_CONNECTION to .env (#1705)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Use queue for listeners (#1706)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Send the total time, which accounts for the transfer hours (#1711)

* Allow more control over custom Pirep Fields (#1712)

* Allow Manual Pirep Only Custom Fields

* switching to enum for more flexible usage

* StyleCI Fix

* fix migration, revert back resource change

* Update PirepController.php

* blade and controller

* Update Pirep.php

* delete_cache_files (#1713)

Delete module and theme cache files when cleaning cache from admin > maintenance as they are not being deleted by laravel anymore.

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add Discord OAuth (#1714)

* Add discord OAuth

* Remove the ability to edit discord_id

* Update OAuthController

* Apply fixes from StyleCI

* Update discord redirect url

* Retrieve the discord_private_channel_id in OAuthController

* Apply fixes from StyleCI

* Move discord token to config

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update PHP dependencies (#1718)

* Fix cache clear (#1719)

* Fix cache clear

* Flush failed queues when clearing cache

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Fix bug in seeder with missing optional param (#1724)

* Fix bug in seeder with optional missing param which was causing seeds to be skipped

* Style fix

* gitignore file path

* Additional test case

* Split up test cases

* NewAircraftFields (#1728)

dow, mlw, selcal and simbrief_type

* Remove listeners from queues for now (#1726)

* Remove listeners from queues for now

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Move Flush Failed Jobs to a specific button in maintenance (#1720)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Postmark Mailer Support (#1727)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add button under maintenance to force a reseed (#1730)

* Login with discord (#1717)

* Add UserOAuthToken

* Move DISCORD_OAUTH_ENABLED to config

* Fix UserOAuthTokens migration

* Update OAuthController and oauth routes

* Frontend updates

* Update oauth routes

* Prevent from unlinking only login method

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

* Remove DB contraints in Discord OAuth (#1732)

* Disable installer when phpvms is installed (#1733)

* Add test for PirepDiversionHandler (#1736)

* Add test for PirepDiversionHandler

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

* Fix InstalledCheck Middleware (hotfix) (#1737)

* Fix InstalledCheck Middleware

* Apply fixes from StyleCI

* Fix typo

* Apply fixes from StyleCI

* Update already installed view

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

* Unset image if empty (#1747)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Disable toDiscordChannel() (#1742)

* Update NewsAdded.php

* StyleCI Fix

* Remove DiscordWebhook class

Still testing

* Another StlyCI Fix

* Remove discord stuff

* Fix backups scheduler (#1751)

* Apply fixes from StyleCI

* Fix Backups Scheduler

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

* Fix User Removal (#1749)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Use Markdown in discord notifications (#1743)

* Add league/html-to-markdown

* Convert HTML to Markdown in NewsAdded notification

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update backups clean up config (#1744)

* Update backups cleanup config

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Fix CSS in Admin Pireps Table (#1738)

* Fix CSS in Admin Pireps Table

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* OAuth improvements (#1735)

* Do not create account if email already exists in OAuth

* Remove DB constraints in Discord OAuth

* Apply fixes from StyleCI

* Add flash to login_layout

* Fix logoutProvider for tests

* Update OAuth Callback

* Remove register with discord

* Remove DISCORD_BOT_TOKEN

* Add OAuthTest

* Apply fixes from StyleCI

* Update avatar in OAuthTest

* Debug test

* Revert "Debug test"

This reverts commit ddef2f6.

* Debug test

* Apply fixes from StyleCI

* Still trying to debug tests

* Add avatar to UserFactory

* Remove debug stuff

* Update OAuthTest

* Return discord_id in API

* Check for UserState in OAuthController

* Update OAuthTest

* Apply fixes from StyleCI

* Retrieve discord_private_channel_id

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add settings to disable registration or make it invite-only (#1739)

* Update settings

* Add invites table

* Create User from admin

* Add invites to admin

* Update settings names

* Registration changes

* ClearExpiredInvites

* Fix RegisterController

* Add some tests

* Apply fixes from StyleCI

* Add test for wrong email

* Apply fixes from StyleCI

* Add test for standard registration

* Apply fixes from StyleCI

* Use string for token instead of longText

* Allow to add users from admin regardless of registration settings

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* env support for filesystem config (#1769)

* S3 and SFTP filesystem support (#1768)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Use new AviationWeather API (#1767)

* Update AviationWeather endpoints

* Update MetarTest

* trim METAR/TAF API responses

* Apply fixes from StyleCI

* Add missing kphx.txt

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Don't send empty thumbnail to discord (#1766)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update backup timing for users with 15-minute cron jobs (#1762)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update FlightService > Duplicate Flight Check (#1773)

* Update FlightService.php

A flight should NOT be marked as duplicate unless

* Airline
* Flight Number
* Route Code
* Route Leg Number
* Origin
* Destination
* Scheduled Days

are identical with another flight.

We can import flights with same numbers but with different origins and destinations, but can not edit them in admin due to very limited "duplicate check".

Imagine you have a flight

TK1 AYT-DUS
TK1 DUS-BER
TK2 BER-AYT

You can import this, but can not edit TK1 because v7 thinks it has a duplicate.

Change extends the check properly to consider origin, destination and weekdays.

* Update FlightTest.php

Test should consider the same fields as the function

* Update sortable array (#1759)

Add `email` (used by admin backend sorting)

* Fix CSRF Protection (#1772)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Clean up logs (#1756)

* Apply fixes from StyleCI

* Clean up logs in PirepController

* Apply fixes from StyleCI

* Clean up logs in PirepService

* Move PIREP Update log to debug

* Remove VACentral's listeners

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Admin Dashboard Layout Change (#1760)

* Dashboard layout changes

* Update news.blade.php

* Failsafe for deleted staff/admin

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Upgrade to PHPUnit 10 (#1764)

* Remove sempro/phpunit-pretty-print

* Bump PHPUnit dependencies

* Bump nunomaduro/collision and filp/whoops

* Update phpunit.xml

* Change setUp to protected

* Remove --verbose option

* Update phpunit.xml

* Remove Bootstrap

* Add types in tests

* Make tests class final

* Remove unused variables

* Add .phpunit.cache to .gitignore

* Apply fixes from StyleCI

* Update phpunit.xml

* Break tests (to test CI/CD)

* Revert "Break tests (to test CI/CD)"

This reverts commit 928b199.

* Update composer.lock

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update backup.php (#1757)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add setting for Discord PirepFiled Notifications (#1781)

* Add env config option to set default theme (#1777)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add support for PHP83 (#1763)

* Add PHP83 to build

* Upgrade minimum laravel version

* Use PHP83 in sail

* Fix drop_user_oauth_tokens_foreign_keys with sqlite (tests)

* Add themeEngine to ThemeViewFinder

* Fix deprecated null value for first parameter of str_contains in Rank

* Upgrade jmikola/geojson to fix deprecated warnings

* Fix null parameter to DateTimeImmutable deprecated

* Upgrade santigarcor/laratrust to fix deprecation warnings

* Update composer.lock

* Fix warning in CommaDelimitedCast.php

* Update composer.lock

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add default values in backup config (#1780)

* Add default values in backup config

* Update default avatar url

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Use internal units for pirep fields (#1782)

* Replace semver/semver by nikolaposa/version (#1754)

* Apply fixes from StyleCI

* Replace semver/semver by nikolaposa/version

* Update composer.lock

* Update composer.lock

* Update composer.lock

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add modal for External Redirects (#1740)

* Add Modal for External Redirects

* Add Translations

* Apply fixes from StyleCI

* Add system to always trust a domain

* Show modal only if a has data-external-redirect

* Move isExternalFile check in an Attribute

* Apply fixes from StyleCI

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add activity logger (#1755)

* Apply fixes from StyleCI

* Add spatie/laravel-activitylog

* Add admin interface for activities

* Disable activity logging in api routes

* Add activity watcher to models

* Add clean up command

* Apply fixes from StyleCI

* Remove activities from menu if activity logger is disabled

* Fix migrations structure

* Apply fixes from StyleCI

* Fix tests

* Fix display of changes if newValue is an array

* Disable activity logger for frontend routes

* Enable activity logger only in admin routes

* Apply fixes from StyleCI

* Update composer.lock

* Update composer.lock

* Update composer.lock

* Update composer.lock

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Bump composer to 2.7 and above (#1774)

* Bump composer to 2.7 and above

* Update composer.lock

* Update composer.lock

* Update composer.lock

* Update composer.lock

* Fix VMSAcars download with External Redirect Modal (#1788)

* Add new helpers (#1790)

* Add new helpers

* check_module : Allows checking installed modules/addons and returns either true or false according to their existence and activeness
* decode_days : Allows decoding days of flights, when building schedule list pages

* StyleCI fixes

* StyleCI Fix 2

* Add FareType to Import/Export (#1794)

* Add FareType to Import/Export

* Update testFareImporter

* Import incomes, fuel cost and expenses from v5 (#1798)

* Import incomes, fuel cost and expenses from v5

* Apply fixes from StyleCI

---------

Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>

* Replace Auth Failed Message for User Account Missing (#1799)

* Improve pilot pay import from v5 (#1801)

* Improve pilot pay import from v5

* Apply fixes from StyleCI

---------

Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>

* Remove laravelcollective/html from frontend (#1753)

* Apply fixes from StyleCI

* Remove laravelcollective/html from frontend

* Fix typo

* Fix airport_list in PirepController@edit

* Fix values in pirep edit form

* Apply fixes from StyleCI

* Fill dpt/arr airports when creating a pirep from a flight

* Fix checkbox in registeration form

* Fix register view

* Fix typo

* Remove discord button from registration page (forgotten while merging)

* Remove readonly from select in pirep fields view

* Fix home airport selected value in edit profile

* Fix checkbox in edit profile form

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add internal user fields (#1805)

* Add internal user fields

* Apply fixes from StyleCI

---------

Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>

* Map LastPirepID in Legacy PirepImporter (#1809)

* Create a console kernel instance before running webcron (#1810)

* Update Module AppServiceProvider Stub (#1811)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add ability to edit news (#1814)

* Add ability to edit news

* Apply fixes from StyleCI

* Add option to send notifications

* Add option to send notifications when a news is updated

* Apply fixes from StyleCI

---------

Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>

* Add exception message to logs when there is an API error (#1819)

* Add exception message to logs when there is an API error

* Apply fixes from StyleCI

---------

Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>

* Use laravel scheduler when proc_open is available (#1812)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update FlightController (Default sort order fix) (#1817)

Sorting with `sortable()` does not support multiple columns for default output, thus additional `orderBy()` usage is required for initial/default sorting to get expected results on page load (like admin controller)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Update User Model (#1816)

Allow `$user->award->pivot` to have the timestamps

* Add missing IATA Flight Types (#1821)

Add Shuttle Mode, Passenger with Cargo In Cabin, General Aviation, Air Taxi and two non standard (company specific) codes.

* Fix Airport Pagination (#1823)

Without the change it will not be possible to live sort and use pagination.

* Add Landing rate to discord broadcast (#1825)

* Add Landing rate to discord broadcast

Hello, In the last few days I implemented this option in my VA and my pilots liked it, that is why I am sending this change for other VA.

* Landing rate in Discord broadcast

* Apply fixes from StyleCI (#1826)

* Update README and Makefile (#1803)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add IVAO OAuth (#1818)

* Add IVAO OAuth

* Apply fixes from StyleCI

* Fix OAuthTest

---------

Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Revert "Add IVAO OAuth (#1818)" (#1827)

This reverts commit 2285b78.

* VATSIM OAuth (#1761)

* Add socialiteproviders/vatsim

* Add vatsim_id field

* Fix OAuthTest

* Add vatsim to OAuthController

* Add vatsim login button

* Apply fixes from StyleCI

* Add vatsim profile buttons

* Add vatsim_id to sortable array in User

* Update composer.lock

* Update composer.lock

* Update composer.lock

* Update composer.lock

* Update composer.lock

* Update composer.lock

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add IVAO OAuth (#1828)

* Add IVAO OAuth

* Apply fixes from StyleCI

* Fix OAuthTest

* Update composer.lock

---------

Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Make sure airline IDs are added to the expense (#1725)

* Make sure airline IDs are added to the expense

* Style fixes

* Remove debug line

* Remove extra returns

* Cleanup

* Get the airline through the relationship

* Cleanup some code

* Add data migration for the expenses

* Address PR comments

* Apply fixes from StyleCI

* Fix token columns type for OAuth (#1830)

* Fix token columns type for OAuth

* Apply fixes from StyleCI

---------

Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>

* Add remember for OAuth logins (#1831)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add MailerSend Mail Provider (#1832)

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Add a new sample flight

* Add altitude AGL and MSL columns (#1838)

* Add altitude AGL and MSL columns

* Apply fixes from StyleCI

* Backwards compat for altitude changes

* Apply fixes from StyleCI

* test changes

* Apply fixes from StyleCI

* test changes

* Apply fixes from StyleCI

* Debugging

* Debugging

* Apply fixes from StyleCI

* Adjust workflows

* Add time between the requests

* Apply fixes from StyleCI

* Bump npm dependencies (#1797)

* Bump axios from 0.21.1 to 1.6.8

* Run npm audit fix

* Bump webpack-bundle-analyzer from 3.9.0 to 4.10.0

* Bump marked from 2.1.3 to 12.0.1

* Fix more CVEs

---------

Co-authored-by: Nabeel S. <nabeelio@users.noreply.github.com>

* Allow OAuth Scopes customization (#1829)

Co-authored-by: Nabeel S. <nabeelio@users.noreply.github.com>

* Remove laravelcollective/html from installer, updater and importer (#1807)

* Remove laravelHtml helper from installer and update

* Fix wrong action on importer complete form

* Fix wrong button types and env file

---------

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>

* Use GitVersion for versioning (#1840)

* Use GitVersion for versioning

* Install

* Fix error in test data

* Versioning fix

* Versioning implementation

* Versioning implementation

* cast altitude values to float

* Apply fixes from StyleCI (#1841)

* Versioning implementation

* Versioning implementation

* Versioning implementation

* Versioning implementation

* Upgrade Dependencies (#1839)

* Fix CVEs in phpseclib

* Fix CVEs in composer

---------

Co-authored-by: Nabeel S. <nabeelio@users.noreply.github.com>

* Versioning implementation

* Use Nerdbank.GitVersioning instead (#1844)

* Use Nerdbank.GitVersioning instead

* remove old GitVersioning

* Make sure version is read for deployments

* Syntax error

* Syntax errors fix

* Syntax errors fix

* Apply fixes from StyleCI

* Fix deployment message

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Taylor Broad <taylorbroad@gmail.com>
Co-authored-by: B.Fatih KOZ <fatih.koz@gmail.com>
Co-authored-by: Arthur Parienté <41431456+arthurpar06@users.noreply.github.com>
Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>
Co-authored-by: Julian Ramirez <90717365+rcomunica@users.noreply.github.com>
Co-authored-by: Arthur Hetem <arthurhetemgames@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants