diff --git a/CHANGELOG.md b/CHANGELOG.md index 195232e0..eff4b43d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,14 +40,14 @@ The following logs were generated using `git log v2.2.0..HEAD --pretty=format:"- - Pull request #179: Adding demo with attributes (7e253a0, Bonicillo, Mark A, Wed May 15 22:16:04 2024 +0000) - Pull request #178: Defaults2 (50d890d, Bonicillo, Mark A, Wed May 15 22:10:33 2024 +0000) - Merge branch 'develop' into defaults_backup (1e1c2a1, Brenda Praggastis, Wed May 15 15:04:05 2024 -0700) -- Merge branch 'defaults_backup' of https://stash.pnnl.gov/scm/hyp/hypernetx into defaults_backup (001bc1e, Brenda Praggastis, Wed May 15 15:03:59 2024 -0700) +- Merge branch 'defaults_backup' into defaults_backup (001bc1e, Brenda Praggastis, Wed May 15 15:03:59 2024 -0700) - hypview added user defined props (19707ac, Brenda Praggastis, Wed May 15 13:56:51 2024 -0700) - adding two new tutorials under basic (773fa84, audun myers, Wed May 15 16:50:08 2024 -0400) - Pull request #177: Defaults backup (9516ca8, Bonicillo, Mark A, Wed May 15 20:46:04 2024 +0000) - Update tests (eedba46, Mark Bonicillo, Wed May 15 12:35:47 2024 -0700) - test (a2b8e3c, Brenda Praggastis, Wed May 15 13:18:53 2024 -0700) - created set_defaults (6f17867, Brenda Praggastis, Wed May 15 13:12:56 2024 -0700) -- Merge branch 'defaults' of https://stash.pnnl.gov/scm/hyp/hypernetx into defaults (145581e, Brenda Praggastis, Wed May 15 12:36:47 2024 -0700) +- Merge branch 'defaults' of into defaults (145581e, Brenda Praggastis, Wed May 15 12:36:47 2024 -0700) - removed default_properties_df (0b2ccea, Brenda Praggastis, Wed May 15 12:36:32 2024 -0700) - Update tests (70e52f9, Mark Bonicillo, Wed May 15 12:35:47 2024 -0700) - Update Tutorial 2 - Visualization Methods.ipynb (a71c259, audun myers, Wed May 15 15:26:00 2024 -0400) @@ -62,10 +62,10 @@ The following logs were generated using `git log v2.2.0..HEAD --pretty=format:"- - new glossary (e5d8972, Brenda Praggastis, Wed May 15 10:34:07 2024 -0700) - glossary and classes init updated (9d94a8b, Brenda Praggastis, Wed May 15 09:59:46 2024 -0700) - Pull request #172: Add, update docstrings in hypergraph (27ed0fb, Bonicillo, Mark A, Wed May 15 16:49:55 2024 +0000) -- Merge remote-tracking branch 'stash/develop' into update-hypergraph-docstrings (501247a, Mark Bonicillo, Mon May 13 15:44:03 2024 -0700) +- Merge remote-tracking branch 'develop' into update-hypergraph-docstrings (501247a, Mark Bonicillo, Mon May 13 15:44:03 2024 -0700) - Pull request #174: Add tests for union, intersection; update other tests (75153a2, Bonicillo, Mark A, Mon May 13 22:35:06 2024 +0000) - Add tests for union, intersection; update other tests (1bfe844, Mark Bonicillo, Mon May 13 15:20:48 2024 -0700) -- Merge remote-tracking branch 'stash/develop' into update-hypergraph-docstrings (5622b8e, Mark Bonicillo, Thu May 9 08:54:06 2024 -0700) +- Merge remote-tracking branch 'develop' into update-hypergraph-docstrings (5622b8e, Mark Bonicillo, Thu May 9 08:54:06 2024 -0700) - Pull request #173: Ndarray (55e7321, Bonicillo, Mark A, Thu May 9 06:59:23 2024 +0000) - Fix import error in ndarray factory method (54b6704, Mark Bonicillo, Wed May 8 16:59:28 2024 -0700) - Add ndarray test on constructor; fix docstrings (c515db1, Mark Bonicillo, Wed May 8 16:55:28 2024 -0700) @@ -203,7 +203,7 @@ The following logs were generated using `git log v2.2.0..HEAD --pretty=format:"- - removed old hypergraph code (1e1dbf7, Brenda Praggastis, Mon Apr 1 13:59:16 2024 -0700) - removed .github from .gitignore (3e1c8b6, Brenda Praggastis, Mon Apr 1 13:57:34 2024 -0700) - updated hypergraph from incidence matrix constructor (b9dbc0b, Brenda Praggastis, Fri Mar 29 18:08:47 2024 -0700) -- Merge branch 'develop' of https://stash.pnnl.gov/scm/hyp/hypernetx into develop (d38b2ff, Brenda Praggastis, Wed Mar 27 12:40:53 2024 -0700) +- Merge branch 'develop' into develop (d38b2ff, Brenda Praggastis, Wed Mar 27 12:40:53 2024 -0700) - removing notebooks not intended for sharing (126610b, Brenda Praggastis, Wed Mar 27 12:40:32 2024 -0700) - Pull request #145: Add HNX paper (d0a7e3d, Bonicillo, Mark A, Wed Mar 27 19:12:05 2024 +0000) - Add HNX paper (463d12f, Mark Bonicillo, Wed Mar 27 12:10:07 2024 -0700)