 Torkel Ödegaard
|
57dc12ee17
Merge pull request #1482 from raintank/issue_1481
|
11 years ago |
 woodsaj
|
c9e5da48a4
Merge branch 'issue_1481' of github.com:raintank/grafana into issue_1481
|
11 years ago |
|
woodsaj
|
7d69885e06
fixes #1481. correctly escape api_key.key column name
|
11 years ago |
|
woodsaj
|
55ba8ad0c4
fix issue 1481. correctly escape api_key.key column name
|
11 years ago |
|
Torkel Ödegaard
|
6263ec1d38
Fixed some playlist issues, error when adding duplicates
|
11 years ago |
|
Torkel Ödegaard
|
1d86d4b94f
Updated docker build, added test container script, added docker readme
|
11 years ago |
|
Torkel Ödegaard
|
8aef2c13ec
Worked on playlist mode, hides dashboard controls and dashboard search button, added prev, stop, next icon buttons
|
11 years ago |
|
Torkel Ödegaard
|
8722ee8ad6
Worked on playlist update for Grafana 2.0, added dashboard search to playliststart view, #1460
|
11 years ago |
|
Torkel Ödegaard
|
1a44036148
Fixed req.Host in datasource proxy, Fixes #1478
|
11 years ago |
|
Torkel Ödegaard
|
e65a6cc063
added an inital admin settings view, very basic right now only displays all config options in grafana.ini
|
11 years ago |
|
Torkel Ödegaard
|
29607d8951
Updated readme again
|
11 years ago |
|
Torkel Ödegaard
|
366a9f71ad
Updated readme build instructions
|
11 years ago |
|
Torkel Ödegaard
|
79f798f67b
Configuration file options can now be overriden using environment variables using GF_<SectionName>_<KeyName> syntax, if Section name contains dots in config they are replaced with underscores, and the section name and keyname needs to be all upper case, #1473
|
11 years ago |
|
Torkel Ödegaard
|
2c16b0f0f3
added unit test for loading configuration file
|
11 years ago |
|
Torkel Ödegaard
|
4df6668416
Merge branch 'develop' of github.com:grafana/grafana into develop
|
11 years ago |
|
Torkel Ödegaard
|
0140a00884
Added two columns to user table, email_verified and theme, no used right now but will probably shortly
|
11 years ago |
|
Torkel Ödegaard
|
2a31f16b76
Merge pull request #1467 from jwilder/jw-fixes
|
11 years ago |
 Jason Wilder
|
793eda7640
Assign new dashboard ID when importing dashboard via command-line
|
11 years ago |
|
Jason Wilder
|
8230279932
Assign new ID to when importing dashboard via frontend
|
11 years ago |
|
Jason Wilder
|
a6df991b76
Update README.md w/ known working build tool versions
|
11 years ago |
|
Jason Wilder
|
9cc0be0fc2
Add grafana binary to .gitignore
|
11 years ago |
|
Torkel Ödegaard
|
0d0d802526
Removed data folder stuff, should not be in repo
|
11 years ago |
|
Torkel Ödegaard
|
71f09ddd94
Added delete user action to user admin api, and made it work in UI, Closes #1466, #1446
|
11 years ago |
|
Torkel Ödegaard
|
17f1224a5d
Fixed light theme condition, Fixes #1462
|
11 years ago |
|
Torkel Ödegaard
|
441e2ad2f3
Updated dockerfile and moved to docker/production folder
|
11 years ago |
|
Torkel Ödegaard
|
8d130421c4
Updated readme with default admin user info
|
11 years ago |
|
Torkel Ödegaard
|
add4adeec9
Fixed links to user admin views, and backend html routes for user admin edit/create urls, Closes #1451
|
11 years ago |
|
Torkel Ödegaard
|
e165e2af95
Worked on user admin features, can now create and edit users as a grafana admin user, #1446
|
11 years ago |
|
Torkel Ödegaard
|
088ad881e0
Updated phantomjs panel rendering code
|
11 years ago |
|
Torkel Ödegaard
|
c5afcd8e09
Fixed issue with datasource proxying, it required account admin role when it should not
|
11 years ago |
