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: Admin Console #4182

Merged
merged 71 commits into from
Mar 7, 2024
Merged

Project ARES: Admin Console #4182

merged 71 commits into from
Mar 7, 2024

Commits on Jun 28, 2023

  1. Code quality

    @realforest2001
    realforest2001 committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    02b9ae8 View commit details
    Browse the repository at this point in the history

  2. Started work on reports

    @realforest2001
    realforest2001 committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    14276e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2023

  1. ID and ARES size

    @realforest2001
    realforest2001 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    455ec58 View commit details
    Browse the repository at this point in the history

  2. 12.8.3 

    Makes maintenance tickets functional.
Adds two new maintenance reports.
Todo: Make it so WJs can view this from anywhere.
Todo: Access ticket functionality.
    @realforest2001
    realforest2001 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    271d2c5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into project/apollo_controller

    @realforest2001
    realforest2001 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    263e889 View commit details
    Browse the repository at this point in the history

  4. ARES punctuation & Fixes 

    x


x


access tweak


x
    @realforest2001
    realforest2001 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    506254e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. ui icons

    @realforest2001
    realforest2001 committed Jul 3, 2023
    Configuration menu
    Copy the full SHA
    0713611 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Apollo Follow 

    x


x
    @realforest2001
    realforest2001 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    708a9df View commit details
    Browse the repository at this point in the history

  2. admin attempt

    @realforest2001
    realforest2001 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    1896c2d View commit details
    Browse the repository at this point in the history

  3. x

    @realforest2001
    realforest2001 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    8c2868f View commit details
    Browse the repository at this point in the history

  4. red 

    red
    @realforest2001
    realforest2001 committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    2c2e567 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    ff25d01 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    038c520 View commit details
    Browse the repository at this point in the history

  2. Working Admin Console

    @realforest2001
    realforest2001 committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    a5d6274 View commit details
    Browse the repository at this point in the history

  3. logging

    @realforest2001
    realforest2001 committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    a155d37 View commit details
    Browse the repository at this point in the history

  4. Fix

    @realforest2001
    realforest2001 committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    a2adfbd View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. fixes

    @realforest2001
    realforest2001 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e6e9e36 View commit details
    Browse the repository at this point in the history

  2. accurate fix

    @realforest2001
    realforest2001 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e0d7378 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    c2e3595 View commit details
    Browse the repository at this point in the history

  2. attempted conflict resolution

    @realforest2001
    realforest2001 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    cb4d971 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Updates the delete buttons

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    c404aff View commit details
    Browse the repository at this point in the history

  2. flight records

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    da3d3f4 View commit details
    Browse the repository at this point in the history

  3. sec fix

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    2bcb065 View commit details
    Browse the repository at this point in the history

  4. fixes

    @realforest2001
    realforest2001 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    45c71c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. admin flight log

    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    d630f96 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    4df1507 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    50e761f View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    d5275c5 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    0e41a1a View commit details
    Browse the repository at this point in the history

  2. Access Ticket Management 

    stuff

implement
    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    653e643 View commit details
    Browse the repository at this point in the history

  3. span fix

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    2ba9163 View commit details
    Browse the repository at this point in the history

  4. button size

    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    9f23d87 View commit details
    Browse the repository at this point in the history

  5. fixes the claim button 

    fix mark lock
    @realforest2001
    realforest2001 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    3594385 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    cc73dbf View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    2217350 View commit details
    Browse the repository at this point in the history

  2. EXPERI-PATCH - HIJACK OBJECTIVES

    @realforest2001
    realforest2001 committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    448a0b9 View commit details
    Browse the repository at this point in the history

  3. EXPERI-PATCH PATCH

    @realforest2001
    realforest2001 committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    3456b54 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    d954731 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    016a752 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    a3f99ad View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    14dd52a View commit details
    Browse the repository at this point in the history

  2. conflicts

    @realforest2001
    realforest2001 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    057c3a7 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    ee6ca39 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    d813ac1 View commit details
    Browse the repository at this point in the history

  2. tweaks and a fix from Drathek <3

    @realforest2001
    realforest2001 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    4c67b4d View commit details
    Browse the repository at this point in the history

  3. reverts temp patch for hijack objectives

    @realforest2001
    realforest2001 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    4c543dd View commit details
    Browse the repository at this point in the history

  4. second revert

    @realforest2001
    realforest2001 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    037f7ab View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    af978a6 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    00d1140 View commit details
    Browse the repository at this point in the history

  2. SShijack

    @realforest2001
    realforest2001 committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    c602668 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    0aa2b43 View commit details
    Browse the repository at this point in the history

  2. fix

    @realforest2001
    realforest2001 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    fa0e595 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    5c593c7 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. file rename

    @realforest2001
    realforest2001 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5e96654 View commit details
    Browse the repository at this point in the history

  2. conflict tweak

    @realforest2001
    realforest2001 committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    8075845 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7beec8c View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    e558327 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    c01698a View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    d3c4173 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    3ea1885 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    333e575 View commit details
    Browse the repository at this point in the history

  2. tweak

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    390e098 View commit details
    Browse the repository at this point in the history

  3. defaults

    @realforest2001
    realforest2001 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    1c81feb View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    953e782 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a… 

    …dmin_console
    @realforest2001
    realforest2001 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    03e964c View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. changes

    @realforest2001
    realforest2001 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    0516e66 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. changes

    @realforest2001
    realforest2001 committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    d8d7454 View commit details
    Browse the repository at this point in the history

  2. changes

    @realforest2001
    realforest2001 committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    d5a2897 View commit details
    Browse the repository at this point in the history

  3. define number comments

    @realforest2001
    realforest2001 committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    6f123af View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Apply suggestions from code review 

    Co-authored-by: Drathek <[email protected]>
    @realforest2001 @Drulikar
    realforest2001 and Drulikar authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    8a81f22 View commit details
    Browse the repository at this point in the history

  2. fixes

    @realforest2001
    realforest2001 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    c5d4dc3 View commit details
    Browse the repository at this point in the history