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

Dev to Master #617

Merged
merged 25 commits into from
May 15, 2020
Merged

Dev to Master #617

merged 25 commits into from
May 15, 2020

Conversation

adamkendis
Copy link
Member

  • Up to date with dev branch
  • Branch name follows guidelines
  • All PR Status checks are successful
  • Peer reviewed and approved

Any questions? See the getting started guide

adamkendis and others added 25 commits May 7, 2020 12:41
@adamkendis
Fixed data vis error resulting from a query with zero results.
6c4fb33
@jmensch1
Merge pull request #600 from adamkendis/590-FRONT-bugFixes
b415a97 
Fixed data vis error resulting from a query with zero results.
@jmensch1
isolated db in its own module
d117590
@jmensch1
added server/src to python path
9f1cfce
@jmensch1
removed DataService constructor and updated services that use the Dat…
bc8f805 
…aService
@jmensch1
updated dataservice test
6567fbf
@sellnat77
Merge pull request #601 from hackforla/550-BACK-PersistingDBConnections
65963ac 
isolated db in its own module
@jmensch1
removed arg to DataService constructor in /apistatus
db065e3
@jmensch1
converted DataService to pandas
6bdc330
@jmensch1
map and vis views
ad2a7fd
@jmensch1
handling null fields or filters in dataservice.query
a9511e2
@jmensch1
Merge pull request #602 from hackforla/BACK-MaterializedViews
d89c848 
reading in pandas/materialized views
@jmensch1
metadata table with last_pulled populated during ingest
c3041b5
@sellnat77
Merge pull request #603 from hackforla/594-BACK-LastPulledDate
19e3109 
metadata table with last_pulled populated during ingest
@jmensch1
/visualizations and /comparison endpoints working
45db20f
@jmensch1
frontend integration
1c2bb40
@jmensch1
deleted unused endpoints and their supporting services
f39aaa2
@jmensch1
updated tests
4423b5a
@jmensch1
linting
e6d78b1
@adamkendis
Removed devcheck and basename from App and Router.
4587ef9
@adamkendis
Removed BASE_URL from orchestration files.
f27ccde
@jmensch1
minor tweaks
0a676f1
@jmensch1
Merge pull request #607 from adamkendis/514-FRONT-routerFix
fd0277a 
React Router basename fix
@jmensch1
Merge branch 'dev' into 605-BACK-EndpointConsolidation
37ace7f
@jmensch1
Merge pull request #606 from hackforla/605-BACK-EndpointConsolidation
033c14c 
endpoint consolidation
@adamkendis adamkendis requested a review from jmensch1 May 15, 2020 04:18
jmensch1
jmensch1 approved these changes May 15, 2020
View reviewed changes
Copy link
Contributor

@jmensch1 jmensch1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is amazing code

@jmensch1 jmensch1 merged commit 2a8df09 into master May 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmensch1 jmensch1 jmensch1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adamkendis @jmensch1 @sellnat77