Skip to content

Merge Bootstrap Upgrade in to Develop #50

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
Draft
orangewolf wants to merge 290 commits into
base: develop
Choose a base branch
from
Draft

Merge Bootstrap Upgrade in to Develop #50

orangewolf wants to merge 290 commits into from

Conversation

@orangewolf
Copy link

@orangewolf orangewolf commented Sep 9, 2022

No description provided.

summer-cook and others added 30 commits August 25, 2022 11:42
@summer-cook
fix styles for confirmation modal
e750964
@summer-cook
fix typo from rebase
dc5a166
@summer-cook
make sure correct styles are pulling in to login page
d5f6ebd
@summer-cook
fix advanced search container and 2 navbars
df99ae1
@summer-cook
fixes collection managment page and table responsiveness
37969c0
@summer-cook
fix digital objects view page, and buttons
576902d
@summer-cook
upgrade bootstrap, fix errors with mixins, add to readme, add bundle …
cd2c868 
…command for public
@summer-cook
add console and update commands for public, rip out rubyrhino
da8da8f
@summer-cook
add update command to readme
d0efba9
@summer-cook
fix LCNAF plugins settings page
d00c2b7
@summer-cook
multiple tickets - adding classes for bs-upgrade
99c6446
@summer-cook
update readme with git flow instructions
2878ed8
@summer-cook
add BS classes to agents view page
7221d51
@summer-cook
fix merge dropdowns for agents and subjects page
7214cf1
@summer-cook
fix preview merge and merge agents comparison page
a811a1b
@summer-cook
Merge pull request #31 from notch8/agents-pages
65b4921 
Agents pages
@summer-cook
temporary fix for modal issue
44df9de
@summer-cook
Merge pull request #32 from notch8/temporary-fix-for-modal-overlay
59f9751 
temporary fix for modal issue
@summer-cook
batch find and replace
04081b9
@summer-cook
fix background jobs create report page
bfefde4
@summer-cook
Merge pull request #33 from notch8/background-jobs-bs4
814b5bc 
Background jobs pages bs4
@summer-cook
fix create agent person form
e50d939
@summer-cook
update readme
6627019
@summer-cook
Merge pull request #35 from notch8/update-readme-2
586a31c 
Update readme for interns
@summer-cook
merge in create agents branch
382a21c
@summer-cook
Merge pull request #36 from notch8/agents-pages
91b6e70 
fix agents edit page
@summer-cook
batch locations and single location
f633684
@summer-cook
classifications new
474e0d6
@summer-cook
fix event create page
57062eb
@summer-cook
fix classifications dropdown
abfb912
summer-cook and others added 30 commits November 11, 2022 19:31
@summer-cook
update around the agent labels. may fix other areas as well
39e576f
@summer-cook
fix some feature specs
efb1bd4
@orangewolf
fix whitespace
bf817aa
@summer-cook
more work to fix translation issues
4e538c6
@orangewolf
Merge pull request #73 from notch8/jquery-upgrade
1624493 
use jquery3, include migrate plugin, fix tree issues
@orangewolf
Merge branch 'master' into translation_fixes_yes_more
bec5160
@summer-cook
work to get agent notes working
f022fbf
@summer-cook
latin no longer apprivated fix
0179e53
@summer-cook
error translation update
1265b8c
@summer-cook
fix submit on note spec
666b77b
@summer-cook
some translations got fixed
1348f3c
@summer-cook
fix accessions skip
6b34a99
@orangewolf
Merge pull request #76 from notch8/agent_notes
b831719 
Get agent note specs working
@summer-cook
more resource spec fixes
b5b26af
@orangewolf
Merge pull request #77 from notch8/accessions
c9d27cb 
fix accessions skip
@orangewolf
Merge branch 'master' into translation_fixes_yes_more
9b97be6
@summer-cook
trying to fix instance and container specs
0e197b0
@summer-cook
instances and containers spec, find the name after edit
d0393be
@summer-cook
attempt at frontend feature resources spec
04ceb90
@summer-cook
remove binding
1005e3c
@orangewolf
Merge pull request #78 from notch8/instances_specs
ad9e75b 
working on instances and container specs
@summer-cook
give both frontend jobs a shot at being green
6e22e1b
@summer-cook
fix whitespace
e302124
@summer-cook
fix up rde template specs, fix template dropdown
ca46e7d
@summer-cook
clean up whitespace
758125f
@summer-cook
put pending back on last resource spec
66a755c
@summer-cook
whitespace
9f94c4b
@summer-cook
Merge remote-tracking branch 'origin/resource_specs' into translation…
01ffc67 
…_fixes_yes_more
@summer-cook
more whitespace
ad65d5d
@orangewolf
Merge pull request #75 from notch8/translation_fixes_yes_more
8f27c8c 
update around the agent labels. may fix other areas as well
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

@orangewolf @summer-cook @AKFosterDev @arnoldc94 @DiemBTran