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

Added Ldap Company as option and FMCS Notification #14650

Open
wants to merge 33 commits into
base: develop
Choose a base branch
from
Open

Added Ldap Company as option and FMCS Notification #14650

wants to merge 33 commits into from

Commits on Apr 25, 2024

  1. adds Ldap Company as a syncable field

    @Godmartinz
    Godmartinz committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    3f0546e View commit details
    Browse the repository at this point in the history

  2. added migration to git

    @Godmartinz
    Godmartinz committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    a8f26e2 View commit details
    Browse the repository at this point in the history

  3. fixed migration

    @Godmartinz
    Godmartinz committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    6fca0c6 View commit details
    Browse the repository at this point in the history

  4. little fix

    @Godmartinz
    Godmartinz committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    5b666ad View commit details
    Browse the repository at this point in the history

  5. imported Company to ldapsync

    @Godmartinz
    Godmartinz committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    88f83f3 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. getting queries setup for notifications

    @Godmartinz
    Godmartinz committed May 6, 2024
    Configuration menu
    Copy the full SHA
    9663810 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. assets and license queries working as intended

    @Godmartinz
    Godmartinz committed May 7, 2024
    Configuration menu
    Copy the full SHA
    214e8f5 View commit details
    Browse the repository at this point in the history

  2. adds accessorycheckoutmodel and queries work

    @Godmartinz
    Godmartinz committed May 7, 2024
    Configuration menu
    Copy the full SHA
    a089ca4 View commit details
    Browse the repository at this point in the history

  3. formatted model better

    @Godmartinz
    Godmartinz committed May 7, 2024
    Configuration menu
    Copy the full SHA
    d56aaae View commit details
    Browse the repository at this point in the history

  4. removed dead code, small fixes

    @Godmartinz
    Godmartinz committed May 7, 2024
    Configuration menu
    Copy the full SHA
    14fa09c View commit details
    Browse the repository at this point in the history

  5. fixes front end notifications

    @Godmartinz
    Godmartinz committed May 7, 2024
    Configuration menu
    Copy the full SHA
    b6747a7 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. mashing my brain over the polymorphic query

    @Godmartinz
    Godmartinz committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6015936 View commit details
    Browse the repository at this point in the history

  2. adds fmcs check, adds empty notification message

    @Godmartinz
    Godmartinz committed May 8, 2024
    Configuration menu
    Copy the full SHA
    cf702c4 View commit details
    Browse the repository at this point in the history

  3. removed translation

    @Godmartinz
    Godmartinz committed May 8, 2024
    Configuration menu
    Copy the full SHA
    4ad027e View commit details
    Browse the repository at this point in the history

  4. reworded translation

    @Godmartinz
    Godmartinz committed May 8, 2024
    Configuration menu
    Copy the full SHA
    5d7588b View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. fixes assets query to pay attention to well..assets

    @Godmartinz
    Godmartinz committed May 9, 2024
    Configuration menu
    Copy the full SHA
    acb6cb8 View commit details
    Browse the repository at this point in the history

  2. change

    @Godmartinz
    Godmartinz committed May 9, 2024
    Configuration menu
    Copy the full SHA
    7c7031f View commit details
    Browse the repository at this point in the history

  3. conflict resolved

    @Godmartinz
    Godmartinz committed May 9, 2024
    Configuration menu
    Copy the full SHA
    43a9657 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into ldap_company_add

    @Godmartinz
    Godmartinz authored May 9, 2024
    Configuration menu
    Copy the full SHA
    d1074b7 View commit details
    Browse the repository at this point in the history

  5. made query more readable

    @Godmartinz
    Godmartinz committed May 9, 2024
    Configuration menu
    Copy the full SHA
    3e26f17 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. fix conflicts

    @Godmartinz
    Godmartinz committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    180b94e View commit details
    Browse the repository at this point in the history

  2. merged develop

    @Godmartinz
    Godmartinz committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    5b89985 View commit details
    Browse the repository at this point in the history

  3. fixed conflicts

    @Godmartinz
    Godmartinz committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    8d792de View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. fix merged conflicts

    @Godmartinz
    Godmartinz committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    1ec006a View commit details
    Browse the repository at this point in the history

  2. fixed relations with new Accessory Checkout Model

    @Godmartinz
    Godmartinz committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    9879a3f View commit details
    Browse the repository at this point in the history

  3. attempting a fix on assignedTo relation

    @Godmartinz
    Godmartinz committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    76d52de View commit details
    Browse the repository at this point in the history

  4. flipped tghe owner_key and id

    @Godmartinz
    Godmartinz committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    c8e2a10 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. fixed a relation

    @Godmartinz
    Godmartinz committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    3ed039e View commit details
    Browse the repository at this point in the history

  2. stop dynamically naming assets table

    @Godmartinz
    Godmartinz committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    331f9bf View commit details
    Browse the repository at this point in the history

  3. simplified table name and rewrote alias

    @Godmartinz
    Godmartinz committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    c6b559c View commit details
    Browse the repository at this point in the history

  4. added select to query to avoid ambiguity

    @Godmartinz
    Godmartinz committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    3574fb6 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2024

  1. Merge branch 'develop' into ldap_company_add 

    # Conflicts:
#	app/Console/Commands/LdapSync.php
#	resources/views/layouts/default.blade.php
    @Godmartinz
    Godmartinz committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    2de5a7e View commit details
    Browse the repository at this point in the history

  2. fix table select in query

    @Godmartinz
    Godmartinz committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    c8d7fae View commit details
    Browse the repository at this point in the history