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: tzeller/match
base: master
Choose a base ref
...
head repository: COmanage/match
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Sep 21, 2018

  1. Copy the full SHA
    a584671 View commit details

Commits on Sep 25, 2018

  1. Add schema.xml file

    Benn Oshrin committed Sep 25, 2018
    Copy the full SHA
    ecee7a1 View commit details

Commits on Oct 1, 2018

  1. Copy the full SHA
    ad15300 View commit details

Commits on Oct 3, 2018

  1. API authz and other fixes

    Benn Oshrin committed Oct 3, 2018
    Copy the full SHA
    c61e66b View commit details
  2. Merge commit

    Benn Oshrin committed Oct 3, 2018
    Copy the full SHA
    8f79280 View commit details

Commits on Oct 29, 2018

  1. Various fixes, including for API access and rendering foreign keys in…

    … index views
    Benn Oshrin committed Oct 29, 2018
    Copy the full SHA
    2af824e View commit details

Commits on Nov 16, 2018

  1. Improve session handling, and other minor fixes

    Benn Oshrin committed Nov 16, 2018
    Copy the full SHA
    66d7f96 View commit details

Commits on Nov 25, 2018

  1. Improve SOR handling over API (NOJIRA)

    Benn Oshrin committed Nov 25, 2018
    Copy the full SHA
    f4dbca7 View commit details

Commits on Nov 26, 2018

  1. Copy the full SHA
    4d81c95 View commit details

Commits on Dec 9, 2018

  1. Implement Sequence Reference ID Service (CO-1676)

    Benn Oshrin committed Dec 9, 2018
    Copy the full SHA
    e17d86c View commit details

Commits on Dec 22, 2018

  1. Code cleanup

    Benn Oshrin committed Dec 22, 2018
    Copy the full SHA
    5693b8c View commit details

Commits on Jan 14, 2019

  1. Fix deletion dependencies (NOJIRA)

    Benn Oshrin committed Jan 14, 2019
    Copy the full SHA
    6be06a2 View commit details

Commits on Jan 15, 2019

  1. Various fixes (NOJIRA)

    Benn Oshrin committed Jan 15, 2019
    Copy the full SHA
    7ff1b1d View commit details
  2. Various fixes (NOJIRA)

    Benn Oshrin committed Jan 15, 2019
    Copy the full SHA
    708acf6 View commit details

Commits on Feb 17, 2019

  1. Convert Match to DBAL for schema management (CO-1711)

    Benn Oshrin committed Feb 17, 2019
    Copy the full SHA
    dd06c07 View commit details

Commits on Feb 27, 2019

  1. Copy the full SHA
    ec552bb View commit details

Commits on Mar 8, 2019

  1. Copy the full SHA
    531982d View commit details
  2. Copy the full SHA
    b40c35d View commit details
  3. Table unit tests (CO-1716)

    tzeller committed Mar 8, 2019
    Copy the full SHA
    8764496 View commit details
  4. Copy the full SHA
    d1383b0 View commit details
  5. Remove TODOs (CO-1716)

    tzeller committed Mar 8, 2019
    Copy the full SHA
    e2ccede View commit details
  6. Copy the full SHA
    0c59988 View commit details

Commits on Mar 21, 2019

  1. Treat attribute names as case-insensitive for result management (CO-1…

    …715)
    Benn Oshrin committed Mar 21, 2019
    Copy the full SHA
    57bc7cb View commit details
  2. Merge branch 'develop' of github.internet2.edu:COmanage/match into de…

    …velop
    Benn Oshrin committed Mar 21, 2019
    Copy the full SHA
    ce366fd View commit details

Commits on Mar 27, 2019

  1. Copy the full SHA
    a3938e3 View commit details

Commits on Mar 28, 2019

  1. Copy the full SHA
    b19c82e View commit details

Commits on Apr 12, 2019

  1. Full update to Match UI to upgrade all libraries (including a move a …

    …way from MDL which is end-of-life). Insure baseline WCAG AA conformance. General clean up and UI refactoring. (CO-1662)
    arlen committed Apr 12, 2019
    Copy the full SHA
    be73364 View commit details

Commits on Apr 17, 2019

  1. Copy the full SHA
    10c593c View commit details

Commits on Jun 23, 2019

  1. Implement pagination (CO-1764)

    Benn Oshrin committed Jun 23, 2019
    Copy the full SHA
    77eebad View commit details
  2. Additional commit for CO-1764

    Benn Oshrin committed Jun 23, 2019
    Copy the full SHA
    ab4b5b7 View commit details
  3. Copy the full SHA
    778cba1 View commit details
  4. Implement search modifiers (CO-1692)

    Benn Oshrin committed Jun 23, 2019
    Copy the full SHA
    8fcd59a View commit details
  5. Implement attribute mappings (CO-1759)

    Benn Oshrin committed Jun 23, 2019
    Copy the full SHA
    e5ad581 View commit details

Commits on Jul 22, 2019

  1. Fix handling of required attribute (CO-1770)

    Benn Oshrin committed Jul 22, 2019
    Copy the full SHA
    307c9da View commit details
  2. Fix tracking of successful rules (CO-1772)

    Benn Oshrin committed Jul 22, 2019
    Copy the full SHA
    0186fca View commit details

Commits on Jul 23, 2019

  1. Fix handling of case insensitive searches (CO-1777)

    Benn Oshrin committed Jul 23, 2019
    Copy the full SHA
    7498f51 View commit details
  2. Copy the full SHA
    29c027b View commit details

Commits on Jul 29, 2019

  1. Copy the full SHA
    cbf75fd View commit details
  2. Further fix up pagination styles and interactions for Cake 3 - specif…

    …ically fix up page size form control (CO-1764)
    arlen committed Jul 29, 2019
    Copy the full SHA
    ff65d27 View commit details

Commits on Aug 22, 2019

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

    …velop
    Benn Oshrin committed Aug 22, 2019
    Copy the full SHA
    e2cda85 View commit details
  2. Bump copyright

    Benn Oshrin committed Aug 22, 2019
    Copy the full SHA
    1df6313 View commit details

Commits on Aug 23, 2019

  1. Fix handling of primary link in breadcrumbs (CO-1766)

    Benn Oshrin committed Aug 23, 2019
    Copy the full SHA
    3aa01b9 View commit details

Commits on Aug 25, 2019

  1. Additional commit for CO-1766

    Benn Oshrin committed Aug 25, 2019
    Copy the full SHA
    c724080 View commit details

Commits on Sep 9, 2019

  1. Additional commit for CO-1766

    Benn Oshrin committed Sep 9, 2019
    Copy the full SHA
    3167474 View commit details

Commits on Sep 10, 2019

  1. Update CakePHP to v3.8.3 (NOJIRA)

    Benn Oshrin committed Sep 10, 2019
    Copy the full SHA
    7dcb3d4 View commit details
  2. Improve validation of field names associated with SQL identifiers (CO…

    …-1767)
    Benn Oshrin committed Sep 10, 2019
    Copy the full SHA
    09d26bf View commit details

Commits on Sep 13, 2019

  1. Clear deprecations

    Benn Oshrin committed Sep 13, 2019
    Copy the full SHA
    a362dd5 View commit details

Commits on Sep 14, 2019

  1. Fix type casting (NOJIRA)

    Benn Oshrin committed Sep 14, 2019
    Copy the full SHA
    8967180 View commit details

Commits on Sep 15, 2019

  1. Fix handling of matchgrid_id for Platform Administrator permission (C…

    …O-1768)
    Benn Oshrin committed Sep 15, 2019
    Copy the full SHA
    05569cf View commit details

Commits on Oct 29, 2019

  1. Initial implementation of Matchgrid Settings (CO-1803)

    Benn Oshrin committed Oct 29, 2019
    Copy the full SHA
    38c4048 View commit details
Showing 7,393 changed files with 1,100,490 additions and 0 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
49 changes: 49 additions & 0 deletions .gitignore
@@ -1,3 +1,52 @@
# CakePHP 4
# User specific & automatically generated files #
#################################################
/build
/dist
/tags
/composer.lock
/phpunit.xml
/vendor
/vendors
/composer.phar
*.mo
debug.log
error.log
.phpunit.result.cache

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db

# Tool specific files #
#######################
# vim
*~
*.swp
*.swo
# sublime text & textmate
*.sublime-*
*.stTheme.cache
*.tmlanguage.cache
*.tmPreferences.cache
# Eclipse
.settings/*
/.project
/.buildpath
# JetBrains, aka PHPStorm, IntelliJ IDEA
.idea/*
# NetBeans
nbproject/*
# Visual Studio Code
.vscode

# CakePHP 3

/vendor/*
202 changes: 202 additions & 0 deletions LICENSE
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
76 changes: 76 additions & 0 deletions NOTICE
@@ -0,0 +1,76 @@
COmanage Match

Copyright (C) 2018-2022
University Corporation for Advanced Internet Development, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this software except in compliance with the License.
You may obtain a copy of the License at:

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

---------------------------------------------------------------------------

This material is based upon work supported by the National Science
Foundation under Grant No. OCI-0721896, OCI-0330626, OCI-1032468,
and ACI-1547268. Any opinions, findings and conclusions or recommendations
expressed in this material are those of the author(s) and do not
necessarily reflect the views of the National Science Foundation (NSF).

---------------------------------------------------------------------------

Contributions with original copyright held by, and copyright license granted
to the University Corporation for Advanced Internet Development, Inc. as per
the Contributor License Agreement by,

Spherical Cow Group
https://sphericalcowgroup.com

The University of California, San Diego
https://ucsd.edu

This project uses the following third party utilities, see the appropriate
files and utilities for further information:

CakePHP (lib/Cake)
MIT License
http://cakephp.org

ADOdb (app/vendor/adodb)
BSD 3-Clause License
http://adodb.org

Doctrine DBAL (app/vendor/doctrine/dbal)
https://www.doctrine-project.org/projects/dbal.html

Bootstrap (app/webroot/js/bootstrap)
MIT License
https://getbootstrap.com/

jQuery (app/webroot/js/jquery)
MIT License
http://jquery.com

JavaScript Cookie (app/webroot/js/js-cookie)
MIT License
https://github.com/js-cookie/js-cookie

Material Icons (app/webroot/css/fonts/material-icons)
Apache 2.0
https://fonts.google.com/icons?selected=Material+Icons

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
http://ned.im/noty

---------------------------------------------------------------------------
12 changes: 12 additions & 0 deletions README.md
@@ -0,0 +1,12 @@
# COmanage Match

COmanage Match is a utility for identifying potential duplicate records from multiple authoritative
systems. COmanage Match is a product of the COmanage Project.

More information is available in the [COmanage wiki](https://spaces.at.internet2.edu/display/COmanage),
including

- [Technical Manual](https://spaces.at.internet2.edu/display/COmanage/COmanage+Match+Technical+Manual)
- [Product Roadmap](https://spaces.at.internet2.edu/display/COmanage/COmanage+Product+Roadmap)
- [Email Lists](https://spaces.at.internet2.edu/display/COmanage/Email+Lists)
- [Issue Tracker](https://bugs.internet2.edu/jira/projects/CO)
51 changes: 51 additions & 0 deletions app/README.md
@@ -0,0 +1,51 @@
# CakePHP Application Skeleton

[![Build Status](https://img.shields.io/travis/cakephp/app/master.svg?style=flat-square)](https://travis-ci.org/cakephp/app)
[![License](https://img.shields.io/packagist/l/cakephp/app.svg?style=flat-square)](https://packagist.org/packages/cakephp/app)

A skeleton for creating applications with [CakePHP](https://cakephp.org) 3.x.

The framework source code can be found here: [cakephp/cakephp](https://github.com/cakephp/cakephp).

## Installation

1. Download [Composer](https://getcomposer.org/doc/00-intro.md) or update `composer self-update`.
2. Run `php composer.phar create-project --prefer-dist cakephp/app [app_name]`.

If Composer is installed globally, run

```bash
composer create-project --prefer-dist cakephp/app
```

In case you want to use a custom app dir name (e.g. `/myapp/`):

```bash
composer create-project --prefer-dist cakephp/app myapp
```

You can now either use your machine's webserver to view the default home page, or start
up the built-in webserver with:

```bash
bin/cake server -p 8765
```

Then visit `http://localhost:8765` to see the welcome page.

## Update

Since this skeleton is a starting point for your application and various files
would have been modified as per your needs, there isn't a way to provide
automated upgrades, so you have to do any updates manually.

## Configuration

Read and edit `config/app.php` and setup the `'Datasources'` and any other
configuration relevant for your application.

## Layout

The app skeleton uses a subset of [Foundation](http://foundation.zurb.com/) (v5) CSS
framework by default. You can, however, replace it with any other library or
custom styles.