bergquist
e1703166f0
docs(changelog): add thank you note to contributor
2016-12-12 19:06:21 +01:00
bergquist
99e3db8208
Merge branch 'master' into alerting_mqe
2016-12-12 19:01:50 +01:00
Torkel Ödegaard
46c161b104
Merge branch 'master' of github.com:grafana/grafana
2016-12-12 16:35:59 +01:00
Torkel Ödegaard
80d88d302c
fix(config): changed default for oauth and allow_sign_up setting, #6928
2016-12-12 16:35:42 +01:00
Hans Kristian Flaatten
1060b99810
docs(configuration): set allow_sign_up to true for gerneric OAuth ( #6928 )
...
This enables Grafana to accept new users authenticated through OAuth, without this set to true only previously authenticated users may log in with OAuth - and thus defeating the purpose.
2016-12-12 16:27:51 +01:00
Torkel Ödegaard
9da44141f1
fix(git): removed external submodule, accedentially included in PR, fixes #6929
2016-12-12 15:43:04 +01:00
bergquist
0e03c43174
docs(changelog): adds note about merging #4550
2016-12-12 14:59:02 +01:00
bergquist
f33aeb6591
Merge branch 'adrianlzt-bug/show_multiple_tags_with_influxdb'
2016-12-12 14:56:51 +01:00
bergquist
530e1b358a
Merge branch 'master' into adrianlzt-bug/show_multiple_tags_with_influxdb
2016-12-12 14:55:56 +01:00
bergquist
ce4e71364c
test(influxdb): adds tests for supporting multiple tags
2016-12-12 14:55:39 +01:00
Torkel Ödegaard
5ec7dea81a
Merge branch 'v4.0.x'
2016-12-12 14:39:53 +01:00
Torkel Ödegaard
8feaef20e0
fix(graph): fixed graph issue with axes mode set to series and picking Max value, fixes #6926
2016-12-12 14:37:40 +01:00
Torkel Ödegaard
40b359334b
fix(typescript): fixed sourcemap issue, #6904
2016-12-12 14:24:36 +01:00
bergquist
d599f45707
Merge branch 'bug/show_multiple_tags_with_influxdb' of https://github.com/adrianlzt/grafana into adrianlzt-bug/show_multiple_tags_with_influxdb
2016-12-12 13:30:27 +01:00
Torkel Ödegaard
ee6cd727ea
Merge branch 'master' of github.com:grafana/grafana
2016-12-12 11:38:31 +01:00
Torkel Ödegaard
3bb9d47a45
minor change to #6904
2016-12-12 11:38:10 +01:00
bergquist
413a187119
docs(notification): add message property to notification
2016-12-12 11:28:16 +01:00
Carl Bergquist
a5c41fe7cb
Merge pull request #6921 from huydx/master
...
fix(alert): alert test should return error when it failed to dispatch
2016-12-12 11:02:14 +01:00
Torkel Ödegaard
815722c3cc
Merge branch 'upgrade_typescript' of https://github.com/Nepomuceno/grafana into Nepomuceno-upgrade_typescript
2016-12-12 10:53:19 +01:00
bergquist
3cbc325f18
tech(github): asks ppl to remove placeholder text
2016-12-12 10:39:45 +01:00
huydx
015fa82cf5
fix(alert): alert test should return error when it failed to dispatch
2016-12-12 18:22:58 +09:00
Seuf
12a82bc0d4
Auth Proxy improvements - adds the option to use ldap groups for authorization in combination with an auth proxy - adds an option to limit where auth proxy requests come from by configure a list of ip's - fixes a security issue, session could be reused
2016-12-12 09:53:02 +01:00
Seuf
ae27c17c68
Auth Proxy improvements
...
- adds the option to use ldap groups for authorization in combination with an auth proxy
- adds an option to limit where auth proxy requests come from by configure a list of ip's
- fixes a security issue, session could be reused
2016-12-12 09:43:17 +01:00
bergquist
06b4dacaa4
docs(changelog): add note about closing #5479
2016-12-12 08:37:29 +01:00
Carl Bergquist
73ec529688
Merge pull request #6897 from grafana/cli_db_commands
...
Enable the CLI to do change the grafana admin password in the database
2016-12-12 08:30:20 +01:00
Gabriel Nepomuceno
cbf0d571f5
Removing task from other build sources
2016-12-10 09:00:58 +00:00
Gabriel Nepomuceno
2f46c56672
removing type validation because copy needs to be done first
2016-12-09 23:41:07 +00:00
Gabriel Nepomuceno
7ff07aa7b1
Revoming old files
2016-12-09 22:05:11 +00:00
Gabriel Nepomuceno
a8ae0a5b79
fixing compilation of grunt
2016-12-09 21:53:00 +00:00
Gabriel Nepomuceno
f3ebd2d849
upgrading bases and correcting identation missing tslint
2016-12-09 14:57:25 +00:00
Axel
2adbe3e13e
Prettify duration value format ( #6875 )
...
* Prettify duration unit format
Format duration like "2 days, 19 hours, 48 minutes" and make Decimals useful e.g.
0 decimals: 2 days
2 decimals: 2 days, 19 hours, 48 minutes
3 decimals: 2 days, 19 hours, 48 minutes, 27 seconds
Previous code did some rounding that is now gone so numbers might be
different.
* Rewrite kbn.toDuration without moment.js
Because https://github.com/moment/moment/issues/3653
* Add tests for kbn.toDuration
2016-12-09 15:55:25 +01:00
bergquist
96e8ecfa7b
feat(cli): adds command to reset admin password
...
closes #5479
2016-12-09 15:25:02 +01:00
bergquist
cd85e1f651
Merge branch 'master' into cli_db_commands
2016-12-09 12:36:05 +01:00
bergquist
ba7a990f86
tech: bump version in server cli
2016-12-09 12:30:36 +01:00
bergquist
02392e5189
docs(changelog): adds PR contributors name to release notes
2016-12-09 12:19:41 +01:00
bergquist
64f22e7037
docs(changelog): add note about closing #6356
2016-12-09 11:49:23 +01:00
bergquist
cfb6033765
Merge branch 'elastic5_support'
2016-12-09 11:42:15 +01:00
bergquist
619c5c4f1b
Merge branch 'master' into elastic5_support
2016-12-09 11:41:23 +01:00
bergquist
ebec02ffae
style(elastic): minor code style changes
2016-12-09 11:40:00 +01:00
bergquist
99c5f7d571
feat(elastic): remove support for ES 1.x
2016-12-09 11:34:19 +01:00
bergquist
873024b917
tech(elastic): use bool conditions for all es queries
2016-12-09 11:13:28 +01:00
Matt Toback
e58b6989c2
Small refactor to make hover highlighting proper, added a title tag for the completed grafana step. ( #6882 )
2016-12-09 09:42:24 +01:00
Matt Toback
f39f77692b
Adjusted the active state to fix the faint line showing. Probably related to the font change going into 4.0 ( #6886 )
2016-12-09 09:41:54 +01:00
Carl Bergquist
20e4cb9a0b
Merge pull request #6885 from utkarshcmu/patch-1
...
Fixed Create org API in docs
2016-12-09 08:53:33 +01:00
Utkarsh Bhatnagar
db3ac79015
Fixed Create org API in docs
2016-12-08 12:08:04 -08:00
bergquist
6265afd8b6
docs: updat latest to 4.0.2
2016-12-08 15:17:13 +01:00
bergquist
7c3c8bc4c9
docs(changelog): add date for 4.0.2 release
2016-12-08 15:14:44 +01:00
bergquist
49827de278
docs: release 4.0.2
2016-12-08 15:05:37 +01:00
bergquist
a90f650109
update package.json version to 4.0.2
2016-12-08 14:04:08 +01:00
bergquist
f68350acbf
docs(alerting): link fix to issue rather then commit
2016-12-08 14:01:59 +01:00
