Commit Graph

2921 Commits

Author SHA1 Message Date
Torkel Ödegaard
282b3b3170 Updated wercker file 2015-01-04 14:37:24 +01:00
Torkel Ödegaard
55bc150701 added backend config frontend componenet 2015-01-04 14:36:41 +01:00
Torkel Ödegaard
fc88429282 Graphite: query letter for the whole alfabet, Fixes #1294 2015-01-04 12:25:06 +01:00
Torkel Ödegaard
ee443d91dd Fixed account creation on first github login 2015-01-01 22:27:19 +01:00
Torkel Ödegaard
318338f967 Updated zip release task 2015-01-01 22:26:57 +01:00
Torkel Ödegaard
29c9330965 Changes to config file loading 2015-01-01 15:29:10 +01:00
Torkel Ödegaard
7c72705bc5 more work on build process 2015-01-01 15:28:28 +01:00
Torkel Ödegaard
ad4cf373a6 Work on unifying backend grafnaa and standalone grafana, and being able to build both from the same branch 2014-12-31 19:02:00 +01:00
Torkel Ödegaard
33e3fc70b2 trying to get revision asset replacements to work with different paths 2014-12-31 19:01:10 +01:00
Torkel Ödegaard
9c3cd87bee more work on two grunt build modes, backend/standalone modes 2014-12-31 16:19:45 +01:00
Torkel Ödegaard
f8ddfec98c progress on being able to use exact same code base for backend and standalone version, building optimized build needs a little more work 2014-12-31 14:18:34 +01:00
Torkel Ödegaard
53ff171436 Standalone and backend mode with same code base is starting to work 2014-12-31 12:54:12 +01:00
Torkel Ödegaard
75c77a44c9 Merge branch 'master' of github.com:torkelo/grafana-private into pro
Conflicts:
	src/app/app.js
	src/app/controllers/all.js
	src/app/routes/all.js
	src/app/services/datasourceSrv.js
	src/test/test-main.js
2014-12-31 12:07:22 +01:00
Torkel Ödegaard
11b44f2b01 changes to make requirejs optimizer complete 2014-12-31 11:50:34 +01:00
Torkel Ödegaard
d1e33ec071 Moved routes 2014-12-31 11:48:15 +01:00
Torkel Ödegaard
39f3cfc1eb moved dashboard stuff into a feature folder, not sure about this, but need better structure and better way to organize dependencies 2014-12-31 11:05:19 +01:00
Torkel Ödegaard
2f811375bb Moving templating to feature to feature folder 2014-12-31 09:35:00 +01:00
Torkel Ödegaard
8d7390e765 moved annotation editor and service to features folder 2014-12-31 09:28:30 +01:00
Torkel Ödegaard
8268c65c57 Trying to organize code more around features than the standard controllers, services structure 2014-12-30 21:24:55 +01:00
Torkel Ödegaard
f9b0a01c74 restructuring 2014-12-30 21:08:56 +01:00
Torkel Ödegaard
0a4ccdcef2 moved all graphite code into features/graphite 2014-12-30 20:49:04 +01:00
Torkel Ödegaard
2b02c87b16 updated godeps file 2014-12-30 12:05:01 +01:00
Torkel Ödegaard
e738a67e06 removed the need for symbolic link to grafana/src 2014-12-30 12:03:03 +01:00
Torkel Ödegaard
b2f70c12b9 Updated packages 2014-12-30 11:38:36 +01:00
Torkel Ödegaard
c4a48b35c0 Updated libs 2014-12-30 11:27:36 +01:00
Torkel Ödegaard
9cc47b6b58 Updated godeps file 2014-12-30 11:14:22 +01:00
Torkel Ödegaard
41083b08ce fixed typo in wercker.yml 2014-12-30 11:11:49 +01:00
Torkel Ödegaard
8d6b09e995 Trying to use godep in wercker build 2014-12-30 11:09:50 +01:00
Torkel Ödegaard
599a77c776 Added karma test step to build/relase grunt task 2014-12-30 11:05:24 +01:00
Torkel Ödegaard
d7e796097a Another wercker update 2014-12-30 10:58:13 +01:00
Torkel Ödegaard
79e5dd3794 Updated wercker file 2014-12-30 10:48:46 +01:00
Torkel Ödegaard
ef90f1dca6 Updated readme 2014-12-30 10:37:00 +01:00
Torkel Ödegaard
aafe2c5b98 Updated session lib 2014-12-30 10:28:27 +01:00
Torkel Ödegaard
e9fcca16bd updated to new golang/x/oauth2 2014-12-30 10:10:13 +01:00
Torkel Ödegaard
c04a2ababd added basic wercker file 2014-12-30 09:33:27 +01:00
Torkel Ödegaard
8faa806c90 Refactoring dashboard delete and search 2014-12-29 13:58:06 +01:00
Torkel Ödegaard
164d11c816 InfluxDB now works in proxy mode, influxdb username and password is added in the backend and never exposed to frontend, #8 2014-12-29 13:36:08 +01:00
Torkel Ödegaard
27b11b1d79 InfluxDB now works in proxy mode, influxdb username and password is added in the backend and never exposed to frontend, #8 2014-12-29 13:35:51 +01:00
Torkel Ödegaard
d9386cc2c3 Updated lastest.json 2014-12-29 11:24:14 +01:00
Torkel Ödegaard
38f348e642 Updated version to 1.9.1 2014-12-29 11:21:25 +01:00
Torkel Ödegaard
656ec9c48f SinglestatPanel: added more fontsize options, Closes #1187 2014-12-29 10:51:59 +01:00
Torkel Ödegaard
ec98c201e4 Datasource options are now included in bootData 2014-12-28 19:30:14 +01:00
Torkel Ödegaard
47f226be3b login force full page reload 2014-12-28 19:29:41 +01:00
Torkel Ödegaard
f3132b4513 Trying a different approach to providing frontend settings 2014-12-28 18:37:39 +01:00
Torkel Ödegaard
cfabccc5f2 Work on handling frontend settings 2014-12-28 18:37:09 +01:00
Torkel Ödegaard
f5e8f9334b Fixed test failing in chrome 2014-12-26 11:50:59 +01:00
Torkel Ödegaard
7be2105fd9 Merge pull request #1272 from matschaffer/plugin-spec-support
Allow for plugin testing.
2014-12-26 11:40:54 +01:00
Torkel Ödegaard
49ee388dcf Merge pull request #1274 from matschaffer/panel-alert-tweak
Bring panel alert to front and move tooltip to top.
2014-12-26 11:40:41 +01:00
Mat Schaffer
6cb4b4061c Bring panel alert to front and move tooltip to top.
This makes the panel a lot easier to mouse over without odd visual effects.
2014-12-23 18:12:04 -08:00
Mat Schaffer
85e50ece2e Allow for plugin testing.
With this change in place you can include plugin specs in `grunt test` by creating a `src/config.js` like that includes something like this:

```js
      plugins: {
        // list of plugin panels
        panels: [],
        // requirejs modules in plugins folder that should be loaded
        // for example custom datasources
        dependencies: ['grafana-plugins/atlasDatasource'],
        specs: ['grafana-plugins/specs/atlasDatasource-specs']
      }
```
2014-12-23 12:01:50 -08:00