woodsaj
|
0903d5541b
|
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
|
2015-12-22 00:23:24 +08:00 |
|
Torkel Ödegaard
|
0a9f705308
|
tech(systemjs): more fixes for optmized build
|
2015-12-21 16:34:18 +01:00 |
|
Torkel Ödegaard
|
dabd680d6b
|
tech(systemjs): merged sync with master, all tests are passing
|
2015-12-21 16:13:24 +01:00 |
|
Torkel Ödegaard
|
0dd7fb7361
|
tech(systemjs): most things work
|
2015-12-18 10:28:00 +01:00 |
|
woodsaj
|
48cf56b69a
|
more renaming. also moved apps and datasource menus
|
2015-12-18 13:46:40 +08:00 |
|
Torkel Ödegaard
|
545c39356a
|
tech(systemjs): starting work on systemjs bundling
|
2015-12-17 19:18:30 +01:00 |
|
Torkel Ödegaard
|
df1e52e394
|
tech(systemjs): more stuff is starting to work
|
2015-12-17 16:30:53 +01:00 |
|
Torkel Ödegaard
|
83ce40191c
|
tech(systemjs): ok, moving forward
|
2015-12-17 14:27:34 +01:00 |
|
Torkel Ödegaard
|
7c06b5cc22
|
tech(systemjs): minor change
|
2015-12-17 13:18:32 +01:00 |
|
Torkel Ödegaard
|
3b8e478a6a
|
tech(systemjs): finally starting to get systemjs and typescript and runtime loading to work together in a manner that I want it to.. took forever
|
2015-12-17 11:46:10 +01:00 |
|
Torkel Ödegaard
|
c24935b519
|
minor progress
|
2015-12-16 17:01:34 +01:00 |
|
Carl Bergquist
|
8ee0e5d11f
|
Merge pull request #3307 from dennisdegreef/addCubicMeters
Add cubic meters to units
|
2015-12-16 16:04:20 +01:00 |
|
Torkel Ödegaard
|
ca84ef38f8
|
angular2 test
|
2015-12-16 12:21:13 +01:00 |
|
Torkel Ödegaard
|
04ff97cd72
|
tech(systemjs): tricky mixing systemjs and requirejs, might need to migrate
|
2015-12-15 20:23:55 +01:00 |
|
Torkel Ödegaard
|
7ee290cc57
|
tech(systemjs): systemjs and jspm work
|
2015-12-15 17:56:16 +01:00 |
|
Torkel Ödegaard
|
2ec5bc77d7
|
Merge branch 'external-plugins'
|
2015-12-15 10:10:48 +01:00 |
|
Torkel Ödegaard
|
201f50b121
|
Merge branch 'master' into external-plugins
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
|
2015-12-14 17:28:57 +01:00 |
|
carl bergquist
|
1cfa523f49
|
style(sidemenu): rename signup method to signout
|
2015-12-14 17:19:26 +01:00 |
|
Carl Bergquist
|
548ee47aa7
|
Merge pull request #3122 from shoonoise/hide_signout
Disable sign out button in case of auth proxy enabled
|
2015-12-14 17:18:04 +01:00 |
|
carl bergquist
|
fab1062c0b
|
Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
closes #2571
closes #2494
|
2015-12-11 15:16:57 +01:00 |
|
Torkel Ödegaard
|
6ea00a4f7c
|
fix(timpicker): another name change to make quick ranges nameing more consistent, fixes #3465
|
2015-12-10 13:01:41 +01:00 |
|
Torkel Ödegaard
|
736d58e35f
|
Merge branch 'updated-list-views' of https://github.com/nchristus/grafana into nchristus-updated-list-views
|
2015-12-09 10:43:51 +01:00 |
|
Torkel Ödegaard
|
64138bd424
|
fix(timepicker): changed name of Day so far -> Today so far, Week to date > Week so far, closes #3465
|
2015-12-09 10:35:39 +01:00 |
|
Nick Christus
|
462a939438
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-07 16:29:51 -06:00 |
|
Torkel Ödegaard
|
fad4875f11
|
Merge pull request #3436 from utkarshcmu/templating
Removed if condition to fix 3370
|
2015-12-07 11:45:32 +01:00 |
|
Torkel Ödegaard
|
4c5cfd51d7
|
fix(metric_editors): Fixes clicking timing issue for typeahead auto dropdown option, fixes #3428
|
2015-12-06 10:13:47 +01:00 |
|
utkarshcmu
|
b6044910ec
|
Removed if condition to fix 3370
|
2015-12-05 06:34:03 -08:00 |
|
woodsaj
|
3c13901695
|
add ui elements for plugins.
This includes support for cusom plugin config directives.
|
2015-12-04 19:21:33 +08:00 |
|
Nick Christus
|
3d178c8eb6
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-03 20:21:15 -06:00 |
|
Torkel Ödegaard
|
cf1f43dc9d
|
feat(influxdb): support for table queries, closes #3409, #3219
|
2015-12-03 15:09:39 +01:00 |
|
Nick Christus
|
d86b2c4fb4
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-12-02 21:33:06 -06:00 |
|
Torkel Ödegaard
|
ee0e4d2b69
|
Merge branch 'master' into external-plugins
Conflicts:
public/app/plugins/panels/table/editor.ts
public/views/index.html
|
2015-12-02 18:30:48 +01:00 |
|
Torkel Ödegaard
|
c351f46e47
|
Merge branch 'hide-zero' of https://github.com/utkarshcmu/grafana into utkarshcmu-hide-zero
|
2015-12-01 13:08:37 +01:00 |
|
Torkel Ödegaard
|
fb9e8d2166
|
feat(table panel): fixed issue with column selection for new table panel
|
2015-12-01 10:16:11 +01:00 |
|
Torkel Ödegaard
|
0f867a3484
|
Merge pull request #3230 from utkarshcmu/time-units
Added currency units, time units, tests
|
2015-11-30 17:29:51 +01:00 |
|
shoonoise
|
5cf3425b93
|
Disable sign out button in case of auth proxy enabled
|
2015-11-26 17:56:45 +03:00 |
|
Torkel Ödegaard
|
aa13a80d83
|
fix(influxdb): fixed issue with metric segment component that caused double events
|
2015-11-26 09:28:59 +01:00 |
|
utkarshcmu
|
1f57cf08a7
|
Added an option to hide zero values
|
2015-11-25 04:38:54 -08:00 |
|
Joakim Lahtinen
|
9c0141e84e
|
Fixed some broken HTML.
Simplified some control flow.
|
2015-11-24 07:29:52 +01:00 |
|
Torkel Ödegaard
|
24b9bc1e55
|
fix(missing files): added missing files, oops
|
2015-11-23 18:20:12 +01:00 |
|
Torkel Ödegaard
|
a1afd2328d
|
fix(elasticsearch): made interval template variable appear in group by time interval dropdown, fixes #3241
|
2015-11-23 14:19:10 +01:00 |
|
Dennis de Greef
|
9c64da4323
|
Add cubic meters to units
|
2015-11-21 21:04:08 +01:00 |
|
Torkel Ödegaard
|
4a69de1f30
|
feat(plugins): made panels work as plugins
|
2015-11-21 13:46:43 +01:00 |
|
Torkel Ödegaard
|
df0bc7bbc4
|
feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185
|
2015-11-20 09:43:10 +01:00 |
|
Torkel Ödegaard
|
63b50ab9b1
|
Merge branch 'master' into external-plugins
|
2015-11-20 08:29:46 +01:00 |
|
Torkel Ödegaard
|
c0beef7572
|
Merge pull request #3252 from alechenninger/avg-ignore-null
Ignore nulls unless 'null as zero' for series.stats.avg
|
2015-11-20 08:27:45 +01:00 |
|
Torkel Ödegaard
|
69daede583
|
feat(external plugins): worked on supporting external plugins better
|
2015-11-19 18:44:07 +01:00 |
|
Torkel Ödegaard
|
b21fa2daa0
|
Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins
|
2015-11-19 11:05:27 +01:00 |
|
Mitsuhiro Tanda
|
37b125ca98
|
override null point mode
|
2015-11-19 15:20:34 +09:00 |
|
Torkel Ödegaard
|
aad824a562
|
feat(tablepanel): completed work on time series aggregations table transform, #3219
|
2015-11-18 17:05:21 +01:00 |
|
Alec Henninger
|
2a600b25e7
|
Ignore nulls unless 'null as zero' for series.stats.avg
|
2015-11-16 08:43:41 -05:00 |
|
utkarshcmu
|
7f9c8a1935
|
Added hours, days units and tests for all
|
2015-11-12 23:56:24 -08:00 |
|
utkarshcmu
|
3c54d14460
|
Added UI for time units, minute scalability
|
2015-11-12 20:26:59 -08:00 |
|
utkarshcmu
|
c5b39a5100
|
Added currency units
|
2015-11-12 09:56:46 -08:00 |
|
Torkel Ödegaard
|
5bc194e1f0
|
Merge branch 'master' of github.com:grafana/grafana
|
2015-11-12 13:47:25 +01:00 |
|
Torkel Ödegaard
|
bbdf75bdfa
|
feat(dashboard): Automatically go into panel edit mode after adding a new panel to the dashboard
|
2015-11-12 11:49:07 +01:00 |
|
Torkel Ödegaard
|
5c0cf9f5d7
|
feat(tablepanel): worked on more display options for table panel
|
2015-11-12 11:36:16 +01:00 |
|
Torkel Ödegaard
|
3cdb3f0d54
|
Merge pull request #3196 from utkarshcmu/custom-time
Timepicker display fixed for now-*
|
2015-11-11 11:28:55 +01:00 |
|
utkarshcmu
|
509c3dc715
|
Fixed time range when using NOW from and to
|
2015-11-11 01:34:24 -08:00 |
|
Torkel Ödegaard
|
a66825c71f
|
Merge branch 'master' into develop
|
2015-11-10 15:26:02 +01:00 |
|
utkarshcmu
|
167c02d773
|
Timepicker display fixed for now-*
|
2015-11-10 04:53:42 -08:00 |
|
utkarshcmu
|
0c50a7437b
|
missed an S at the end
|
2015-11-10 02:29:02 -08:00 |
|
utkarshcmu
|
5339ec66b7
|
added now-3h option
|
2015-11-10 02:22:15 -08:00 |
|
Torkel Ödegaard
|
90cca93951
|
feat(tablepanel): lots of work on table panel
|
2015-11-05 13:13:13 +01:00 |
|
Torkel Ödegaard
|
60c7bfe9a7
|
feat(tablepanel): work on table panel options
|
2015-11-04 22:44:08 +01:00 |
|
Torkel Ödegaard
|
36c4d01ef8
|
feat(tablepanel) began work on new table panel
|
2015-11-02 17:00:47 +01:00 |
|
Torkel Ödegaard
|
d8f68eb118
|
refactoring: moving and renaming things
|
2015-10-30 16:06:29 +01:00 |
|
Torkel Ödegaard
|
97697b93ed
|
refactoring: moving and renaming things
|
2015-10-30 15:58:20 +01:00 |
|
Torkel Ödegaard
|
152b484eb5
|
refactoring: moved app/controllers -> app/core/controllers
|
2015-10-30 15:16:05 +01:00 |
|
Torkel Ödegaard
|
97de8c1cc2
|
refactoring: move moving stuff around
|
2015-10-30 15:04:27 +01:00 |
|
Torkel Ödegaard
|
6cf46b1635
|
refactoring: more moving stuff around
|
2015-10-30 14:44:40 +01:00 |
|
Torkel Ödegaard
|
1665cb4282
|
refactoring: moving components -> core
|
2015-10-30 14:24:04 +01:00 |
|
Torkel Ödegaard
|
1113081aab
|
refactoring: moving components -> core
|
2015-10-30 14:19:02 +01:00 |
|
Torkel Ödegaard
|
39bc3cb532
|
refactoring: moving stuff around
|
2015-10-30 14:04:25 +01:00 |
|
Torkel Ödegaard
|
09b3433e32
|
change(dashboards): made home dashboard and json file dashboards editable unless otherwise specified in json file, closes #2567
|
2015-10-26 18:54:32 +01:00 |
|
Anthony Woods
|
cf89b565a6
|
initial import of thirdParty route support
|
2015-10-15 04:14:09 +08:00 |
|
Nick Christus
|
23404decea
|
added global alerts list stub and styles
|
2015-10-11 16:59:40 -04:00 |
|
Torkel Ödegaard
|
7dc923a292
|
fix(timepicker): fixed displaying of customk time ranges, #2861
|
2015-10-01 16:36:38 +02:00 |
|
Torkel Ödegaard
|
2f68687de9
|
feat(timepicker2): temporarily removed the the option to define custom quick range, will have to be part of future issue, closes #2761
|
2015-09-19 12:20:24 +02:00 |
|
Torkel Ödegaard
|
86f4907cc4
|
feat(panel fullscreen): completly changed how the fullscreen view/edit works, no longer uses css fixed position, yay, closes #2779
|
2015-09-19 11:40:51 +02:00 |
|
Torkel Ödegaard
|
c21cffa6d4
|
fix(timepicker): UTC now works in all scenarios I can think of, manual edit, date picker edit, #2761
|
2015-09-18 21:01:13 +02:00 |
|
Torkel Ödegaard
|
96b0e70ddd
|
feat(timepickerv2): fixed lots of minor issues and updated kairosdb and opentsdb data sources to work with the new date formats
|
2015-09-18 15:06:08 +02:00 |
|
Torkel Ödegaard
|
f5e6722826
|
feat(timepickerv2): more work on new timepicker, now absolute time mixed with relative time works, yesterday, this day last week, etc now work
|
2015-09-18 13:54:31 +02:00 |
|
Torkel Ödegaard
|
3d85e85f29
|
fix(events): fixed handling of onAppEvents when used from rootScope, must supply localscope, can now be used in isolate scope scenarios
|
2015-09-18 12:15:06 +02:00 |
|
Torkel Ödegaard
|
f93215f4ec
|
feat(timepicker2): more progress
|
2015-09-18 10:36:47 +02:00 |
|
Torkel Ödegaard
|
5eefa36111
|
feat(timepickerv2): big progress on new design of new timepicker, #2761
|
2015-09-17 22:44:59 +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
|
a9812167d7
|
feat(timepicker2): worked on more rich time range support
|
2015-09-17 09:44:51 +02:00 |
|
Torkel Ödegaard
|
a0a98cb035
|
feat(timepicker2): working on richer timepicker options
|
2015-09-16 19:49:05 +02:00 |
|
Torkel Ödegaard
|
d705108be5
|
feat(timepicker2): added date math tests
|
2015-09-16 18:48:41 +02:00 |
|
Torkel Ödegaard
|
4ffa26cf2c
|
feat() started work on more feature rich time picker
|
2015-09-15 13:23:36 +02:00 |
|
Torkel Ödegaard
|
2b95cd5081
|
refactor: moving routes into core, improved bundle loader
|
2015-09-15 08:53:06 +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
|
de753bf330
|
fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733
|
2015-09-14 09:33:26 +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 |
|
Torkel Ödegaard
|
7535677ed4
|
fix(build): fixed failing tslint test
|
2015-09-11 21:04:02 +02:00 |
|
Torkel Ödegaard
|
812e4c7cd4
|
refactor: moved array join directive to typecrtipt
|
2015-09-11 10:54:56 +02:00 |
|
Torkel Ödegaard
|
8174b9f041
|
fix(tests): fixed failling backend test
|
2015-09-11 08:58:45 +02:00 |
|
Torkel Ödegaard
|
166a3c4d64
|
tech(typescript): added tslint to default task
|
2015-09-11 08:00:13 +02:00 |
|
Torkel Ödegaard
|
d4a701aad0
|
tech(typescript): more work on typescript
|
2015-09-11 07:47:00 +02:00 |
|
Torkel Ödegaard
|
84371f03b5
|
tech(typescript): more testing and migration
|
2015-09-10 16:47:38 +02:00 |
|
Torkel Ödegaard
|
20407bca89
|
tech(typescript): converted signup controller to typescript
|
2015-09-10 16:21:57 +02:00 |
|
Torkel Ödegaard
|
dceec44671
|
removed tsconfig
|
2015-09-10 14:36:05 +02:00 |
|
Torkel Ödegaard
|
abac8bccc6
|
tech(typescript): its looking good
|
2015-09-10 11:26:40 +02:00 |
|