IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
20,736 Commits 1,121 Branches 715 Tags
d13eebfe52706f153a778b9e1ce902970fdf4c0a
Commit Graph
20736 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Torkel Ödegaard 327d1d758d Merge pull request #15841 from ryantxu/fix-15840 
return the same panelData unless it changes
 2019-03-07 08:44:18 +01:00
Marcus Efraimsson 10d50ea728 Merge pull request #15845 from shafferjohn/patch-1 
Update upgrading.md for wrong spell
 2019-03-07 08:29:42 +01:00
Shaffer John 272b561958 Update upgrading.md for wrong spell 2019-03-07 11:09:17 +08:00
ryan 2e8dd19636 use pure component 2019-03-06 15:54:19 -08:00
ryan 627a32e9bb Merge remote-tracking branch 'grafana/master' into alpha-text2 
* grafana/master: (40 commits)
  Minor refactoring of PR #15770
  Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702
  fix discord notifier so it doesn't crash when there are no image generated
  fix: Consistency in unit labels #15709
  Update latest.json
  Update CHANGELOG.md
  position from add panel, dimensions from copied panel
  changelog: add notes about closing #14509 #15179
  fix: Add class for input fields with help icon to avoid icon hiding the text #15771
  Update CHANGELOG.md
  restore to current folder when restoring old dashboard version
  fix(renderer): Vendor ansicolor as typescript
  log phantomjs output even if it timeout and include orgId when render alert
  keep size from copied panel and not from add panel widget
  Added basic cherry pick helping task
  Prevent search in VizPicker from stealing focus (#15802)
  fix only users that can edit a dashboard should be able to update panel json
  Updated changelog task
  Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631
  Updated to add PR author, skip PR issue references
  ...
 2019-03-06 15:47:14 -08:00
ryan 82326fed42 return the same panelData unless it changes 2019-03-06 15:18:24 -08:00
Andrej Ocenas a59e0f1b55 Map dataSourceTypeSearchQuery state from redux to search input. 2019-03-06 22:30:40 +01:00
Torkel Ödegaard bc2a798158 Merge pull request #15574 from grafana/more-color-variables-use-variables 
Changed some more color variables to use variables
 2019-03-06 18:07:42 +01:00
Torkel Ödegaard 1ab548f423 Merge pull request #15832 from grafana/stop-playlist 
Alternative fix to detecting when to stop a playlist
 2019-03-06 17:57:37 +01:00
Torkel Ödegaard 2604e9e433 Minor refactoring of PR #15770 2019-03-06 17:53:14 +01:00
Torkel Ödegaard 18d5c04ae4 Merge branch 'toggle-all-legends' of https://github.com/jsferrei/grafana into jsferrei-toggle-all-legends 2019-03-06 17:48:59 +01:00
Torkel Ödegaard 3895294f97 Revert "Fix for leaving playlist mode" 2019-03-06 17:39:18 +01:00