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

Search #48

Open
wants to merge 125 commits into
base: main
Choose a base branch
from
Open

Search #48

wants to merge 125 commits into from

Conversation

EdblackGitHub
Copy link

Description: Describe in a couple of sentences how this pull request modifies the repository. Comment on the business context, and highlight any concerns about the changes being introduced.

Issue: Provide the URL for a corresponding issue/work ticket, if applicable.

Dependencies: List dependencies on open pull requests, other issue/work tickets, etc.

Merge Deadline: Indicate the merge deadline date.

Pre-Merge Checklist:

  • I have ensured this code follows the style guidelines of this project.
  • [ X] I have performed a comprehensive self-review of the code.
  • [ X] I have included comments clarifying hard-to-understand areas of the code.
  • I have updated the documentation corresponding to my change(s).
  • I have confirmed the code executes properly on my local environment.
  • I have confirmed all new/modified data models are structured correctly.
  • I have included all necessary database migration files.
  • I have verified that all new and existing tests pass.
  • I have received approval from the requisite number of reviewers.
  • I have squashed all working commits into as few final commits as reasonably possible.
  • I have confirmed Github reports all automated tests/checks are passing.

Post-Merge Checklist:

  • Delete working branch @ Github repository
  • Pull latest master branch to local repository
  • Delete working branch @ local repository

bayfaub and others added 30 commits October 1, 2024 20:54
@bayfaub
ERM-462: initial push
15d7c4f
@bayfaub
fixed export
a4fc20e
@bayfaub
ERM-462: added custom csv upload form
121e480
@bayfaub
ERM-462 updated django admin to allow for CSV upload and export
84306a3
@bayfaub
manually copied and pasted all ERM-477 code
f53a5c7
@bayfaub
found missing files
64f424c
@bayfaub
changed redirect on upload
e37f208
@luis-adl
Prevent json or xml export if no data
6e69816 
Prevent non-csv files to be uploaded
Dynamically redirect on upload
@luis-adl
Update missing rows and columns logic
55b9778
@luis-adl
Code refactor
c9e6b78 
* Implement exceptions
* Dynamic required columns
* Split into smaller funcs
@bayfaub
updated requirements.txt
c1e4613
@bayfaub
added missing forms
560de38
@bayfaub
unit tests
ae54d45
@bayfaub
updated docker compose
06249d4
@adl-trey
minor compose changes to allow local dev
f021a4c
@bayfaub
updated gitignore
baf46d6
@bayfaub
neoterm tests
21dbd64
@bayfaub
neoterm view tests
3f60839
@EdblackGitHub
ERM-477: Added changes to the views.py, test.py and model.py for UID …
be82a33 
…generation. Added updated to LCV term and language sets
@EdblackGitHub
ERM-477: updated hex padding of counter, ensure the counter is not re…
368e466 
…set after the app is restarted and updated the Tests.py to refelect the new changes
@EdblackGitHub
ERM-477: changes to reflect hex counting, and LangaugeSet now is a No…
61e8c36 
…de and not a model.
@EdblackGitHub
ERM-477: Updates to potnetially add upstream/downstream. This code is…
029ea2a 
… commented out until it is needed.
@adl-trey
syntax cleanup
86138c8
@vbhayden
Merge pull request #4 from adlnet/ERM-462
f13e5b9 
ERM-462 - CSV Language Set Upload and Export via JSON and XML
@EdblackGitHub
ERM-477: Added the add_term, get_term to the LangaugeSet and the appr…
211500a 
…opiate Test in the tests.py
@EdblackGitHub
ERM-477: updated the Provider and LCVTerms into Structure Nodes
cf7d262
@EdblackGitHub
ERM-477 Updated to UIDCounter to be a DjangoNode and admin page
5c18989
@EdblackGitHub
ERM-477: update num_children
b62e67c
@EdblackGitHub
ERM-477 updates
f180778
@EdblackGitHub
ERM-477: syntax updates
ca2304d
vbhayden and others added 20 commits November 15, 2024 14:46
@vbhayden
Merge pull request #9 from adlnet/uid-merge
f8ba2cf 
Merging the UID work into Main
@vbhayden
Merge branch 'main' into deconfliction
6411036
@bayfaub
Merge branch 'main' into ccv-rubric-22---moderate-atomicity
0a71ceb
@adl-trey
adding sanity check for django provider existence
2eeb671
@bayfaub
added deprecated flag
49d74a4
@bayfaub
added deprecate option to non-atomic definitions and updated deconfli…
f084255 
…ction page
@EdblackGitHub
update
5efde40
@bayfaub
Merge pull request #12 from adlnet/ccv-rubric-22---moderate-atomicity
6a601da 
Display non-atomic definitions on deconfliction page
@bayfaub
fixed collision issue
d3e90ed
@bayfaub
merge in main
f08fd84
@EdblackGitHub
Merge branch 'main' of https://github.com/adlnet/LDSS-XSS
744abda
@adl-trey
Revert "Merge branch 'main' of https://github.com/adlnet/LDSS-XSS"
308959a 
This reverts commit 744abda, reversing
changes made to 5efde40.
@adl-trey
adding the changes we lost from merge reversion
6a20b6f
@vbhayden
Merge pull request #15 from adlnet/delete-bad-merge
b8cedd2 
Revert "Merge branch 'main' of https://github.com/adlnet/LDSS-XSS"
@vbhayden
Merge pull request #13 from adlnet/deconfliction
89b292c 
Collision handling work
@EdblackGitHub
Create search.html
66296eb 
Search.html
@EdblackGitHub
Update urls.py
b3eab71 
added search and create alias
@EdblackGitHub
Update views.py
09f6c75 
With search and alias
@EdblackGitHub
Update models.py
1066542
@EdblackGitHub
Update forms.py
5eeb9ca
@EdblackGitHub
Copy link
Author

Made in error

@EdblackGitHub EdblackGitHub reopened this Dec 5, 2024
EdblackGitHub and others added 7 commits December 10, 2024 13:43
@EdblackGitHub
Create create_alias.html
5536e79
@EdblackGitHub
Update views.py
e3bfc0c 
Updated views.py for alias with/without context and using Neoalias. Commend old working code.
@EdblackGitHub
Update forms.py
0e78368 
Updated Forms.py to include new NeoAlias changes.
@EdblackGitHub
Update models.py
0325f7a 
Updated models.py to manage the linking NeoAlias, NeoTerm and NeoContext even if context is not provided default to first available NeoTerm. THis is now handled by the addition of the NeoAliasManager class.
@bayfaub
fixed search, alias without context still broken
d71e01b
@bayfaub
updated term creation form to allow for NeoAlias without context, hid…
f67e319 
… general search feature
@bayfaub
moved search from uid to core and added nav button for search
80ccd06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@EdblackGitHub @bayfaub @luis-adl @adl-trey @vbhayden