Commit Graph

22 Commits (d064876d16f930bc960c05346656980a4ac43dfb)

Author SHA1 Message Date
Hunter Trujillo 7664808e55 Update prettier formatting and update ESLint rules to match. 2017-06-07 10:12:40 -06:00
Luke Morris 3e6220aa6a Merge branch 'master' into feature/template-variables 2017-04-28 13:12:57 -07:00
Alex P 7221832106 Merge branch 'master' into feature/template-varmojis
The rebase to end all rebases
2017-04-25 17:06:08 -07:00
Andrew Watkins f042b26e34 Remove jsx-indent-props from eslintrc 2017-04-25 15:38:58 -07:00
Andrew Watkins 2efda22838 Remove prettier indentation conflicts 2017-04-24 18:02:17 -07:00
Jade McGough 18d6303b8b prefer single quotes in eslintrc 2017-04-21 12:42:05 -07:00
Hunter Trujillo cbb1dea764 Fix linter errors. 2017-04-17 14:01:16 -06:00
Hunter Trujillo cd8df84db8 The line must be drawn here. This far, no further. 2017-03-29 14:03:52 -06:00
Jared Scheib 4e2617ea24 Merge branch 'master' into feature/admin
Conflicts:
	CHANGELOG.md
	enterprise/users.go
	server/admin.go
	server/admin_test.go
	ui/.eslintrc
	ui/src/shared/constants/index.js
	ui/src/store/configureStore.js
	ui/src/style/theme/theme-dark.scss
2017-03-10 18:36:37 -08:00
Andrew Watkins 43fb06285b Update linter to allow console.error 2017-03-09 14:43:17 -08:00
Andrew Watkins f22b81ced5 Update eslintrc 2017-03-02 09:51:17 -08:00
Hunter Trujillo 4997463229 Add Users container page. 2017-02-28 14:16:37 -07:00
Tim Raymond 38c9abc1c9 Merge branch 'master' into feature/oauth-google
Conflicts:
	server/dashboards.go
	server/server.go
	ui/.eslintrc
	ui/src/index.js
2017-02-23 18:13:39 -05:00
Hunter Trujillo 55d81c58b9 Add presentation mode Redux logic. Add handlers to SideNav. 2017-02-22 11:05:19 -06:00
Hunter Trujillo b1416ed1da Refactor DashboardHeader out from DashboardPage, HostPage, and KubernetesDashboard, 2017-02-22 11:05:19 -06:00
Hunter Trujillo 65ea9e2ddb Revert "Refactor DashboardHeader out from DashboardPage, HostPage, and KubernetesDashboard."
This reverts commit 77a8ed80a2.
2017-02-16 11:43:56 -07:00
Hunter Trujillo 77a8ed80a2 Refactor DashboardHeader out from DashboardPage, HostPage, and KubernetesDashboard. 2017-02-16 10:59:08 -07:00
Hunter Trujillo d87a3350f3 Add resource and id methods to AJAX method to access link URLs. 2017-02-13 13:19:34 -07:00
Hunter Trujillo cf40630113 Closer to the goal! 2017-01-04 16:02:12 -08:00
Andrew Watkins cab1a37740 Move old enterpirse code into archive 2016-11-08 14:50:41 -08:00
Will Faurot 16056bd8ad Update eslint rules
I did away with the private module for now, it was causing more issues
than were worth the effort IMO. No reason it can't come back as the org
grows and we want to have consistent code style across apps.
2016-09-20 11:49:57 -07:00
Will Piers d7ae615e37 Bring over enterprise ui and configuration
Signed-off-by: Andrew Watkins <watts@influxdb.com>
2016-09-19 13:45:05 -07:00