public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,332 Commits 655 Branches 650 Tags
659a01903e3bf6963da17029cd2b4304f5554bd7
Commit Graph
44332 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 222319d924 macaron transition progress 2014-10-05 21:13:07 +02:00
mikhailov 2d3f396571 Extract repetitive CSS inline styles 
Inline styles slow down rendering proportionally to containers number
 2014-10-05 18:30:22 +01:00
Torkel Ödegaard 201e1d3e6d Macaron rewrite 2014-10-05 16:50:04 +02:00
Torkel Ödegaard 2c72831be1 before macaron 2014-10-05 15:34:24 +02:00
Torkel Ödegaard a4204880e8 started work on new arch 2014-10-04 13:33:20 +02:00
George Negoita 51bcbdac75 second parameter of groupByNode() is 0 indexed 2014-10-04 02:33:36 +03:00
Torkel Ödegaard 5d120de70e Filtered logging and url query helper 2014-10-03 09:03:16 +02:00
Torkel Ödegaard e63889d5c4 Css fix for metrics tab, help boxes did extend page height so could not scroll if they extended below screen, #891 2014-10-03 07:31:27 +02:00
Torkel Ödegaard fe6a7c58bf Fixed issue casued by recent angular upgrade and stateful filter, casued template vars in graph titles no update properly, angular was not updated in 1.8.1 so this does affect any released version, Closes #892 2014-10-02 21:48:00 +02:00
Torkel Ödegaard 5f1b4e6183 added ldap dev docker file 2014-10-02 13:42:25 +02:00
Torkel Ödegaard 1e81f8ecfc Merge branch 'master' of github.com:torkelo/grafana-private into pro 2014-10-02 12:26:20 +02:00
Torkel Ödegaard dac3cb15c4 Merge branch 'v1.8.x' 2014-10-02 12:17:37 +02:00
Torkel Ödegaard ca654ccaf7 fixed stupid unit test mistake 2014-10-02 12:17:10 +02:00
Torkel Ödegaard 30512b7032 Merge fix from 'v1.8.x' branch 
Conflicts:
	CHANGELOG.md
 2014-10-02 12:15:21 +02:00
Torkel Ödegaard bc8fd62cff Dashboard: fix for dashboard schema upgrade during load, ensure that annotation and templating object as a list array, Closes #890 2014-10-02 12:13:18 +02:00
Torkel Ödegaard a9a51ee3c6 Fix to new checkboxes in features toggles tab 2014-10-02 11:54:06 +02:00
Torkel Ödegaard 28c5fc48ee updated sharePanel with width & height 2014-10-02 11:18:26 +02:00
Torkel Ödegaard 2d2da7c881 Small tweak to shared tooltip edit option in Display styles tab 2014-10-02 10:55:08 +02:00
Torkel Ödegaard d22d8c4905 Added grafana logo to repo instead of fetching it from grafana.org, Fixes #881 2014-10-02 10:24:18 +02:00
Torkel Ödegaard bcdc8eafa6 Updated gitter badge 2014-10-02 10:13:23 +02:00
Torkel Ödegaard 9cf6ace979 Updated gitter badge 2014-10-02 10:09:16 +02:00
Torkel Ödegaard eef063cec2 Merge pull request #889 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.md
 2014-10-02 10:05:01 +02:00
The Gitter Badger 8b9bdf9054 Added Gitter badge 2014-10-02 07:59:43 +00:00
Torkel Ödegaard 05f9e5eef1 rendering 2014-10-01 21:07:58 +02:00
Torkel Ödegaard eb28e63c08 updated 2014-10-01 20:02:42 +02:00
Torkel Ödegaard 1c7b898b01 Dashboard: show error when importing dashboard json file with broken/incorrect json syntax, Closes #878 2014-10-01 13:56:57 +02:00
Torkel Ödegaard 7ad18da08e update to test helper 2014-10-01 13:49:36 +02:00
Torkel Ödegaard 5530915b49 Updated AngularJS from 1.3-beta-17 to 1.3-RC3 2014-10-01 13:44:45 +02:00
Torkel Ödegaard 4a73e2d0e9 Solo panel and phantom rendering work 2014-10-01 13:20:30 +02:00
Torkel Ödegaard b499bdea3b working on panel rendering 2014-10-01 11:37:04 +02:00
Torkel Ödegaard de1de852fc worked on solo panel 2014-10-01 11:27:58 +02:00
Torkel Ödegaard 77f380c94b Graph: shared tooltip improvements, info tooltip when point counts are not the same, #850 2014-10-01 10:30:24 +02:00
Torkel Ödegaard c34d2f91cc Merge branch 'master' of github.com:torkelo/grafana-private into pro 2014-10-01 09:47:44 +02:00
Torkel Ödegaard ee42ea5f3b merged with master 2014-10-01 09:47:32 +02:00
Torkel Ödegaard c79ab84fdf More fixes related to shared crosshair #880 2014-10-01 09:42:42 +02:00
Torkel Ödegaard d77448d84e Fixed unit tests for grafanaGraph component 2014-10-01 09:10:49 +02:00
Torkel Ödegaard 8fc5a2785f Refactoring and fixes for PR #880 2014-10-01 09:08:11 +02:00
Torkel Ödegaard 27da2b026f Merge branch 'add_shared_croshair_to_dashboards' of github.com:toni-moreno/grafana into toni-moreno-add_shared_croshair_to_dashboards 2014-10-01 08:00:20 +02:00
Torkel Ödegaard 2e9cc2a74e Fix for SharePanelCtrl-specs and travis-ci timezone issue 2014-10-01 07:58:31 +02:00
toni-moreno ffd370176d fix tooltip test expecting for stacked data 2014-10-01 07:15:20 +02:00
toni-moreno 44f2a375f6 Added shared crosshair to dashboards to track better all graphs, and little Fix for #884 2014-10-01 07:03:59 +02:00
Torkel Ödegaard 05cb97819c Updated changelog v1.8.1 2014-09-30 18:21:19 +02:00
Torkel Ödegaard 282c834d9f updated package.json 2014-09-30 17:58:02 +02:00
Torkel Ödegaard 4a6ff9e2aa Merge branch 'v1.8.x' 2014-09-30 17:57:30 +02:00
Torkel Ödegaard ce972d4f19 Graph: css & scroll fix for dropdown menus in graph edit mode, Closes #855 2014-09-30 17:56:43 +02:00
Torkel Ödegaard b250d10320 Trying to fox unit tests for sharePanelCtrl 2014-09-30 17:55:07 +02:00
Torkel Ödegaard 8a2541c220 Merge branch 'master' of github.com:torkelo/grafana-private into pro 2014-09-30 15:35:20 +02:00
Torkel Ödegaard 6991e5f3ef updated 2014-09-30 15:34:31 +02:00
Torkel Ödegaard f63706d118 Small update to share panel 2014-09-30 15:31:18 +02:00
Torkel Ödegaard c41aa64719 ShareModal: Added template variables to share url, and an option for it, #864 2014-09-30 15:19:48 +02:00