Merge dev to main #1845
Merged
Merge dev to main #1845
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>
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>
* 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)
* Add cargo load factor * Style CI * Settings changes
* 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
* Fix import of users and airports from legacy * Style fixes * Dead code * More dead code removal
* Importer fixes for dirty fields * Code cleanup
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>
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>
* Fix for roles importing * Style fixes * Rename ImporterService to LegacyImporterService
* Check for unique among non-deleted items for subfleets * Style fixes
* Migration fix for missing soft deletes * Style fixes
* 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 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.md * Update Makefile --------- Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>
* 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>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>
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>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>
* 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>
* 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 * 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 * 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 * Apply fixes from StyleCI --------- Co-authored-by: arthurpar06 <arthurpar06@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>
Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>
* 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 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>
Co-authored-by: Nabeel S. <nabeelio@users.noreply.github.com>
…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 * Install * Fix error in test data
* Fix CVEs in phpseclib * Fix CVEs in composer --------- Co-authored-by: Nabeel S. <nabeelio@users.noreply.github.com>
* 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.