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.

Sign up for GitHub

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

Jump to bottom

Project ARES: TM Holder v3 #4564

Closed
wants to merge 78 commits into from
Closed

Project ARES: TM Holder v3 #4564

wants to merge 78 commits into from

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Oct 1, 2023 •
edited
Loading

@realforest2001
Code quality
02b9ae8
@realforest2001
Started work on reports
14276e8
@realforest2001
ID and ARES size
455ec58
@realforest2001
12.8.3
271d2c5 
Makes maintenance tickets functional.
Adds two new maintenance reports.
Todo: Make it so WJs can view this from anywhere.
Todo: Access ticket functionality.
@realforest2001
Merge branch 'master' into project/apollo_controller
263e889
@realforest2001
ARES punctuation & Fixes
506254e 
x


x


access tweak


x
@realforest2001
ui icons
0713611
@realforest2001
Apollo Follow
708a9df 
x


x
@realforest2001
admin attempt
1896c2d
@realforest2001
x
8c2868f
@realforest2001
red
2c2e567 
red
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
ff25d01 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
038c520 
…dmin_console
@realforest2001
Working Admin Console
a5d6274
@realforest2001
logging
a155d37
@realforest2001
Fix
a2adfbd
@realforest2001
fixes
e6e9e36
@realforest2001
accurate fix
e0d7378
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
c2e3595 
…dmin_console
@realforest2001
attempted conflict resolution
cb4d971
@realforest2001
Updates the delete buttons
c404aff
@realforest2001
flight records
da3d3f4
@realforest2001
sec fix
2bcb065
@realforest2001
fixes
45c71c1
@realforest2001
admin flight log
d630f96
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
4df1507 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
50e761f 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
d5275c5 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
0e41a1a 
…dmin_console
@realforest2001
Access Ticket Management
653e643 
stuff

implement
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 30, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 30, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Superwelder Superwelder mentioned this pull request Oct 31, 2023
Closed
3 tasks
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 3, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 5, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 6, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Nov 14, 2023
@github-actions github-actions bot closed this Nov 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Nanu308 Nanu308 Awaiting requested review from Nanu308 Nanu308 will be requested when the pull request is marked ready for review Nanu308 is a code owner

@fira fira Awaiting requested review from fira fira will be requested when the pull request is marked ready for review fira is a code owner

Assignees
No one assigned
Labels
Merge Conflict PR can't be merged because it touched too much code Stale beg a maintainer to review your PR Test Merge Only This PR's purpose is for testmerges only. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Milestone
Project ARES
Development

Successfully merging this pull request may close these issues.
4 participants
@realforest2001 @cm13-github @morrowwolf @Zonespace27