Commits · 01627b3a686011a73c98f06bc7dfc5f2ddbbff18 · Kornkitt Poolsup / nexpie-grafana-theme

24 Oct, 2016 1 commit
- feat(ux): dashboard edit mode progress · 01627b3a
  Torkel Ödegaard committed Oct 24, 2016
  
  01627b3a Browse Files
23 Oct, 2016 2 commits
- feat(UX): revived dash-edit-mode branch, #6099 · 29e834e7
  Torkel Ödegaard committed Oct 23, 2016
  
  29e834e7 Browse Files
- Merge branch 'master' into dash-edit-mode · 1bb8192a
  Torkel Ödegaard committed Oct 23, 2016
  
  1bb8192a Browse Files
22 Oct, 2016 8 commits
- Merge branch 'master' of github.com:grafana/grafana · 8735a846
  Torkel Ödegaard committed Oct 22, 2016
  
  8735a846 Browse Files
- Merge branch 'alerting_keeplast' · 8bb2f115
  Torkel Ödegaard committed Oct 22, 2016
  
  8bb2f115 Browse Files
- Alerting: Keep last state on no data (#6354) · bc90e6ce
```
* feat(alerting): add support to keep last state on no data

closes #6332

* refactoring(alerting PR #6354): added new option type for NoData option so AlertStateType does not have to contain invalid state, #6354
```
  Carl Bergquist committed Oct 22, 2016
  bc90e6ce Browse Files
- refactoring(alerting PR #6354): added new option type for NoData option so… · a2e14f56
```
refactoring(alerting PR #6354): added new option type for NoData option so AlertStateType does not have to contain invalid state, #6354
```
  Torkel Ödegaard committed Oct 22, 2016
  a2e14f56 Browse Files
- fix(alerting): fixed email notification so it splits email address multiple ways, fixes #6353 · 4999fff2
  Torkel Ödegaard committed Oct 22, 2016
  
  4999fff2 Browse Files
- fix(influxdb): enforce database restriction, fixes #6352 · b32bbbd1
  Torkel Ödegaard committed Oct 22, 2016
  
  b32bbbd1 Browse Files
- fix(dashboard): re-render panels when leaving fullscreen mode, fixes #6312 · 401c67d1
  Torkel Ödegaard committed Oct 22, 2016
  
  401c67d1 Browse Files
- fix(docs): added api_url to configuration docs, fixes #6351 · 1581bf8d
  Torkel Ödegaard committed Oct 22, 2016
  
  1581bf8d Browse Files
21 Oct, 2016 9 commits

fix(cli): improve error handling · 6e65c932
bergquist committed Oct 21, 2016

6e65c932 Browse Files
feat(alerting): recover from panic · 2c7dbde0
bergquist committed Oct 21, 2016

2c7dbde0 Browse Files
feat(alerting): add support to keep last state on no data · ad56f67a
```
closes #6332
```
bergquist committed Oct 21, 2016
ad56f67a Browse Files

Squashed commit of the following: · 96008c97

commit 4113ed00782590187d19dd2f8cbae683f164142c
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Fri Oct 21 10:47:35 2016 +0200

    docs(): minor fix for docs index page

commit 45478d120571519462fac905aadeab5954696690
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Thu Oct 20 14:28:21 2016 +0200

    updated

commit c9c1c1d5a462f85e8001a45218f24102583d7aee
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Thu Oct 20 14:27:34 2016 +0200

    docs(): updated image refs

commit 5fa0f27963968d77bbbbb7edd973847ea72135e3
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Wed Oct 19 14:33:04 2016 +0200

    docs is almost done

commit 6b988c90cb08563e2c27212338c2947e69f6fcc3
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 20:45:28 2016 +0200

    almost done

commit 17757c21ed813892ddb1f289f2e52613caf7bcef
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Tue Oct 18 16:45:48 2016 +0200

    making progress on docs

commit f06c815991dd81b8893912a6da04a17b80b63fda
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 14:30:55 2016 +0200

    progress on new docs

commit 5197237426252623de2d8b9cc22ddbbdbb240763
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 13:25:26 2016 +0200

    making progress

commit 33e2b6b617f16f65878141cf11e54b2817a2ea96
Merge: de385e5 ecb4a99
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Tue Oct 18 12:17:58 2016 +0200

    Merge branch 'new-docs' of github.com:grafana/grafana into new-docs

commit ecb4a99dd54aa39f17d9bf4d7e132a389812f8fd
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Tue Oct 18 10:39:59 2016 +0200

    keep urls for now

commit de385e56d86b071cf2150ccf9f1aa06ec5187277
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 17:56:18 2016 +0200

    more progress

commit 8469ebc239ab2316cbbc01862e5026737f272f00
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 17:08:06 2016 +0200

    progress on new docs

commit e755f656b12534cfcb23bad11f1fa696e43f7428
Merge: 4644a35 35cce3b
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 12:21:27 2016 +0200

    Merge branch 'new-docs' of github.com:grafana/grafana into new-docs

commit 4644a35102555204787e91041b50dcbfe0f7a213
Merge: 25c4bef 977cdd59
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Oct 17 12:21:11 2016 +0200

    Merge branch 'master' of github.com:grafana/grafana into new-docs

commit 35cce3bef802fac020a53693b02c112a91a096fc
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Mon Oct 17 09:31:17 2016 +0200

    progress on #6170

commit 25c4bef629de7d77218ba95cc3bd25fb50bb19d6
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Sun Oct 16 15:05:30 2016 +0200

    fix for osx

commit 6c6b52f975630be87da23dd51beafaecb820cec2
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sun Oct 16 12:56:39 2016 +0200

    progress on new docs

commit 6a09633981ab26191d5542dbe3a788846ac6b73d
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sat Oct 15 11:39:49 2016 +0200

    progress on new docs

commit 7d533fbc23e41b86fd1ba9c955dd17ae1ad977e5
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Mon Oct 10 09:25:12 2016 +0200

    making progress on new docs site

commit 50392ce98edfa201977716e92e4a86f9d48ae386
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sun Oct 9 20:02:28 2016 +0200

    feat(new docs): progress on new docs site

commit 81a3d3d0952d3a5d790412e90d01ac5a247e0686
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Fri Oct 7 07:52:11 2016 +0200

    new docs site experiment

commit 704adc98664665b3624087ab38ce29fc9da005f1
Author: Torkel Ödegaard <torkel@grafana.org>
Date:   Sat Oct 1 20:46:53 2016 +0200

    new docs poc

committed Oct 21, 2016

96008c97 Browse Files

Merge pull request #6344 from roidelapluie/cuu · 55204545
```
Allow to set current on graph panel
```
Carl Bergquist committed Oct 21, 2016
55204545 Browse Files
tech(notifications): replace internal email code · 5bf5ed68
bergquist committed Oct 21, 2016

5bf5ed68 Browse Files
feat(alerting): support for attached graphs in alert notifications · f7779983
```
closes #6183
```
bergquist committed Oct 21, 2016
f7779983 Browse Files
tech(alerting): remove unused code · ded5a0a9
bergquist committed Oct 21, 2016

ded5a0a9 Browse Files
Merge pull request #6346 from cglewis/master · 206a6b0a
```
fix cla link; formatting and grammar fixes
```
Carl Bergquist committed Oct 21, 2016
206a6b0a Browse Files

20 Oct, 2016 6 commits
- fix cla link; formatting and grammar fixes · 3931e0b7
  cglewis committed Oct 20, 2016
  
  3931e0b7 Browse Files
- Allow to set current on graph panel · d1eb7e5f
```
Refs #6335

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
```
  Julien Pivotto committed Oct 20, 2016
  d1eb7e5f Browse Files
- Merge pull request #6333 from utkarshcmu/alerting_typo · 1ce0b8fe
```
Fixed typo
```
  Carl Bergquist committed Oct 20, 2016
  1ce0b8fe Browse Files
- Fixed typo · b989b087
  utkarshcmu committed Oct 20, 2016
  
  b989b087 Browse Files
- added support to login user oauth user by email only (#6330) · eda442db
```
* added support to login user oauth user by email only

* added sql handler

* fixed model method name from GetUserByEmail to GetUserByEmailQuery

* fixed variable declaration typo
```
  Eric Uldall committed Oct 20, 2016
  eda442db Browse Files
- fix(changelog): typo · 9badb051
  bergquist committed Oct 20, 2016
  
  9badb051 Browse Files
19 Oct, 2016 13 commits
- feat(notification): add helptext for using multiple email addresses · f2cbfece
  bergquist committed Oct 19, 2016
  
  f2cbfece Browse Files
- feat(notifications): switch to ; seperator · 6ea0f012
```
using \n caused problems with the json deserialisation.

closes #6326
```
  bergquist committed Oct 19, 2016
  6ea0f012 Browse Files
- Merge branch 'alerting_opentsdb' · 3ac38dfe
  bergquist committed Oct 19, 2016
  
  3ac38dfe Browse Files
- Merge branch 'master' into alerting_opentsdb · 2df8c649
  bergquist committed Oct 19, 2016
  
  2df8c649 Browse Files
- fix(opentsdb): can always return false · 5fbab038
  bergquist committed Oct 19, 2016
  
  5fbab038 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · a826591e
  Torkel Ödegaard committed Oct 19, 2016
  
  a826591e Browse Files
- Merge pull request #6325 from utkarshcmu/alerting_opentsdb · 497eca01
```
Implmented targetContainsTemplate for OpenTSDB
```
  Carl Bergquist committed Oct 19, 2016
  497eca01 Browse Files
- Implmented targetContainsTemplate for OpenTSDB · 62895114
  utkarshcmu committed Oct 19, 2016
  
  62895114 Browse Files
- feat(opentsdb): add mock method for detecting targets with template values · 4c2f2eeb
  bergquist committed Oct 19, 2016
  
  4c2f2eeb Browse Files
- feat(prometheus): trim labelname lookup key · 20bfe443
```
closes #6300
```
  bergquist committed Oct 19, 2016
  20bfe443 Browse Files
- feat(alerting): allow editor to modify notifications · b2d5b920
```
closes #6314
```
  bergquist committed Oct 19, 2016
  b2d5b920 Browse Files
- Merge pull request #6290 from utkarshcmu/alerting_opentsdb · a1e97b00
```
Opentsdb alerting feature completed, ready for testing
```
  Carl Bergquist committed Oct 19, 2016
  a1e97b00 Browse Files
- Issues/6317 empty google login (#6318) · 9468ddee
```
* added Login property to google_oauth model

* fixed spacing

* fixed google_oauth syntax error, missing comma before newline

* set noexpandtab for commit
```
  Eric Uldall committed Oct 19, 2016
  9468ddee Browse Files
18 Oct, 2016 1 commit
- Fixed for loop and append · 333a8539
  utkarshcmu committed Oct 18, 2016
  
  333a8539 Browse Files