IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,282 Commits 1,123 Branches 715 Tags
ed546c97208be444469947de41ce03e8ab0fc1e4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard ed546c9720 updated package.json version 2018-02-15 13:30:40 +01:00
Torkel Ödegaard 168ac314fc fix: more phantomjs fixes 2018-02-15 13:20:50 +01:00
Torkel Ödegaard 57103ec98a fix: refactoring #10922 2018-02-15 12:42:17 +01:00
Torkel Ödegaard 4b4e38531b Merge branch 'fix-10526' of https://github.com/alexanderzobnin/grafana 2018-02-15 11:46:33 +01:00
Torkel Ödegaard fcaa8227a6 Dashboard acl query fixes (#10909) 
* initial fixes for dashboard permission acl list query, fixes #10864

* permissions: refactoring of acl api and query
 2018-02-14 15:04:26 +01:00
Torkel Ödegaard 8dd4d505ee Merge branch 'dashboard-search-permissions-filter' 2018-02-14 10:48:55 +01:00
Torkel Ödegaard ead1c300d7 API Integration Tests via jest (#10899) 
* tests: experiment with api tests

* api tests are getting nice

* api: api testing ready for feedback
 2018-02-14 10:26:20 +01:00
Torkel Ödegaard bb681cd498 Merge branch '10819_empty_dashboard_list' 2018-02-14 09:38:19 +01:00
Torkel Ödegaard b0fae0129c ux: refactoring #10884 2018-02-14 09:37:39 +01:00
Torkel Ödegaard 162439a8d6 fix: removed logging 2018-02-13 17:03:20 +01:00
Torkel Ödegaard e3c3f3ce4c fix: sql search permissions filter fix 2018-02-13 16:49:00 +01:00
Torkel Ödegaard 6bbd87dd9c ux: minor tweak to grid resize handle color 2018-02-10 20:11:11 +01:00
Torkel Ödegaard 4d5a24a6c4 permissions: might have a solution for search 2018-02-09 17:24:34 +01:00
Torkel Ödegaard c01b80522e fix: clear items list before fetching permissions list 2018-02-09 16:13:20 +01:00
Torkel Ödegaard e949eb3f58 Merge branch 'master' into dashboard-search-permissions-filter 2018-02-09 15:16:34 +01:00
Torkel Ödegaard e672604835 docs: minor docs update 2018-02-09 12:53:07 +01:00
Torkel Ödegaard 41a6e7c2c8 docs: updated docs landing page 2018-02-09 12:39:17 +01:00
Torkel Ödegaard 8e8f3c4332 dashboard and folder search with permissions 2018-02-08 17:11:01 +01:00
Torkel Ödegaard b84fd3a7ae fix: initial fix for #10822 2018-02-07 17:54:21 +01:00
Torkel Ödegaard 39238c192d fix: folder redirect after creation 2018-02-07 15:33:08 +01:00
Torkel Ödegaard 541b0a0ca1 fix: fixed bug with redirect after new dashboard saved, related to buggy angularjs location path/url and base href, fixes #10817 2018-02-07 14:10:23 +01:00
Torkel Ödegaard 17cbd9d6b4 fix: removed old shortcut that does not exist, fixes #10802 2018-02-07 10:43:42 +01:00
Torkel Ödegaard 76c2a6e5ee build: fixed recovery test 2018-02-06 13:16:21 +01:00
Torkel Ödegaard f54ba20783 fix: css fix, found a better way to fix #10772 2018-02-06 13:01:23 +01:00
Torkel Ödegaard f1f8c23206 fix: minor build fix 2018-02-06 12:43:11 +01:00
Torkel Ödegaard 0e61a670bb fix: error handling now displays page correctly, fixes #10777 2018-02-06 12:28:17 +01:00
Torkel Ödegaard cf7be5da0b fix: changed dashboard title length to match slug length, will fix mysql index size issue, fixes #10779 2018-02-06 11:03:37 +01:00
Torkel Ödegaard bc8e59a8d8 docs: added graphite section 2018-02-06 10:32:27 +01:00
Torkel Ödegaard 3614906828 docs: minor update 2018-02-06 10:19:23 +01:00
Torkel Ödegaard 1a8501450c docs: video fix 2018-02-05 18:46:03 +01:00
Torkel Ödegaard 24d882e7d8 docs: fix 2018-02-05 18:13:06 +01:00
Torkel Ödegaard e800b19ef6 docs: fix download link 2018-02-05 17:56:48 +01:00
Torkel Ödegaard 061320ba7b docs: minor update 2018-02-05 17:26:44 +01:00
Torkel Ödegaard e9aadab355 docs: updated whats new 2018-02-05 17:00:19 +01:00
Torkel Ödegaard 9138b38b93 Update CHANGELOG.md 2018-02-05 16:32:30 +01:00
Torkel Ödegaard 97bba1d826 build: updated publish script 2018-02-05 16:29:10 +01:00
Torkel Ödegaard b2f62ae19c docs: update docs with download links 2018-02-05 16:02:17 +01:00
Torkel Ödegaard 8f98e8b8f4 Update CHANGELOG.md 2018-02-05 15:36:16 +01:00
Torkel Ödegaard 3e2da1fee5 build: increased version to beta1 2018-02-05 15:28:57 +01:00
Torkel Ödegaard e6b82b2fb1 fix: fixed permission list caching issue, fixes #10750 2018-02-05 15:23:46 +01:00
Torkel Ödegaard 0701188e64 Update CHANGELOG.md 2018-02-05 09:44:36 +01:00
Torkel Ödegaard 07fa2f1722 fix: alert list links did not work, changed dashboardUri to Url, this is breaking api change in alert api (#10756) 2018-02-05 09:42:41 +01:00
Torkel Ödegaard 40c9d5f2a3 ux: hide sidemenu in kiosk mode, and while playlist is playing, fixes #107402 2018-02-04 17:32:27 +01:00
Torkel Ödegaard 162f4941f0 fix: restored tags to search 2018-02-03 10:14:45 +01:00
Torkel Ödegaard 5171d7e285 Merge branch 'master' of github.com:grafana/grafana 2018-02-01 15:45:59 +01:00
Torkel Ödegaard c3181552f8 ux: added max width to dashboard settings views 2018-02-01 15:45:15 +01:00
Torkel Ödegaard 50bd9eee55 docs: removed section with session table sql, that is not needed anymore 2018-02-01 13:16:39 +01:00
Torkel Ödegaard d08a829b69 ux: fix for responsive breakpoints and solo mode showing sidemenu 2018-02-01 11:29:04 +01:00
Torkel Ödegaard b55ce1dd72 docs: moved whats new article to master 2018-02-01 10:55:29 +01:00
Torkel Ödegaard e985a9cd7c ux: fixed issue with zoom on graph caused scroll, fixes #10696 2018-02-01 10:36:55 +01:00
Torkel Ödegaard 75cf9ae27d fix: use replace when redirecting to new url 2018-01-31 17:26:35 +01:00
Torkel Ödegaard 4ac21d2e8f docs: added redirect from old provision page, #10691 2018-01-31 16:20:14 +01:00
Torkel Ödegaard 7cd379ac9f docs: fixed order of sidemenu 2018-01-30 16:14:28 +01:00
Torkel Ödegaard cca050ea14 docs: updated versions.json 2018-01-30 15:07:52 +01:00
Torkel Ödegaard b4aa92e7ff docs: added versions file 2018-01-30 13:28:16 +01:00
Torkel Ödegaard b1cf4cf01c fix: InfluxDB Query Editor and selecting template variable in where clause caused issue, fixes #10402, fixes #10663 2018-01-29 17:04:29 +01:00
Torkel Ödegaard a0323e96fa fix: tweak of PR #10635 2018-01-29 10:46:05 +01:00
Torkel Ödegaard dd4374cc65 Merge remote-tracking branch 'origin/10612_table-date-format' 2018-01-29 10:41:57 +01:00
Torkel Ödegaard 9363c40a0c Merge branch 'master' of github.com:grafana/grafana 2018-01-29 10:41:28 +01:00
Torkel Ödegaard b6ce16ebae ux: minor tweak of #10634 2018-01-29 10:41:06 +01:00
Torkel Ödegaard c5a75ab84a Merge remote-tracking branch 'origin/10628_search_media_break' 2018-01-29 09:29:46 +01:00
Torkel Ödegaard cd2161e796 Revert "Fix typeahead to avoid generating new backend request on each keypress. (#10596)" 
This reverts commit 475febd004.
 2018-01-29 08:38:23 +01:00
Torkel Ödegaard 889bc29330 ux: minor change, added import dashboard link to dashboard search side view 2018-01-24 15:29:16 +01:00
Torkel Ödegaard dd70710617 refactor: minor css class naming change of #10505 2018-01-23 16:10:04 +01:00
Torkel Ödegaard 12b08b61d7 Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' 2018-01-23 16:02:46 +01:00
Torkel Ödegaard 3662b03d8f Merge branch 'master' of github.com:grafana/grafana 2018-01-23 13:04:09 +01:00
Torkel Ödegaard dbfaf5dac8 refactor: minor refactoring of PR #10560 2018-01-23 13:03:44 +01:00
Torkel Ödegaard a24aa3ae28 Merge branch 'generic-oauth-jwt' of https://github.com/DanCech/grafana 2018-01-23 12:44:27 +01:00
Torkel Ödegaard 4f59d229fe fix: cloudwatch corrected error handling so original error is not thrown away 2018-01-19 09:24:44 +01:00
Torkel Ödegaard 4720b86f5c Merge remote-tracking branch 'origin/mattttt-style-tweaks' 2018-01-18 19:18:34 +01:00
Torkel Ödegaard 2d192f6cc8 Merge branch 'dashboard_permissions' of github.com:grafana/grafana into dashboard_permissions 2018-01-18 18:24:17 +01:00
Torkel Ödegaard cfa775e012 ds: updated ds nav 2018-01-18 18:17:58 +01:00
Torkel Ödegaard dc3e943a4e feat: ds edit fix 2018-01-18 17:43:41 +01:00
Torkel Ödegaard ccde8d9e2f feat: ds edit nav 2018-01-18 17:42:40 +01:00
Torkel Ödegaard 7dc046d9f5 ux: updated react-layout-grid 2018-01-18 11:33:39 +01:00
Torkel Ödegaard af9d1cc577 Update package.json 
fixed duplicate dev dependency, closes #10542
 2018-01-17 11:53:49 +01:00
Torkel Ödegaard 561561d8fe fix: fixed build issue 2018-01-17 10:48:07 +01:00
Torkel Ödegaard 66edb29f53 fix: multi valued query variables did not work correctly, fixes #10539 2018-01-17 09:41:35 +01:00
Torkel Ödegaard e9d33750cb fix: graphite func editor fixes, this component is messy and ugly as hell 2018-01-16 17:02:03 -05:00
Torkel Ödegaard 1a6bf692c6 fix: minor fixes 2018-01-16 17:02:03 -05:00
Torkel Ödegaard 38f4d5d06d fix: restored previous behavior of form_dropdown, this fixes all my observerd bugs with the dropdown behavior 2018-01-16 17:02:03 -05:00
Torkel Ödegaard 7e750cef43 fix: query editor needs to wait for function definitions to load 2018-01-16 17:02:03 -05:00
Torkel Ödegaard c4c0e7934b Update building_from_source.md 
corrected build instructions, #10532
 2018-01-16 20:15:52 +01:00
Torkel Ödegaard 94b0c79631 Update README.md 
Simplified build instructions i
 2018-01-16 20:14:53 +01:00
Torkel Ödegaard 6edc945e85 Update default_task.js 
removed build clean from test task, #10532
 2018-01-16 20:13:27 +01:00
Torkel Ödegaard 307b419f7c ux: dashboard nav and settings tweaks 2018-01-16 14:41:08 +01:00
Torkel Ödegaard 11ba8070b8 Tag filters in search (#10521) 
* tag filter: initial react component

* dashboard: move tag filter to filterbox

* tag filter: customize value rendering

* tag filter: get color from name

* tag filter:  custom option renderer

* tag filter: mode with tags in different container

* tag filter: refactor

* refactoring PR #10519

* tag filter: refactor of PR #10521
 2018-01-16 12:52:13 +01:00
Torkel Ödegaard 42d7308034 fix: save as enter key now works and folder selection also works, fixes #10464 2018-01-16 12:50:24 +01:00
Torkel Ödegaard 270db4da8b fix: share snapshot controller was missing ngInject comment, fixes #10511 2018-01-15 09:05:26 +01:00
Torkel Ödegaard f3a66ecbcb fix: alert list pause/start toggle was not working properly 2018-01-11 15:18:38 +01:00
Torkel Ödegaard 9606a34e0a fix: removed unused param 2018-01-10 14:34:08 +01:00
Torkel Ödegaard ae9b3186e3 Merge branch 'master' of github.com:grafana/grafana 2018-01-10 14:30:54 +01:00
Torkel Ödegaard d2f866c27c moved angular-mocks out of dependencies 2018-01-10 14:29:19 +01:00
Torkel Ödegaard b76958f07b ux: minor change to alert list page 2018-01-10 14:18:58 +01:00
Torkel Ödegaard 32df74ffec ux: minor word change to alert list 2018-01-10 13:17:43 +01:00
Torkel Ödegaard 686548a6ed fix: updated snapshot test 2018-01-10 13:16:16 +01:00
Torkel Ödegaard 7854f80f5a Merge remote-tracking branch 'origin/10289_user_picker' 2018-01-10 13:14:43 +01:00
Torkel Ödegaard 5d5de23025 refactoring: alert list improvments PR #10452 2018-01-10 11:54:47 +01:00
Torkel Ödegaard 776d17458b Delete CopyQuery.png 2018-01-09 12:50:59 +01:00
Torkel Ödegaard 69936057a9 Delete tgr288gear_line6.pdf 2018-01-09 12:50:18 +01:00