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

ARES Change Holder #4224

Closed
wants to merge 105 commits into from
Closed

ARES Change Holder #4224

wants to merge 105 commits into from

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Aug 21, 2023 •
edited
Loading

realforest2001 and others added 30 commits June 28, 2023 19:05
@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
Functional Access Tickets
156625c
@realforest2001
Map Element
b23f4e2
@Ben10083
easier to file access ticket for self
2cb42dc
@Ben10083
changes to view status
cef0633
@Ben10083
Now can see recipient for access request in access request tab
7a91fde
@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
Merge pull request #11 from Ben10083/project/ares/access_tickets
27bf422 
Access Ticket Tweaks
@realforest2001
accurate fix
e0d7378
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
c2e3595 
…dmin_console
@realforest2001
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…
87bd994 
…ccess_tickets
@realforest2001
attempted conflict resolution
d992f96
@realforest2001
attempted conflict resolution
cb4d971
@realforest2001
partial revert
da5106e
@realforest2001
Adds more APOLLO consoles
6a77df6
@Faunenschnitt Faunenschnitt mentioned this pull request Sep 8, 2023
Closed
3 tasks
@TeDGamer TeDGamer mentioned this pull request Sep 8, 2023
Closed
3 tasks
@TeDGamer TeDGamer mentioned this pull request Sep 9, 2023
Closed
3 tasks
@UntoldTactics UntoldTactics mentioned this pull request Sep 10, 2023
Open
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Mapping did you remember to save in tgm format? Test Merge Only This PR's purpose is for testmerges only. UI deletes nanoui/html
Projects
None yet
Milestone
Project ARES
Development

Successfully merging this pull request may close these issues.
2 participants
@realforest2001 @Ben10083