public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ryan 6617a382a3 Merge remote-tracking branch 'grafana/master' into all-data-as-table 
* grafana/master: (23 commits)
  @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
  Update README.md
  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
  Optimize the Dingding match values format
  ...
 2019-03-08 08:25:30 -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
Marcus Efraimsson 80ce11a4a4 docs: update admin and user http api documentation 2019-03-08 15:15:57 +01:00
Marcus Efraimsson 0cd5a6772d feat(api): support list/revoke auth token in admin/current user api 2019-03-08 15:15:38 +01:00
Marcus Efraimsson 8029e48588 support get user tokens/revoke all user tokens in UserTokenService 2019-03-08 15:15:17 +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
corpglory-dev a7bd8d503d Simple storybook 2019-03-08 15:47:15 +03: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
corpglory-dev b8fcd3d962 Improve rendering 2019-03-08 15:17:04 +03: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
corpglory-dev 7bc741c4e2 piechart -> pieChart 2019-03-08 13:51:25 +03:00
corpglory-dev e47769c185 Rename: Piechart -> PieChart 2019-03-08 13:42:41 +03:00
corpglory-dev ef37e95bb7 Import only what is used from d3 2019-03-08 13:33:53 +03:00
ryan 229dff757c less nesting and add test 2019-03-08 02:14:35 -08:00
ryan 188dc86246 remove type field and add helper functions to check if data isTableData 2019-03-08 00:41:35 -08: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
ryan 439b044204 move toTableData to grafana/ui 2019-03-07 13:09:53 -08:00
ryan 8bf57359ab don't require x & y columns for timeSeries 2019-03-07 12:47:21 -08:00
ryan abf015ace2 use TableData for timeseries in react 2019-03-07 12:13:38 -08:00