Commit Graph

20777 Commits

Author SHA1 Message Date
ryan
7054cf8bb5 rotate! 2019-03-11 01:08:00 -07:00
ryan
61053ec099 better css 2019-03-11 00:45:15 -07:00
ryan
91a2307b98 rotate! 2019-03-10 23:11:57 -07:00
ryan
b80c773ebe attach themes to table story 2019-03-10 15:34:02 -07:00
ryan
0a094c1226 merge master 2019-03-10 13:45:18 -07: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
494acddb2f get field mapping to actually work 2019-03-09 23:39:11 -08:00
ryan
1cb03670c4 add variable size storybook 2019-03-09 23:07:42 -08:00
ryan
fe22d14e93 cell builder cleanup 2019-03-09 20:47:02 -08:00
ryan
11188b53af minor storybook cleanup 2019-03-09 15:43:49 -08:00
ryan
078d8f1210 table using MultiGrid 2019-03-09 00:27:33 -08:00
ryan
343e49decb Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master: (24 commits)
  docs: Fix indentation level for OAuth2 config
  docs: update CONTRIBUTING.md
  @grafana/ui - release docs v1 (#15835)
  Minor refactoring of copy tags when saving feature, #15446
  Simple implementation for preserve tags, closes #11627
  Updated prettierignore
  Refactoring of PR #14772
  fix typo in pr template
  add nil/length check when delete old login attempts
  Minor refactoring of new react text panel
  fix allow anonymous server bind for ldap search
  use pure component
  use replaceVariables
  Catch bad regex exception at controller level
  11780: invalid reg value can cause unexpected behaviour
  update
  Add string quote func
  Remove option used to control within browser
  Add pic into actionCard message
  Add new option to set where to open the message url
  ...
2019-03-08 20:52:30 -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
ryan
5aef3bd139 add storybook 2019-03-08 00:28:42 -08: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
Matt Toback
f9e3c33ebd
Update README.md 2019-03-07 14:33:37 -05:00