Denny Schäfer
d1534d4dcf
Fix changelog (double issue entry and missing version headline)
2015-09-18 10:46:04 +02:00
Torkel Ödegaard
a8a94ef87b
Merge branch 'master' into timepicker2
2015-09-18 10:36:50 +02:00
Torkel Ödegaard
f93215f4ec
feat(timepicker2): more progress
2015-09-18 10:36:47 +02:00
ubhatnagar
9af460600d
Fixed Indentation and Grunt run.
2015-09-18 00:50:55 -07:00
ubhatnagar
e1576b7131
Added Manage Dashboard Tooltip, hides when clicked.
2015-09-18 00:45:29 -07:00
Torkel Ödegaard
5d05de8bda
Merge branch 'master' of github.com:grafana/grafana
2015-09-18 08:39:06 +02:00
Torkel Ödegaard
5e949b0564
fix(quota): fixed failing quota unit tests
2015-09-18 08:36:58 +02:00
Torkel Ödegaard
2a52d9bdf6
feat(timepicker2): more work on new timepicker
2015-09-18 08:17:19 +02:00
Torkel Ödegaard
ebf49d0668
Merge pull request #2771 from decbis/maxSeries-func-for-groupByNode
...
Added maxSeries option for groupByNode Graphite function
2015-09-18 08:16:46 +02:00
Torkel Ödegaard
f42955ab99
Merge pull request #2755 from Dieken/patch-1
...
fix duplicate tag value suggestions and relax limit on /api/search/lookup
2015-09-18 08:08:18 +02:00
Mike Kobyakov
5d516592d9
Merge remote-tracking branch 'upstream/master'
2015-09-17 23:07:52 -07:00
Eugen Dinca
7dc2b36413
Added maxSeries option for groupByNode function
2015-09-17 16:50:09 -04:00
Torkel Ödegaard
5eefa36111
feat(timepickerv2): big progress on new design of new timepicker, #2761
2015-09-17 22:44:59 +02:00
Cagdas Cirit
c26209d579
Update debian.md
2015-09-17 18:25:36 +02:00
Torkel Ödegaard
a30f73fe36
feat(timepicker): more work on getting new time formats to work in all data sources
2015-09-17 12:40:04 +02:00
Torkel Ödegaard
1a9c52e17f
feat(timepicker): lots of big changes, moving to datemath from kbn.parseDateMath, moving to moment dates instead of native javascript dates
2015-09-17 11:21:38 +02:00
Torkel Ödegaard
5ad38ee9f8
feat(timepicker2): fixed timesrv specs
2015-09-17 09:57:59 +02:00
Torkel Ödegaard
4c79591403
fix(graphite): removed debug comment
2015-09-17 09:45:53 +02:00
Torkel Ödegaard
a9812167d7
feat(timepicker2): worked on more rich time range support
2015-09-17 09:44:51 +02:00
raj dutt
a7cc36f741
Update CHANGELOG.md
2015-09-16 23:50:02 -04:00
raj dutt
4c0262cbd0
Update CHANGELOG.md
2015-09-16 23:46:48 -04:00
Torkel Ödegaard
a0a98cb035
feat(timepicker2): working on richer timepicker options
2015-09-16 19:49:05 +02:00
Liu Yubao
4fccfbf543
increase limit to lookup unique metric tag values
...
Default limit is 25 which is too small. Considering currently the
/api/search/lookup query isn't narrowed down by selected tag
keys and values (see https://github.com/grafana/grafana/pull/1433 ),
the limit is set to 3000, this should be fine because people rarely
create new graph panel.
2015-09-17 01:36:36 +08:00
Liu Yubao
62ae80eeae
deduplicate tag value suggestions for OpenTSDB
2015-09-17 01:25:28 +08:00
Torkel Ödegaard
d705108be5
feat(timepicker2): added date math tests
2015-09-16 18:48:41 +02:00
Torkel Ödegaard
3912eb7b26
Merge branch 'master' into timepicker2
2015-09-16 17:03:08 +02:00
Torkel Ödegaard
1f959272c5
feat(migration): added back support to import old dashboard from from Elasticsearch
2015-09-16 16:28:41 +02:00
Torkel Ödegaard
f9cd942363
Merge branch 'master' of github.com:grafana/grafana
2015-09-16 15:17:57 +02:00
Torkel Ödegaard
1282da52eb
Merge pull request #2750 from elliot/patch-1
...
Fixed 404 error for robots.txt
2015-09-16 12:09:56 +02:00
Elliot Anderson
10c099a52d
Fixed 404 error for robots.txt
2015-09-16 11:02:50 +10:00
Torkel Ödegaard
fa0542ca8b
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:33:21 +02:00
woodsaj
3926226417
fix getting default quota as map[string]int64
2015-09-15 20:31:58 +08:00
Torkel Ödegaard
6a30511fc4
Merge branch 'quotas' of https://github.com/raintank/grafana into raintank-quotas
2015-09-15 14:23:13 +02:00
Torkel Ödegaard
4ffa26cf2c
feat() started work on more feature rich time picker
2015-09-15 13:23:36 +02:00
woodsaj
1ad10914ce
add quota middleware unittests
2015-09-15 18:19:47 +08:00
woodsaj
86ed85aa6e
move toMap function to be a method on the quota structs
2015-09-15 17:18:26 +08:00
woodsaj
b7de847236
add unittests for quota sqltore methods.
2015-09-15 17:10:46 +08:00
woodsaj
3cf2cd4684
be sure to pass result obj by reference to xorm.
2015-09-15 17:10:16 +08:00
Torkel Ödegaard
2b95cd5081
refactor: moving routes into core, improved bundle loader
2015-09-15 08:53:06 +02:00
Torkel Ödegaard
8f45324bce
fix(): fixed requirejs build
2015-09-15 08:20:26 +02:00
Torkel Ödegaard
5545cdbf4d
refactor: improving structure, moving things into a core module
2015-09-15 08:17:40 +02:00
Torkel Ödegaard
9dec50832d
refactor: refactoring app boot up and core structure
2015-09-14 22:54:00 +02:00
Torkel Ödegaard
64973f1d57
fix(settings): another attempt at fixing, #2736
2015-09-14 15:54:35 +02:00
Torkel Ödegaard
d7bfb727b0
fix(settings): reverted prev settings fix for detecting public_gen folder in dev, caused issue for prod build
2015-09-14 13:42:23 +02:00
Torkel Ödegaard
37ad58c69e
fix(gofmt): somehow api.go did not pass gofmt test
2015-09-14 12:30:30 +02:00
Torkel Ödegaard
de753bf330
fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733
2015-09-14 09:33:26 +02:00
Torkel Ödegaard
d17f8538b2
fix(backend): made public_gen detection more bullet proof, #2731
2015-09-13 15:23:23 +02:00
Torkel Ödegaard
1900c81d9f
tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build
2015-09-13 12:13:47 +02:00
Torkel Ödegaard
9db6f82628
refactor: finished timepicker to typescript and directive refactor
2015-09-12 12:52:50 +02:00
Torkel Ödegaard
d96a6a59ee
refactor: moved timepicker from a simple panel to component, removed simple panel directive
2015-09-12 11:49:27 +02:00
