Commits · 6f6cd5116e558b7b4ebc74b2f3d58a9f699c935c · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

26 Dec, 2013 5 commits
- fixes after upstream merge · 6f6cd511
  Torkel Ödegaard committed Dec 26, 2013
  
  6f6cd511 Browse Files
- Merge remote-tracking branch 'upstream/master' · 4aceb608
```
Conflicts:
	src/app/directives/kibanaPanel.js
	src/app/panels/bettermap/editor.html
	src/app/panels/bettermap/module.js
	src/app/panels/hits/editor.html
	src/app/panels/map/editor.html
	src/app/panels/pie/editor.html
	src/app/panels/table/module.html
	src/app/panels/table/pagination.html
	src/app/panels/terms/editor.html
	src/app/panels/terms/module.js
	src/app/partials/dasheditor.html
	src/css/bootstrap.dark.min.css
```
  Torkel Ödegaard committed Dec 26, 2013
  4aceb608 Browse Files
- legend aligns with left or right y axis depending on axis afinity · 53f724f6
  Torkel Ödegaard committed Dec 26, 2013
  
  53f724f6 Browse Files
- feature: assign second y axis to graphite target · 74ad7bb0
  Torkel Ödegaard committed Dec 26, 2013
  
  74ad7bb0 Browse Files
- fixed so that full editor controls are only loaded when opening editor · f7544f3e
  Torkel Ödegaard committed Dec 26, 2013
  
  f7544f3e Browse Files
25 Dec, 2013 4 commits
- bugfixes and improvements to graphite target editor · c9260d7e
  Torkel Ödegaard committed Dec 25, 2013
  
  c9260d7e Browse Files
- target editor is starting to work better, now switch between text edit mode and easy gui version · 7cbd88f3
  Torkel Ödegaard committed Dec 25, 2013
  
  7cbd88f3 Browse Files
- small fix to error handling · bb6068ac
  Torkel Ödegaard committed Dec 25, 2013
  
  bb6068ac Browse Files
- finally figured out target editor design · 03783785
  Torkel Ödegaard committed Dec 25, 2013
  
  03783785 Browse Files
24 Dec, 2013 9 commits
- hacked scroll stuff · 5da23f9b
  Torkel Ödegaard committed Dec 25, 2013
  
  5da23f9b Browse Files
- added text edit mode to targets · 691b763c
  Torkel Ödegaard committed Dec 24, 2013
  
  691b763c Browse Files
- small changes / fixes to target editing · 8308d95e
  Torkel Ödegaard committed Dec 24, 2013
  
  8308d95e Browse Files
- styling changes to function panel · f090c79d
  Torkel Ödegaard committed Dec 24, 2013
  
  f090c79d Browse Files
- integrated parser into graphite target editor · bc3cad20
  Torkel Ödegaard committed Dec 24, 2013
  
  bc3cad20 Browse Files
- integrated parser into graphite target editor · dd902d5a
  Torkel Ödegaard committed Dec 24, 2013
  
  dd902d5a Browse Files
- integrated parser into graphite target editor · 042e2a20
  Torkel Ödegaard committed Dec 24, 2013
  
  042e2a20 Browse Files
- parser and lexer is working ok · e19d3a53
  Torkel Ödegaard committed Dec 24, 2013
  
  e19d3a53 Browse Files
- improved parser code · 2ded42e9
  Torkel Ödegaard committed Dec 24, 2013
  
  2ded42e9 Browse Files
23 Dec, 2013 2 commits
- parser working horrible code · 35ae9e33
  Torkel Ödegaard committed Dec 23, 2013
  
  35ae9e33 Browse Files
- began work on parser, lexer · 8f77a821
  Torkel Ödegaard committed Dec 23, 2013
  
  8f77a821 Browse Files
22 Dec, 2013 4 commits
- trying to get more functions to work · 4f0042be
  Torkel Ödegaard committed Dec 22, 2013
  
  4f0042be Browse Files
- refactoring graphite target editor · 21ef0cdc
  Torkel Ödegaard committed Dec 22, 2013
  
  21ef0cdc Browse Files
- add function works · 76fa88cf
  Torkel Ödegaard committed Dec 22, 2013
  
  76fa88cf Browse Files
- continued work on function editing · 2032ff66
  Torkel Ödegaard committed Dec 22, 2013
  
  2032ff66 Browse Files
21 Dec, 2013 1 commit
- func editor starting to work · 3059870b
  Torkel Ödegaard committed Dec 21, 2013
  
  3059870b Browse Files
20 Dec, 2013 6 commits
- func editor work · 089b1f53
  Torkel Ödegaard committed Dec 20, 2013
  
  089b1f53 Browse Files
- began work on function panel · 35bdc1dd
  Torkel Ödegaard committed Dec 20, 2013
  
  35bdc1dd Browse Files
- starting to get something working with the graphite target editor · 5dded7e0
  Torkel Ödegaard committed Dec 20, 2013
  
  5dded7e0 Browse Files
- got subsegment selection working · 4f6f9742
  Torkel Ödegaard committed Dec 20, 2013
  
  4f6f9742 Browse Files
- working on graphite target editor · 816cc986
  Torkel Ödegaard committed Dec 20, 2013
  
  816cc986 Browse Files
- working on graphite target editor · 8e69f825
  Torkel Ödegaard committed Dec 20, 2013
  
  8e69f825 Browse Files
19 Dec, 2013 1 commit
- More efficient loading of setting panels and improved layuout · 83021709
  Rashid Khan committed Dec 18, 2013
  
  83021709 Browse Files
17 Dec, 2013 4 commits
- began work on graphite target editor · 56b34432
  Torkel Ödegaard committed Dec 17, 2013
  
  56b34432 Browse Files
- quicker redraw when entering full edit mode · 591846c8
  Torkel Ödegaard committed Dec 17, 2013
  
  591846c8 Browse Files
- added height setting to 200px when in full edit mode · c004532c
  Torkel Ödegaard committed Dec 17, 2013
  
  c004532c Browse Files
- Added parsing of other multifield values to field mapper. Terms panel now looks… · 072eda28
```
Added parsing of other multifield values to field mapper. Terms panel now looks for a .raw if one exists and uses it.
```
  Rashid Khan committed Dec 16, 2013
  072eda28 Browse Files
16 Dec, 2013 3 commits
- load all metrics now works · 16b0d797
  Torkel Ödegaard committed Dec 16, 2013
  
  16b0d797 Browse Files
- closes #735 · 48d5c91c
  Rashid Khan committed Dec 16, 2013
  
  48d5c91c Browse Files
- began work on load all metrics (index.json) from graphite into elastic search · 1cbe067b
  Torkel Ödegaard committed Dec 16, 2013
  
  1cbe067b Browse Files
15 Dec, 2013 1 commit
- added yaxis label · 8b83f057
  Torkel Odegaard committed Dec 15, 2013
  
  8b83f057 Browse Files