Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: COmanage/match
base: 55b7752
Choose a base ref
...
head repository: COmanage/match
compare: 044dcc6
Choose a head ref
6 contributors

Commits on Jun 3, 2022

  1. Update font to "Category A" licensed font (CO-2445)

    @arlen
    arlen committed Jun 3, 2022
    Copy the full SHA
    028aaaf View commit details

Commits on Aug 16, 2022

  1. Merge pull request #39 from arlen/feature-co2445-font 

    Update font to "Category A" licensed font (CO-2445)
    @arlen
    arlen committed Aug 16, 2022
    Copy the full SHA
    f02910b View commit details

Commits on Aug 22, 2022

  1. Add font files (CO-2445)

    @arlen
    arlen committed Aug 22, 2022
    Copy the full SHA
    a617ab1 View commit details

Commits on Sep 5, 2022

  1. Skip display of loading animation when CMD, CTRL, or SHIFT is pressed… 

    … (CO-2488) (#41)
    @arlen
    arlen committed Sep 5, 2022
    Copy the full SHA
    658df39 View commit details

Commits on Sep 9, 2022

  1. Merge pull request #42 from arlen/feature-co2445-addFont 

    Add font files (CO-2445)
    @arlen
    arlen committed Sep 9, 2022
    Copy the full SHA
    6826c6e View commit details

Commits on Sep 17, 2022

  1. Implement Resolution Notification Callback (CO-1808) and Matchgrid Hi… 

    …story Records (CO-1682)
    Benn Oshrin committed Sep 17, 2022
    Copy the full SHA
    5ee3c58 View commit details

  2. Merge branch 'develop' of github.internet2.edu:COmanage/match into de… 

    …velop
    Benn Oshrin committed Sep 17, 2022
    Copy the full SHA
    133d841 View commit details

Commits on Sep 18, 2022

  1. Merge hotfix-1.0.x into develop

    Benn Oshrin committed Sep 18, 2022
    Copy the full SHA
    c791de4 View commit details

Commits on Oct 27, 2022

  1. Improve display of unresolved requests: duplicate referenceids are no… 

    …w merged into a single column heading for Suggestion #, referenceid, and the "Assign this ReferenceID" button. (CO-2167) (#40)
    @arlen
    arlen committed Oct 27, 2022
    Copy the full SHA
    520c9be View commit details

  2. Avoid unnecessary animation, particularly on page load (CO-2330) (#43)

    @arlen
    arlen committed Oct 27, 2022
    Copy the full SHA
    4f071af View commit details

  3. Add "Switch Matchgrid" link to User Menu; also add material icons to … 

    …login/logout (CO-2483) (#45)
    @arlen
    arlen committed Oct 27, 2022
    Copy the full SHA
    04dce0d View commit details

  4. Provide topLinks (e.g. delete) on Edit pages; Use the MenuHelper and … 

    …the menuAction element to handle all topLinks (CO-2512) (#46)
    @arlen
    arlen committed Oct 27, 2022
    Copy the full SHA
    553d2fe View commit details

  5. Quick fix to schema: change index name from "sor_label" to "sor" on m… 

    …atchgrid_history_records (CO-2528) (#47)
    @arlen
    arlen committed Oct 27, 2022
    Copy the full SHA
    7e76f9f View commit details

  6. Improve Pending Match UX Attribute Display (CO-2233) (#48) 

    * Improve display of unresolved requests: duplicate referenceids are now merged into a single column heading for Suggestion #, referenceid, and the "Assign this ReferenceID" button. (CO-2167)

* Improve Pending Match UX Attribute Display - add highlight switches and improve ordering of attributes (CO-2233)

* Restore id, sor, and sorid to the top of attributes listing and outline defined attributes (CO-2233)
    @arlen
    arlen committed Oct 27, 2022
    Copy the full SHA
    0cde4fb View commit details

Commits on Nov 23, 2022

  1. Make "history" a top-link on Manage Matchgrid and shorten link text t… 

    …o History (CO-2527) (#49)

* Improve Manage Matchgrid layout: make Matchgrid History a top-link, and shorten label to "History" (CO-2527)

* Update to Matchgrid History top-link label (CO-2527)

* Test for empty vv_attr_id for topLinks (CO-2527)
    @arlen
    arlen committed Nov 23, 2022
    Copy the full SHA
    1027902 View commit details

Commits on Nov 25, 2022

  1. Pre-defined default attributes (CO-1677)

    Benn Oshrin committed Nov 25, 2022
    Copy the full SHA
    b5c9bab View commit details

Commits on Nov 27, 2022

  1. Finish DBAL migration (CO-2235), rename TierApiController to TapApiCo… 

    …ntroller (CO-2470)
    Benn Oshrin committed Nov 27, 2022
    Copy the full SHA
    d1cf34d View commit details

Commits on Dec 16, 2022

  1. container dynamic log config by env variable (CO-2567)

    @skoranda
    skoranda committed Dec 16, 2022
    Copy the full SHA
    f9c0646 View commit details

  2. Merge pull request #51 from skoranda/develop 

    container dynamic log config by env variable (CO-2567)
    @skoranda
    skoranda committed Dec 16, 2022
    Copy the full SHA
    974b5c1 View commit details

  3. container build and related files (CO-2566)

    @skoranda
    skoranda committed Dec 16, 2022
    Copy the full SHA
    8739956 View commit details

  4. container put build spec files into place (CO-2566)

    @skoranda
    skoranda committed Dec 16, 2022
    Copy the full SHA
    4aa34e7 View commit details

  5. container fix typo in build script (NOJIRA)

    @skoranda
    skoranda committed Dec 16, 2022
    Copy the full SHA
    6837b58 View commit details

  6. container fix build script option (NOJIRA)

    @skoranda
    skoranda committed Dec 16, 2022
    Copy the full SHA
    1651a66 View commit details

Commits on Dec 20, 2022

  1. container remove spurious env variable (NOJIRA)

    @skoranda
    skoranda committed Dec 20, 2022
    Copy the full SHA
    9689a6e View commit details

Commits on Dec 27, 2022

  1. Additional fix for CO-2235 (CO-2564)

    Benn Oshrin committed Dec 27, 2022
    Copy the full SHA
    bd348bb View commit details

  2. Require lowercase (CO-2477) and unique (CO-2440) matchgrid table names

    Benn Oshrin committed Dec 27, 2022
    Copy the full SHA
    33f0a30 View commit details

Commits on Dec 28, 2022

  1. Initial controller logic to facilitate reconciliation view comparison… 

    … (CO-2481)
    Benn Oshrin committed Dec 28, 2022
    Copy the full SHA
    370678f View commit details

Commits on Dec 29, 2022

  1. Improve handling of Matchgrid deletion (CO-1705)

    Benn Oshrin committed Dec 29, 2022
    Copy the full SHA
    dbc0024 View commit details

Commits on Jan 5, 2023

  1. Update reconciliation view to make use of new $vv_candidate_diff arra… 

    …y and use cell-based rather than row-based highlighting. (CO-2481) (#53)

* Update reconciliation view to make use of new $vv_candidate_diff array and use cell-based rather than row-based highlighting. (CO-2481)

* Improve code comments. (CO-2481)
    @arlen
    arlen committed Jan 5, 2023
    Copy the full SHA
    f3fbd20 View commit details

Commits on Jan 6, 2023

  1. Improve layout and styling of delete matchgrid page (CO-1705) (#54)

    @arlen
    arlen committed Jan 6, 2023
    Copy the full SHA
    2c633da View commit details

Commits on Jan 10, 2023

  1. Correct the placement of the Configuration breadcrumb link and ensure… 

    … that the Configure links appears for 'AttributeMappings' (CO-2582) (#55)
    @arlen
    arlen committed Jan 10, 2023
    Copy the full SHA
    cfea2a3 View commit details

Commits on Jan 12, 2023

  1. container update PHP base image version (NOJIRA)

    @skoranda
    skoranda committed Jan 12, 2023
    Copy the full SHA
    f005af6 View commit details

  2. container bump Shibboleth SP version to 3.4.1 (NOJIRA)

    @skoranda
    skoranda committed Jan 12, 2023
    Copy the full SHA
    46bae8a View commit details

  3. container bump mod_auth_openidc version to 2.4.12.2 (NOJIRA)

    @skoranda
    skoranda committed Jan 12, 2023
    Copy the full SHA
    54d9303 View commit details

  4. Fix MatchgridHistoryRecords relation (CO-2579)

    Benn Oshrin committed Jan 12, 2023
    Copy the full SHA
    f7fa3e6 View commit details

Commits on Jan 13, 2023

  1. Improve access to related models (CO-2229) (#57) 

    * Provide tabbed subnavigation for related models. Deprecate Noty.js in favor of Boostrap Alerts. (CO-2229)

* Ensure flash messages are available on all pages. (CO-2229)

* Clean up information alert on reconcile page. (CO-2229)
    @arlen
    arlen committed Jan 13, 2023
    Copy the full SHA
    3ea6cb0 View commit details

  2. Downgrade symfony/service-contracts to allow Match to run on PHP 8.0 … 

    …(CO-2562) (#56)
    @arlen
    arlen committed Jan 13, 2023
    Copy the full SHA
    e153571 View commit details

Commits on Jan 17, 2023

  1. Bump version to 1.1.0

    @satkinson
    satkinson committed Jan 17, 2023
    Copy the full SHA
    0a58720 View commit details

  2. container update AWS build spec for main (NOJIRA)

    @skoranda
    skoranda committed Jan 17, 2023
    Copy the full SHA
    60c7973 View commit details

Commits on Feb 6, 2023

  1. container slashRoot preserve symlinks (CO-2599)

    @skoranda
    skoranda committed Feb 6, 2023
    Copy the full SHA
    c4a705f View commit details

Commits on Feb 7, 2023

  1. container update PHP base to 8.1.15

    @skoranda
    skoranda committed Feb 7, 2023
    Copy the full SHA
    b2cf0b1 View commit details

  2. Merge branch 'container-maintenance' into hotfix-1.1.x

    @skoranda
    skoranda committed Feb 7, 2023
    Copy the full SHA
    706a964 View commit details

  3. container add buildspec for hotfix-1.1.x branch

    @skoranda
    skoranda committed Feb 7, 2023
    Copy the full SHA
    21e009e View commit details

Commits on Feb 17, 2023

  1. container update PHP base to 8.1.16

    @skoranda
    skoranda committed Feb 17, 2023
    Copy the full SHA
    f13cb66 View commit details

  2. Merge branch 'container-maintenance' into hotfix-1.1.x

    @skoranda
    skoranda committed Feb 17, 2023
    Copy the full SHA
    e5b9a58 View commit details

Commits on Mar 20, 2023

  1. container update PHP base to 8.1.17

    @skoranda
    skoranda committed Mar 20, 2023
    Copy the full SHA
    9be1fa1 View commit details

  2. container update PHP base to 8.1.17

    @skoranda
    skoranda committed Mar 20, 2023
    Copy the full SHA
    479d6a7 View commit details

Commits on Mar 29, 2023

  1. Add test for whether an "add" link should be included in the index vi… 

    …ew (CO-2585) (#58)
    @arlen
    arlen committed Mar 29, 2023
    Copy the full SHA
    0727b54 View commit details

Commits on Mar 30, 2023

  1. Improve the display of user name in the user menu. (CO-2568) (#60) 

    * Improve the display of user name in the user menu. (CO-2568)

* Minor stylistic cleanup to User Menu (CO-2568)
    @arlen
    arlen committed Mar 30, 2023
    Copy the full SHA
    010a08e View commit details

  2. Fix generation of sequence based identifiers (CO-2623)

    @benno
    benno committed Mar 30, 2023
    Copy the full SHA
    7b2ec6b View commit details
Showing 4,476 changed files with 203,758 additions and 271,089 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions NOTICE
View file
@@ -65,9 +65,9 @@ files and utilities for further information:
Apache 2.0
https://fonts.google.com/icons?selected=Material+Icons

Noto Sans (app/webroot/css/fonts/notosans_*)
SIL Open Font License
https://fonts.google.com/noto/specimen/Noto+Sans
Open Sans (app/webroot/css/fonts/opensans)
Apache 2.0
https://fonts.google.com/specimen/Open+Sans

noty (app/webroot/js/jquery/noty)
MIT License
11 changes: 7 additions & 4 deletions app/composer.json
View file
@@ -6,11 +6,10 @@
"license": "MIT",
"require": {
"php": ">=7.3",
"adodb/adodb-php": "^5.21",
"cakephp/cakephp": "^4.3",
"cakephp/cakephp": "^4.4",
"cakephp/migrations": "^3.2",
"cakephp/plugin-installer": "^1.3",
"components/jquery": "~3.6.0",
"components/jquery": "~3.7",
"doctrine/dbal": "^3.3",
"mobiledetect/mobiledetectlib": "^2.8",
"twbs/bootstrap": "^5.1"
@@ -77,6 +76,10 @@
},
"prefer-stable": true,
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"cakephp/plugin-installer": true
}
}
}