Merge Develop into master #43
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* develop: Added news and updates to dropdown
* develop: Removed carousel from git ignore Adjusted news and updates spacing Added admin description Adjust whats new spacing Added staff directory to quick links Added box shadow to carousel Updated gitignore for carousel images Updated gitignore for carousel Better tag formatting for view post Added temp admin description Updated admin name for our mission apge Updated divison constants Added temp description for administration
Feature/IN-118: Local Auth Functionality
Feature/IN-119: NYC.ID Authentication
Feature/IN-114: Orientation Video
* origin/develop: Fixed timestamp Added orientation video page Fixed typo in tags list
Bugfix/IN-125: Intake Form Overwrites Business Owner Information
|
This pull request introduces 8 alerts when merging 57497bc into 0178a1f - view on LGTM.com new alerts:
This project has automated code review enabled, but doesn't use the LGTM GitHub App. Migrate over by installing the app. Read about the benefits of migrating to GitHub Apps in the blog. Comment posted by LGTM.com |
IT Support Page Updates
added a new table on the database using alembic created a new ping command intended to be used in a cron job added and email to be sent to notify application support when a website goes down
…Monitor * origin/Intranet-Monitor: Added 12hr time zone.
…nd fixed modal body text overflow
Intranet monitor
… develop * 'develop' of https://github.com/nycrecords/intranet: Uptime monitor code cleanup Made correction to image sizing and added warning signs. Requiring super user role to access monitor page Moved page refresh rate and request timeout to environment variable and fixed modal body text overflow Fixed issue with modal not updating on POST and refacting AJAX success code Added 12hr time zone. Display EST in frontend instead of GMT Changing database timestamps to use utc Fixed issue where clicking on hyperlink also opened modal Linked together monitor frontend and backend Added monitor page front end WIP Added backend VIEW and AJAX functions to monitor a given set of websites added a new table on the database using alembic created a new ping command intended to be used in a cron job added and email to be sent to notify application support when a website goes down
Staff Directory Update
…cuments Documents Tab and Quick Links Update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges the latest version of the Intranet into develop.
Going forward we plan to have Master always ready to deploy into Production, and use Develop to do work.