Commit Graph

21021 Commits

Author SHA1 Message Date
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
ijin08
00ce556bd0 changed all rems to pixels in defaults and template, changed back root font size 2019-03-08 13:02:55 +01:00
ryan
5aef3bd139 add storybook 2019-03-08 00:28:42 -08:00
bergquist
3890bd14eb fixes typo in redis devenv 2019-03-08 09:09:28 +01:00
bergquist
11d671c637 add support for memcached 2019-03-08 09:09:28 +01:00
bergquist
5ced863f75 add support for redis storage 2019-03-08 09:09:27 +01:00
bergquist
d99af23946 add garbage collector for database cache 2019-03-08 09:09:27 +01:00
bergquist
996d5059b1 test at interface level instead impl 2019-03-08 09:09:27 +01:00
bergquist
d4f5789660 cache: initial version of db cache 2019-03-08 09:09:27 +01:00
ryan
223906654c don't include stuff from app/... 2019-03-07 18:27:51 -08:00
ryan
eed9a2010e fix scss 2019-03-07 17:55:23 -08:00
ryan
ad51b069b3 rename to Table 2019-03-07 17:51:45 -08:00
ryan
e1324289c8 rename to Table 2019-03-07 17:49:02 -08:00
ryan
ca5d7c3510 fix type errors 2019-03-07 17:08:22 -08:00
ryan
d7b1fd75e3 move to grafana/ui 2019-03-07 16:52:20 -08:00
ryan
39be5959b8 better sort function 2019-03-07 15:01:36 -08:00
ryan
1609c07fb2 use TableData, not interface 2019-03-07 14:55:30 -08:00
ryan
2db4004d62 Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master:
  Update README.md
  Update core:start cli command to watch theme changes again (#15856)
  Updated pull request template
  Updated pull request rtemplate
  Removed title case from issue template title
  Updated issue template titles
  Updated issue templates
  Updated templates
  fix: Update error message and replace npm with yarn #15851
  fix: Make sure we dont add &autofitpanels to the url if it already exists #15849
  Update upgrading.md for wrong spell
  return the same panelData unless it changes
  Map dataSourceTypeSearchQuery state from redux to search input.
  Revert "Fix for leaving playlist mode"
  add new issue templates
2019-03-07 14:20:42 -08: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
Alexander Zobnin
7167fa9d07
heatmap: reduce number of legend segments to reasonable value and round x values to prevent gaps 2019-03-07 20:05:32 +03:00
Alexander Zobnin
55d5219a05
heatmap: fix legend padding 2019-03-07 19:49:14 +03:00
Alexander Zobnin
c104f31149
heatmap: fix legend for small values, #14019 #15683 2019-03-07 18:57:18 +03:00
ijin08
c5f4239703 changed root font to 100%(default 16px), changed font-size from px to rem, updated rem sizes in template and default.ts files, removed display classes and variables since not used, removed lead class and variables since not usedremoved serif font since not used and probably never should be used 2019-03-07 15:37:17 +01: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
Johannes Schill
f3dbdfac07 fix: Make sure we dont add &autofitpanels to the url if it already exists #15849 2019-03-07 10:32:36 +01:00
Johannes Schill
06e9c116af fix: Update test snapshot 2019-03-07 09:54:39 +01:00
Johannes Schill
d6449ee629 fix: Logo goes Home instead of toggling side menu #15482 2019-03-07 09:36:40 +01:00
Torkel Ödegaard
a826c117e2
Merge pull request #15834 from grafana/revert-15791-fix/leave-playlist
Revert "Fix for leaving playlist mode"
2019-03-07 08:46:14 +01:00
Torkel Ödegaard
12263a3f70
Merge pull request #15838 from aocenas/fix-new-datasource-search
Fix new datasource search input
2019-03-07 08:45:52 +01:00