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

feature/refetch: update branch #249

Merged
merged 40 commits into from
Dec 12, 2019
Merged

feature/refetch: update branch #249

merged 40 commits into from
Dec 12, 2019

Conversation

Forfold
Copy link
Contributor

@Forfold Forfold commented Dec 3, 2019

  • Identified the issue which this PR solves.
  • Read the CONTRIBUTING document.
  • Code builds clean without any errors or warnings.
  • Added appropriate tests for any new functionality.
  • All new and existing tests passed.
  • Added comments in the code, where necessary.
  • Ran make check to catch common errors. Fixed any that came up.

Description:
Updates feature branch with latest from master. Addresses conflict on proptypes.

Forfold and others added 20 commits November 25, 2019 13:53
* show errors on failure for user overrides

* show field errors properly

* remove redundant icon props

* update userErrors array to be more understandable
* update gqlgen

* remove old alertlog.Entry interface

* rename rawentry -> entry.go

* update playground and set Referrer-Policy

* return validation error on CM not found

* set content-type on graphql requests

* set content-type in cypress graphql calls

* update direct deps
* add makefile commands for building test bundle

* always "bundle" dist binaries
* Fix bug in schedule shifts list to begin on current day
* upgrade @hot-loader/react-dom @material-ui/core @material-ui/icons @types/luxon connected-react-router

* upgrade history luxon mdi-material-ui husky

* upgrade react react-dom react-ga react-router-dom terser-webpack-plugin ts-loader typescript webpack webpack-dev-server

* oops, forgot the lockfile

* WIP: convert speed dial to hooks, upgrade pkg

* style tooltip labels

* stop reversing every actions array

* update speed dial tests

* combine selectors

* upgrade @material-ui/lab

* bundle

* Revert "stop reversing every actions array"

This reverts commit 41cd2fe.

* remove comments of perplexion

* upgrade @material-ui/lab

* use the handle naming convention set by jsx-handler-names

* makeStyles with obj

* inline w anonymous funs
* don't use FormDialog for url-provided-error dialog

* getServiceLabel util & unit test

* add additional test cases

* new create alert flow

Co-Authored-By: Nathaniel Caza <[email protected]>
* add retry plugin for console output in CI

* add plugin for CI
* run gofmt with -s

* fix spelling mistakes
# Conflicts:
#	web/src/app/dialogs/FormDialog.js
arurao
arurao previously approved these changes Dec 3, 2019
@mastercactapus mastercactapus changed the base branch from master to feature/refetch-fixes-2 December 3, 2019 18:31
mastercactapus and others added 8 commits December 4, 2019 12:21
* update direct deps

* run tidy
* update direct deps

* run tidy

* ignoring cypress 3.7.0
* handle future start time in Rotation.EndTime method

* add unit test for rotation future start time

* remove old redundant comments
…t methods (#251)

* Disable Add Notification Rule speed dial option if there are no Contact Methods
Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.5.0 to 1.6.1.
- [Release notes](https://github.com/spf13/viper/releases)
- [Commits](spf13/viper@v1.5.0...v1.6.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>
dependabot-preview bot and others added 12 commits December 9, 2019 11:02
* pause and delays between digits

* verbose message for voice verification codes

* increase timeout for voice message responses
* build(deps-dev): bump file-loader from 4.3.0 to 5.0.2 in /web/src

Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.3.0 to 5.0.2.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/file-loader@v4.3.0...v5.0.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* build(deps-dev): bump file-loader from 4.3.0 to 5.0.2 in /web/src

Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.3.0 to 5.0.2.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/file-loader@v4.3.0...v5.0.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* build(deps-dev): bump file-loader from 4.3.0 to 5.0.2 in /web/src

Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.3.0 to 5.0.2.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/file-loader@v4.3.0...v5.0.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* require logo -> import logo

* requires -> imports
@Forfold Forfold merged commit 7ab76bb into feature/refetch-fixes-2 Dec 12, 2019
@Forfold Forfold deleted the update branch December 12, 2019 19:36
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.

6 participants