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

1.8.0 #143

Merged
merged 32 commits into from
Oct 17, 2024
Merged

1.8.0 #143

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5a0051c
Fix bug in can statement
lieselwd Sep 14, 2024
7b02335
Rewrite of processing and pending tables
lieselwd Sep 14, 2024
ca38aa0
Revert "Rewrite of processing and pending tables"
philsjh Sep 14, 2024
e2a53bf
Readd all of the new pending/processed tables
lieselwd Oct 14, 2024
e27cd3c
Add auto acknowledge basics for CTP 24E
lieselwd Oct 14, 2024
1b9f907
Adjust footer and about page
lieselwd Oct 14, 2024
a231298
Update app/Models/RclMessage.php
lieselwd Oct 14, 2024
7ad3f6c
Update app/Models/RclMessage.php
lieselwd Oct 14, 2024
b0d865a
Adjust wording of RCL messages
lieselwd Oct 14, 2024
1888bf7
UI adjustments to bring in line with CTP site
lieselwd Oct 14, 2024
d3c67d0
Add auto acknowledge basics for CTP 24E
lieselwd Oct 14, 2024
9f7f870
Update app/Models/RclMessage.php
lieselwd Oct 14, 2024
320356d
Update app/Models/RclMessage.php
lieselwd Oct 14, 2024
3e6f6dc
Adjust wording of RCL messages
lieselwd Oct 14, 2024
c77b366
Merge remote-tracking branch 'origin/auto-acknowledge-rcl-ctp24e' int…
lieselwd Oct 14, 2024
d75b7fc
Adjust prune times for rclmessages
lieselwd Oct 15, 2024
0d3bf48
squash! Adjust prune times for rclmessages
lieselwd Oct 15, 2024
3522788
Add bulk delete/fix CLX linking in table
lieselwd Oct 15, 2024
7347ff1
Add settings, user mode option
lieselwd Oct 15, 2024
9e3fe0e
Slight adjustment
lieselwd Oct 15, 2024
f36e739
Update README.md
lieselwd Oct 15, 2024
b2fb8f0
Remove unneeded JS/CSS files
lieselwd Oct 15, 2024
15f7c37
Auto move RCLs from pending to processed
lieselwd Oct 16, 2024
6b3b1db
Merge branch 'development' into auto-acknowledge-rcl-ctp24e
williammck Oct 16, 2024
38cbc89
Merge pull request #142 from vatsimnetwork/auto-acknowledge-rcl-ctp24e
williammck Oct 16, 2024
9c01e89
Merge pull request #145 from vatsimnetwork/qol-improvements-ctp24e
williammck Oct 16, 2024
d72f569
Merge branch 'main' into development
williammck Oct 16, 2024
23a24ff
Revert "Slight adjustment"
williammck Oct 16, 2024
3f8f7bd
Revert "Add settings, user mode option"
williammck Oct 16, 2024
ef310dd
Add permission tables
lieselwd Oct 17, 2024
2aeddbf
Merge pull request #146 from vatsimnetwork/permissions-tables
williammck Oct 17, 2024
eaf0455
UI tweaks
williammck Oct 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Slight adjustment"
This reverts commit 9e3fe0e.
williammck committed Oct 16, 2024
commit 23a24ff2b3aaa73e69d6c29bfde2f180b69f5694
6 changes: 1 addition & 5 deletions resources/views/login.blade.php
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
@section('layout')
<body style="height: 100%;" class="bg-secondary-subtle">
<div class="h-100 d-flex align-items-center justify-content-center">
<div class="p-5 d-flex flex-column align-content-center justify-center align-items-center bg-body rounded-4 shadow">
<div class="p-5 d-flex flex-column align-content-center justify-center align-items-center bg-body rounded-4">
<a class="mb-4" href="{{ route('welcome') }}">
<img src="{{ asset('images/natTrak_Logo_2000px.png') }}" alt="natTrak" class="img-fluid" style="max-height: 3.5em;">
</a>
@@ -14,10 +14,6 @@
Dev Account
</a>
@endif
<div class="d-flex my-1 flex-row justify-center align-self-center align-items-center text-center">
<a href="{{ route('tracks.index') }}" class="btn btn-link text-secondary flex-grow-1">Tracks</a>
<a href="{{ route('notams.index') }}" class="btn btn-link text-secondary flex-grow-1">NOTAMs</a>
</div>
</div>
<p class="mt-5 mb-0 text-body-secondary">© {{ date('Y') }} VATSIM, Inc.</p>
</div>
2 changes: 1 addition & 1 deletion resources/views/welcome-mode.blade.php
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
@section('layout')
<body style="height: 100%;" class="bg-secondary-subtle">
<div class="h-100 d-flex align-items-center justify-content-center">
<div class="p-5 d-flex flex-column align-content-center justify-center align-items-center bg-body rounded-4 shadow">
<div class="p-5 d-flex flex-column align-content-center justify-center align-items-center bg-body rounded-4">
<a class="mb-4" href="{{ route('welcome') }}">
<img src="{{ asset('images/natTrak_Logo_2000px.png') }}" alt="natTrak" class="img-fluid" style="max-height: 3.5em;">
</a>