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.

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

Updating our fork #1

Merged
merged 33 commits into from
Oct 14, 2020
Merged

Updating our fork #1

merged 33 commits into from
Oct 14, 2020

Conversation

agstephens
Copy link
Member

No description provided.

watucker and others added 30 commits March 11, 2019 14:02
* Adding CEDA slcs service as a new Authomatic oauth2 provider.

* Resolved pep8 issues
* added jquery 3.4.0
* update bootstrap 3.4.1
* fixed jquery dependency
* update to dev version

* skipped supervisor view
* removed wizard
* removed solrsearch
* removed pycsw catalog
* clean up profiles/reqs
* removed esgf cert from profile
* removed esgf cert_ok warning
* cleaned up ldap
* clean up buildout config
* update zc.buildout
* pep8
* update pyramid, cleanup makefile

* clean up profile

* fix py3 exception message

* use released twitcher 0.4.0
* Added CEDA OAuth info to phoenix.ini

* Added CEDA OAuth settings so buildout config
Fixes issue of CEDA OAuth users not having user_id/login_id
* Changed pyramid templates to use asset specification

* Fixes for pep8 line length
Changed process list so version appears on the side
* minimal phoenix with keycloak support
@agstephens agstephens merged commit 959fe41 into cedadev:master Oct 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants