Commit Graph

22 Commits (59e184b1f192764496f01345c34ac3e5e7ad01d4)

Author SHA1 Message Date
Hunter Trujillo e79c76f5a6 Update prettier formatting and update ESLint rules to match. 2017-06-07 10:12:40 -06:00
Luke Morris 7dafbadad5 Merge branch 'master' into feature/template-variables 2017-04-28 13:12:57 -07:00
Alex P 228b1c7c3b Merge branch 'master' into feature/template-varmojis
The rebase to end all rebases
2017-04-25 17:06:08 -07:00
Andrew Watkins 7c2ba7e3f2 Remove jsx-indent-props from eslintrc 2017-04-25 15:38:58 -07:00
Andrew Watkins 5cf3ddc652 Remove prettier indentation conflicts 2017-04-24 18:02:17 -07:00
Jade McGough 93ae313d0d prefer single quotes in eslintrc 2017-04-21 12:42:05 -07:00
Hunter Trujillo 31e38f0cb4 Fix linter errors. 2017-04-17 14:01:16 -06:00
Hunter Trujillo bffeebbd35 The line must be drawn here. This far, no further. 2017-03-29 14:03:52 -06:00
Jared Scheib 26716ad280 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 7ce3a6babc Update linter to allow console.error 2017-03-09 14:43:17 -08:00
Andrew Watkins 38b18e0cb5 Update eslintrc 2017-03-02 09:51:17 -08:00
Hunter Trujillo 9e1260a7ff Add Users container page. 2017-02-28 14:16:37 -07:00
Tim Raymond 6a9e61c740 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 0632fe8709 Add presentation mode Redux logic. Add handlers to SideNav. 2017-02-22 11:05:19 -06:00
Hunter Trujillo d341b6dd67 Refactor DashboardHeader out from DashboardPage, HostPage, and KubernetesDashboard, 2017-02-22 11:05:19 -06:00
Hunter Trujillo 9a12e12eb8 Revert "Refactor DashboardHeader out from DashboardPage, HostPage, and KubernetesDashboard."
This reverts commit 1a11af20d6.
2017-02-16 11:43:56 -07:00
Hunter Trujillo 1a11af20d6 Refactor DashboardHeader out from DashboardPage, HostPage, and KubernetesDashboard. 2017-02-16 10:59:08 -07:00
Hunter Trujillo 97b35a3f03 Add resource and id methods to AJAX method to access link URLs. 2017-02-13 13:19:34 -07:00
Hunter Trujillo db13d42818 Closer to the goal! 2017-01-04 16:02:12 -08:00
Andrew Watkins 52cb250f08 Move old enterpirse code into archive 2016-11-08 14:50:41 -08:00
Will Faurot 310a5fdf07 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 4d20b2af4a Bring over enterprise ui and configuration
Signed-off-by: Andrew Watkins <watts@influxdb.com>
2016-09-19 13:45:05 -07:00