Erik Sundell 9e558b70d7 Merge branch '14293-metric-display-names' into reactify-stackdriver ... # Conflicts: # public/app/plugins/datasource/stackdriver/partials/query.aggregation.html # public/app/plugins/datasource/stackdriver/partials/query.editor.html # public/app/plugins/datasource/stackdriver/partials/query.filter.html # public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts # public/app/plugins/datasource/stackdriver/query_ctrl.ts # public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts # public/sass/_grafana.scss		2018-12-19 09:21:35 +01:00
..
actions	Trying to reduce the amount of duplication with preferences	2018-11-15 13:37:29 +01:00
components	Merge branch '14293-metric-display-names' into reactify-stackdriver	2018-12-19 09:21:35 +01:00
controllers	Hid "Forgot your password" link from login menu when reset is disabled	2018-12-03 15:35:25 +02:00
copy	cleaned up the flow	2018-10-24 14:33:53 +02:00
directives	updated dropdown typeahead to place down instead of up, works better when inside scrollable area	2018-12-17 13:08:09 +01:00
filters	Changed functions to arrow functions for only-arrow-functions rule. (#13131)	2018-09-05 07:47:30 +02:00
live	changed var to const (#13061)	2018-08-29 14:26:50 +02:00
reducers	Merge branch 'master' into develop	2018-11-15 17:00:03 +01:00
selectors	Folder pages to redux (#13235)	2018-09-13 14:10:51 +02:00
services	Merge branch 'develop' into panel-edit-in-react	2018-11-22 13:46:12 +01:00
specs	Explore: Improved line parsing for logging	2018-12-10 10:05:57 -08:00
utils	Merge branch 'master' into develop	2018-12-07 14:59:38 +01:00
angular_wrappers.ts	fix search tag issues, fixes #14391	2018-12-10 13:23:38 +01:00
app_events.ts	changed var to const (#13061)	2018-08-29 14:26:50 +02:00
config.ts	fixed unit tests	2018-12-06 12:29:55 -08:00
constants.ts	fixed issues when changing type, need to remove event listeners and cleanup props	2018-11-16 10:00:13 +01:00
core_module.ts	react panels query processing	2018-10-14 18:19:49 +02:00
core.ts	Merge remote-tracking branch 'upstream/master' into graph-legend-to-react	2018-10-22 17:18:35 +03:00
jquery_extended.ts	Changed functions to arrow functions for only-arrow-functions rule.	2018-09-04 17:02:32 +02:00
lodash_extended.ts	Changed functions to arrow functions for only-arrow-functions rule. (#13131)	2018-09-05 07:47:30 +02:00
logs_model.ts	Merge pull request #14438 from grafana/davkal/explore-enhanced-log-parsing	2018-12-11 09:10:45 +01:00
mod_defs.d.ts	prettier: change to single quoting	2017-12-20 12:33:33 +01:00
nav_model_srv.ts	changed var to let in last files (#13087)	2018-08-30 08:58:43 +02:00
partials.ts	Changed functions to arrow functions for only-arrow-functions rule.	2018-09-04 17:02:32 +02:00
profiler.ts	Changed functions to arrow functions for only-arrow-functions rule.	2018-09-04 17:02:32 +02:00
store.ts	Explore: Add history to query fields	2018-08-06 14:45:03 +02:00
table_model.ts	prevent explore from crashing when table is not present in response	2018-11-28 14:31:20 +01:00
time_series2.ts	changed var to let in 50 files (#13075)	2018-08-30 09:03:11 +02:00