public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,355 Commits 655 Branches 650 Tags
19552450fa9706f5ed94de40c33a2fc2c7e7bb0e
Commit Graph
9355 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 87c65bcea0 Migrating to use bower for component dependencies 2015-06-13 20:53:08 +02:00
Torkel Ödegaard 6f4b206a99 Added bowerrc file 2015-06-13 20:43:12 +02:00
Torkel Ödegaard 2c88b418fd Fix import from elasticsearch limit, Fixes #1843, Fixes 2154 2015-06-13 20:20:48 +02:00
Torkel Ödegaard 66e60357dc Set email when creating user from auth_proxy header, Fixes #2156 2015-06-13 20:14:44 +02:00
Torkel Ödegaard 30db7e64fb Fixed example redis session config, Fixes #2157 2015-06-13 20:06:53 +02:00
Torkel Ödegaard c6c733a40b Merge branch 'master' of github.com:grafana/grafana 2015-06-13 20:01:50 +02:00
Torkel Ödegaard 4a9bc70ca0 Added new style override, transform negative-Y, Closes #2162 2015-06-13 20:01:15 +02:00
Torkel Ödegaard a815511aef Fixed failing unit test 2015-06-12 10:05:38 +02:00
Torkel Ödegaard bae1e2f0c1 Fix for validating tags in dashboard json in backend, Fixes #2152 2015-06-12 09:04:10 +02:00
Torkel Ödegaard 7ce31bfaa0 changed dependency for gosimple/slug, they had finally removed the gopkgs dependency, Fixes #2153 2015-06-12 08:53:20 +02:00
Torkel Ödegaard 48175101c6 Fixes to template variable with tags and inital state after dashboard load, #2080 2015-06-11 13:38:13 +02:00
Torkel Ödegaard e5280d55b3 Make template variables work in row titles, #1956 2015-06-11 09:35:59 +02:00
Torkel Ödegaard 3675b3fcaa Fixed issue with clearing admin permissions, Fixes #2143 2015-06-11 08:29:12 +02:00
Torkel Ödegaard 5962bcbc6c Do not show create org link when allow_org_create is set to false, Fixes #2135 2015-06-11 08:16:09 +02:00
Torkel Ödegaard b39f8fb4de Do not show Switch to Org item for current organization in the org dropdown, Fixes #2136 2015-06-11 08:05:33 +02:00
Torkel Ödegaard 6deaa87a4c mention fpm in build from source docs, Closes #2145 2015-06-11 07:59:57 +02:00
Torkel Ödegaard 5562651ef0 Fixed spelling on graphite docs page 2015-06-10 17:03:16 +02:00
Torkel Ödegaard 2c00267d58 Changed to more strict sinon version to work around issue in latest sinon 2015-06-10 15:08:32 +02:00
Torkel Ödegaard b5418c40ba fixed AMPQ -> AMQP typo 2015-06-10 14:44:42 +02:00
Torkel Ödegaard 2266ef6809 Minor api refactoring / code clean up 2015-06-10 10:15:42 +02:00
Torkel Ödegaard ca67b49d67 Merge branch 'restrict-tag-keys-values' of https://github.com/lexh/grafana into lexh-restrict-tag-keys-values 2015-06-10 10:07:23 +02:00
Torkel Ödegaard 63cc794f37 Small style fix to login page 2015-06-10 08:27:38 +02:00
Torkel Ödegaard fca6c85abb Fixed clear selections icon for new variable dropdown, #2080 2015-06-09 10:30:51 +02:00
Torkel Ödegaard 604f8a22f7 Fixed state issue with variable value dropdown, #2080 2015-06-09 10:22:43 +02:00
Torkel Ödegaard f6845cd107 Variable value select fixes and refactorings 2015-06-09 10:06:36 +02:00
Torkel Ödegaard c20fa85b82 Renamed variable value select to select dropdown 2015-06-09 09:45:24 +02:00
Torkel Ödegaard bb2d810709 Final work password reset email, Closes #1456 2015-06-08 18:25:04 +02:00
Torkel Ödegaard 95fd34ed14 Merge branch 'emailing' 2015-06-08 17:57:33 +02:00
Torkel Ödegaard db0c442eaf Added configuration options for smtp 2015-06-08 17:56:56 +02:00
Torkel Ödegaard 42fc68baa5 Simplified emailing system and combined mailer and notifications packages 2015-06-08 16:51:25 +02:00
Torkel Ödegaard c8bc0b3bf8 Lots of work on user password reset, #1456 2015-06-08 13:39:02 +02:00
Torkel Ödegaard aa4d60c21e Worked on reset password views, refactored out password strength to a reusable directive 2015-06-08 10:57:01 +02:00
Torkel Ödegaard 4f0a4ea7e7 Merge pull request #2104 from masaori335/kairosdb-metric-find-query 
Add metricFindQuery in KairosDB Datasource Plugin
 2015-06-06 08:50:02 +02:00
Torkel Ödegaard e40b462040 began work on reset password view, and angular controller 2015-06-05 11:45:04 +02:00
Torkel Ödegaard 89418a155a More work on email and notification infra #1456 2015-06-05 11:08:19 +02:00
Torkel Ödegaard 901685bb63 Updated sample config and config docs with example for postgres session provider_config string, #2118 2015-06-05 08:18:37 +02:00
Torkel Ödegaard c709a28f02 More work on email and notification infra #1456 2015-06-05 08:15:38 +02:00
Lex Herbert 463a750c07 OpenTSDB: Restrict typeahead tag keys and values 
When selecting metric tag keys, we only are interested in keys which are
associated with this metric. Likewise, when selecting a value for a
certain key, we only want to consider values which apply to the given
key and metric.
 2015-06-04 17:45:09 -07:00
Torkel Ödegaard 10abf61383 Merge pull request #2115 from tmonk42/exit_codes 
fixing up init script exit codes
 2015-06-04 21:06:30 +02:00
Haneysmith, Nathan fcba62894b remove trailing exit 0 from deb init 2015-06-04 11:40:49 -07:00
Haneysmith, Nathan 77215182f7 fixing up init script exit codes 2015-06-04 11:01:04 -07:00
Torkel Ödegaard 3706d0dedd More work on email and notification infra #1456 2015-06-04 17:23:46 +02:00
Torkel Ödegaard 3f5ab189cd Began work on emailing service #1456 2015-06-04 14:29:39 +02:00
Torkel Ödegaard eb793f7feb Initial work on ldap support, #1450 2015-06-04 09:34:42 +02:00
Masaori Koshiba 4d0c04b80d Add tag support 2015-06-04 01:23:58 +09:00
Masaori Koshiba e9a842259a Add metricFindQuery in KairosDBDatasource 2015-06-03 22:55:31 +09:00
Torkel Ödegaard 2c7d33cdfa Merge branch 'master' into ldap 2015-06-03 14:54:48 +02:00
Torkel Ödegaard 83279604c6 updated search handler 2015-06-03 14:53:52 +02:00
Torkel Ödegaard c821568ac7 Merged new template dropdown 2015-06-03 14:53:52 +02:00
Torkel Ödegaard 1c38619d8c Fixed intendation 2015-06-03 14:53:52 +02:00