IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-09-05 04:40:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,595 Commits 892 Branches 731 Tags
54c9b11ae805409a079f9900604533b28550a995
Commit Graph
53 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Woods 04d142cd62 Merge pull request #4502 from grafana/issue4501 
add missing ngInject comment.
 2016-03-29 23:09:49 +08:00
Anthony Woods da98f47502 Merge pull request #4496 from grafana/issue4494 
handle errors when requesting plugin list.
 2016-03-29 16:16:17 +08:00
Anthony Woods 036f407d6a gofmt 2016-03-29 16:04:24 +08:00
Anthony Woods 2c60dbd4fb handle errors when requesting plugin list. fixes #4494 2016-03-29 15:35:08 +08:00
Anthony Woods 776af45c09 update default repo url in grafana-cli 2016-03-28 23:36:27 +08:00
Anthony Woods 4317e4c4a2 Add support for pre/post update hooks in the PluginEditCtrl. 
This allows users to intercept the update procedure from their own
controller to modify the pluginSettings before they are saved and
perform additional tasks like syncing state via a third party API.
 2016-03-02 14:21:25 +08:00
Anthony Woods 91ca5b6f2a Merge pull request #4208 from raintank/suppressNav 
add supressNav property to plugin pages.
 2016-03-01 20:56:31 +08:00
Anthony Woods a8c10dbc08 update json field name of suppressNav 2016-03-01 18:17:40 +08:00
Anthony Woods 74949d306f add supressNav property to plugin pages. 
This allows pages to be registered that dont show up in the
Navigation menu when the App is pinned.
 2016-03-01 18:07:51 +08:00
Anthony Woods 0135dff001 remove forced page header from app pages. 2016-03-01 15:00:33 +08:00
Anthony Woods 35f7a71f9a fix app->plugin renamin in more places 2016-02-29 19:54:36 +08:00
Anthony Woods 4741152f05 correct path for app page links. 2016-02-29 19:37:35 +08:00
Anthony Woods fc8146b53d Merge pull request #4187 from raintank/issue4185 
replace 'app' with 'plugins' where needed.
 2016-02-29 15:59:30 +08:00
Anthony Woods 641845519d replace 'app' with 'plugins' where needed. 2016-02-29 15:50:02 +08:00
Anthony Woods c3032f7ba3 Merge pull request #3890 from daniellee/joinurlfragments 
No added trailing slash if proxypath is empty in JoinUrlFragments
 2016-01-29 14:11:43 -05:00
Anthony Woods 2e9272c778 Merge remote-tracking branch 'upstream/master' into apiPlugin 2016-01-30 01:38:01 +08:00
Anthony Woods 79e7ae4424 fix sql query in GetAdminStats. fixes #3883 2016-01-29 09:38:51 +08:00
Anthony Woods c8c337cead use PBKDF2 to esnure key is 23bytes. 2016-01-26 05:15:29 +08:00
Anthony Woods 05868bc1df fix typo 2016-01-26 04:24:44 +08:00
Anthony Woods 092bb69c41 instead of padding with 0's, cycle through the secret. 2016-01-26 04:18:44 +08:00
Anthony Woods 40d946a6e3 add drop table to ensure existing installs get new schema 2016-01-26 04:18:18 +08:00
Anthony Woods 32f78d465b add secureJsonData to appSettings model. 
- adds the new column to the DB table.
- data stored in the DB is encrypted
- update appRouteHeaders templates to use the jsonData and
decrypted secureJsonData
 2016-01-23 06:17:22 +08:00
Anthony Woods ab3b586838 add encryption util functions 2016-01-23 03:15:39 +08:00
Anthony Woods f94599cd29 merge apiPlugins with appPlugins 2016-01-22 01:15:04 +08:00
Anthony Woods dcde1422b7 add support for apiPlugin headers. 
The header content uses text/Template.  If the apiPlugin is
bundled in an App, then the appSettings.JsonData is passed
to the header template.
 2016-01-21 11:41:59 +08:00
Anthony Woods 423eca6e7d add support for fetching appSettings by appId 2016-01-21 11:41:02 +08:00
Anthony Woods fd52320460 set includedAppId of apiPlugins 2016-01-21 11:39:51 +08:00
Anthony Woods 462608517b set pluginDir of apiPlugin object 2016-01-21 11:38:27 +08:00
Anthony Woods 9586493632 add apiPluginHeader support 2016-01-21 11:37:48 +08:00
Anthony Woods 1bca28ad12 include the jsonData in the AppSettings DTO 2016-01-21 02:23:24 +08:00
Anthony Woods 9e121ef0c8 add save button to config page 
configView directives can update the appModel object.  We need
a save button to persist the updates.
 2016-01-21 02:21:30 +08:00
Anthony Woods 92a085550e fix up imports 2016-01-20 06:17:48 +08:00
Anthony Woods c4a0ec844c get apiPlugins working again. 2016-01-20 06:13:45 +08:00
Anthony Woods cf89b565a6 initial import of thirdParty route support 2015-10-15 04:14:09 +08:00
Anthony Woods 196b7846cc add support for robots.txt file 2015-06-15 19:02:38 -04:00
Anthony Woods b915bb98fb fix whitespace 2015-05-05 16:21:37 +08:00
Anthony Woods 8aef297e71 show sidemenu when admin user logs in the first time. #54 2015-05-05 10:43:19 +08:00
Anthony Woods 7a8851c5ab default sidemenu to open #54 2015-05-01 17:02:00 +08:00
Anthony Woods 81636d8634 expose orgId via currentUser object. fixes #1907 2015-04-29 15:14:49 +08:00
Anthony Woods b72eba1ef2 refactor handling of refresh when urlValues being used for templates. fixes #1862 2015-04-29 14:55:39 +08:00
Anthony Woods f227002a80 fixes #1880 dashboard_snapshot table does not have a data column 2015-04-25 18:51:25 +08:00
Anthony Woods d84d92f73c fixes #1880 correct mysql statement for modifying column data type 2015-04-25 18:46:30 +08:00
Anthony Woods b6a4db3f8a always refresh varible options if refresh=true 2015-04-24 00:19:16 +08:00
Anthony Woods 7010df0fe8 fixes #1619 Secure PhantomJS Png rendering 
removes auth hack to allow phantomjs to query pages as a user
without auth.  Instead we pass phantomjs the session cookie,
which it then includes in the request.
 2015-03-21 07:14:13 +08:00
Anthony Woods 422324723a Merge pull request #1609 from raintank/1606 
gofmt. remove extra whitespace
 2015-03-18 00:55:06 +08:00
Anthony Woods 12e033976b Merge remote-tracking branch 'upstream/develop' into 1606 2015-03-17 23:43:40 +08:00
Anthony Woods fc5839d8f1 gofmt. remove extra whitespace 2015-03-17 23:42:16 +08:00
Anthony Woods 32071445af Merge pull request #1607 from raintank/1606 
fixes #1606 emit orgCreated event when new org created
 2015-03-17 23:37:24 +08:00
Anthony Woods bce62c49d0 fixes #1606 2015-03-17 23:10:49 +08:00
Anthony Woods 7235bd19ea Merge branch '1606' of github.com:raintank/grafana into 1606 2015-03-17 23:10:33 +08:00
Anthony Woods 6a09a7c398 fixes #1606 emit OrgCreated event when new org created. 2015-03-17 23:09:43 +08:00
Anthony Woods 068ccf1c0f fixes 1606 emit OrgCreated event when new org created. 2015-03-17 23:07:08 +08:00
Anthony Woods b9b63f695d fixes #1518 fix table name used in dashboard delete. 2015-02-24 08:56:10 +00:00