Torkel Ödegaard
06f7a49a61
Refactoring / fixing password hint PR #15868
2019-03-11 13:33:57 +01:00
Torkel Ödegaard
647cb6ddae
Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master
2019-03-11 13:10:45 +01:00
Torkel Ödegaard
90a3bc2203
Merge pull request #15892 from sandlis/14706-es-weekly-pattern-fix
...
Fix : #14706 Incorrect index pattern padding in alerting queries
2019-03-11 11:01:22 +01:00
Torkel Ödegaard
5fab1e89d3
Merge pull request #15897 from grafana/revert-15608-fix-datasource-update
...
Revert "Fix Datasource Update to no User/Password"
2019-03-11 10:58:28 +01:00
Torkel Ödegaard
3f574d3e57
Merge pull request #15685 from utkarshcmu/fix-#15562
...
Fixed alias in Cloudwatch Expressions
2019-03-11 10:49:30 +01:00
Carl Bergquist
a6e5e777be
Merge pull request #15896 from genofire/patch-1
...
fix imageurl in notification test
2019-03-11 07:32:14 +01:00
Carl Bergquist
f3753712e0
Revert "Fix Datasource Update to no User/Password"
2019-03-11 07:22:54 +01:00
genofire
6d578dd372
fix imageurl in notification test
...
skip unnecessary http -> https redirect, which could make problems on some notifiers
2019-03-11 00:23:07 +01:00
Torkel Ödegaard
fc41d10b9e
Merge pull request #15891 from ryantxu/string-utils
...
move stringToJsRegex to grafana/ui
2019-03-10 19:56:36 +01:00
Dominik Prokop
eefba7373d
Merge pull request #15890 from ryantxu/storybook-cleanup
...
Minor storybook cleanup
- DeleteButton should use withCenteredStory like everythign else
- Clicking the 'Red' button should not pick blue :)
2019-03-10 19:42:20 +01:00
Carl Bergquist
e46e71bbf3
Merge pull request #15878 from zhulongcheng/docs-add-slack-url
...
docs: update slack alert notification settings
2019-03-10 19:40:01 +01:00
ryan
f7f124c56b
reuse deprecationWarning
2019-03-10 10:37:44 -07:00
ryan
d13eebfe52
move to string.ts
2019-03-10 10:19:02 -07:00
ryan
b2a7891b08
move stringToJsRegex
2019-03-09 23:50:46 -08:00
ryan
11188b53af
minor storybook cleanup
2019-03-09 15:43:49 -08:00
Daniel Lee
0ae9c1c5cc
Merge pull request #15882 from nowke/patch-1
...
docs: Fix indentation level for OAuth2 config
2019-03-09 00:35:46 +01:00
Torkel Ödegaard
6d6c7698e4
Merge pull request #15881 from zhulongcheng/docs-Contributing
...
docs: update CONTRIBUTING.md
2019-03-08 18:55:48 +01:00
Navaneesh Kumar
ccdc82b921
docs: Fix indentation level for OAuth2 config
2019-03-08 22:38:50 +05:30
zhulongcheng
e08d8eb55d
docs: update CONTRIBUTING.md
2019-03-09 00:30:20 +08:00
zhulongcheng
7743f77e45
docs: update slack alert notification settings
...
closes #15878
2019-03-09 00:19:21 +08:00
Torkel Ödegaard
570187384b
Merge pull request #13825 from athurg/optimize_dingding_alert_message
...
Optimize dingding alert message
2019-03-08 15:33:24 +01:00
Dominik Prokop
d104ee1c15
@grafana/ui - release docs v1 ( #15835 )
...
* Readme update
* Update @grafana/ui Readme qith release process description. Allow version commit creation during release
* Run tests and checks for grafana/core before releasing grafana/ui
* Post review Readme updates
2019-03-08 14:42:19 +01:00
Torkel Ödegaard
4518604cd6
Merge pull request #15446 from grafana/preserve-tags-option
...
Preserve tags switch option in Save As modal
2019-03-08 14:41:51 +01:00
Marcus Efraimsson
4f48ed3350
Merge pull request #15872 from grafana/15643_fix2
...
fix allow anonymous server bind for ldap search
2019-03-08 14:25:58 +01:00
Marcus Efraimsson
c9e90f8957
Merge pull request #15873 from grafana/13344_fix
...
add nil/length check when delete old login attempts
2019-03-08 14:25:24 +01:00
Torkel Ödegaard
04c88a226b
Minor refactoring of copy tags when saving feature, #15446
2019-03-08 14:24:45 +01:00
Torkel Ödegaard
60272d8a77
Simple implementation for preserve tags, closes #11627
2019-03-08 14:00:44 +01:00
Torkel Ödegaard
2bc573c840
Merge branch 'master' of github.com:grafana/grafana
2019-03-08 13:56:37 +01:00
Torkel Ödegaard
74421ceb13
Updated prettierignore
2019-03-08 13:56:21 +01:00
Torkel Ödegaard
747aa82272
Merge branch 'SamuelToh-11780_wrong_repexp_in_series'
2019-03-08 13:55:53 +01:00
Torkel Ödegaard
878da68c90
Refactoring of PR #14772
2019-03-08 13:55:39 +01:00
Marcus Efraimsson
d7d968412b
fix typo in pr template
2019-03-08 13:47:09 +01:00
Torkel Ödegaard
01eb5fade3
Merge branch '11780_wrong_repexp_in_series' of https://github.com/SamuelToh/grafana into SamuelToh-11780_wrong_repexp_in_series
2019-03-08 13:40:50 +01:00
Marcus Efraimsson
e3b3062107
add nil/length check when delete old login attempts
2019-03-08 13:31:46 +01:00
Torkel Ödegaard
48114edc86
Minor refactoring of new react text panel
2019-03-08 13:30:47 +01:00
Torkel Ödegaard
90f8179bd2
Merge branch 'alpha-text2' of https://github.com/ryantxu/grafana into ryantxu-alpha-text2
2019-03-08 13:18:06 +01:00
Marcus Efraimsson
c242d38301
fix allow anonymous server bind for ldap search
2019-03-08 13:16:35 +01:00
Woodward, Joshua
946e542412
Make password hint configurable from settings/defaults.ini
2019-03-07 14:00:04 -08:00
Matt Toback
f9e3c33ebd
Update README.md
2019-03-07 14:33:37 -05:00
Torkel Ödegaard
56682cb1eb
Merge pull request #15850 from grafana/15849-autofitpanels-in-url
...
Don't add autofitpanels to the url if it already exists
2019-03-07 13:19:03 +01:00
Dominik Prokop
312ce88e25
Update core:start cli command to watch theme changes again ( #15856 )
2019-03-07 13:12:10 +01:00
Torkel Ödegaard
2a0122dfbc
Merge pull request #15852 from grafana/15851-update-error-message
...
Update error message and replace npm with yarn
2019-03-07 12:28:11 +01:00
Torkel Ödegaard
f71d45b1c1
Updated pull request template
2019-03-07 12:10:25 +01:00
Torkel Ödegaard
8892b933e8
Updated pull request rtemplate
2019-03-07 11:41:07 +01:00
Torkel Ödegaard
708fd6df21
Removed title case from issue template title
2019-03-07 11:12:43 +01:00
Torkel Ödegaard
067f0561d6
Updated issue template titles
2019-03-07 11:09:16 +01:00
Torkel Ödegaard
51178b3f56
Merge pull request #15534 from grafana/issue_templates
...
New issue templates
2019-03-07 11:07:36 +01:00
Torkel Ödegaard
ec1bb7b995
Updated issue templates
2019-03-07 11:07:01 +01:00
Torkel Ödegaard
da49fecc30
Updated templates
2019-03-07 10:55:16 +01:00
Johannes Schill
d937f1ff21
fix: Update error message and replace npm with yarn #15851
2019-03-07 10:52:24 +01:00
