IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 01:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,005 Commits 5,080 Branches 538 Tags 1.9 GiB
14766ad38e
Commit Graph

3005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
14766ad38e Updated wercker, moved s3sync to deploy step 2015-03-04 09:12:32 +01:00
Torkel Ödegaard
dfcf68f21d Moved npm install before test 2015-03-04 07:20:36 +01:00
Torkel Ödegaard
d89c77af54 Small changes to build scripts 2015-03-04 07:09:59 +01:00
Torkel Ödegaard
2d7d70b90f removed old todo file 2015-03-03 21:36:51 +01:00
Torkel Ödegaard
5dc905e35d Updated wercker file 2015-03-03 21:11:37 +01:00
Torkel Ödegaard
660d44b6ad Fixed form issue with firefox and IE, Closes #1551 2015-03-03 20:47:35 +01:00
Torkel Ödegaard
d3d39b3e17 s3 sync working finally 2015-03-03 20:35:42 +01:00
Torkel Ödegaard
3fd2f87b15 another wercker failure, trying this 2015-03-03 20:32:37 +01:00
Torkel Ödegaard
9e7a0f8d83 Updated wercker again 2015-03-03 20:26:39 +01:00
Torkel Ödegaard
6703f0514d Another attemp at s3 sync 2015-03-03 20:17:13 +01:00
Torkel Ödegaard
02f4eb53dd Updated wercker s3 step 2015-03-03 20:12:11 +01:00
Torkel Ödegaard
04597b3f54 Updated wercker test step 2015-03-03 20:08:20 +01:00
Torkel Ödegaard
4379f58213 Fixed intendation in wercker file 2015-03-03 19:59:53 +01:00
Torkel Ödegaard
2906d643a5 Testing s3sync from wercker build 2015-03-03 19:58:57 +01:00
Torkel Ödegaard
bec9504cd8 Updated wercker file again 2015-03-03 19:17:24 +01:00
Torkel Ödegaard
7a8889e7f5 Added rpm tools to wercker pre build step 2015-03-03 19:00:22 +01:00
Torkel Ödegaard
8054f6a2d1 Updated build and wercker, again 2015-03-03 18:11:16 +01:00
Torkel Ödegaard
f2595917c6 updated wercker build, trying to install ruby and fpm in wercker step 2015-03-03 18:00:58 +01:00
Torkel Ödegaard
55b40aeb65 updated build.go 2015-03-03 17:58:13 +01:00
Torkel Ödegaard
4f2bca08f1 Updated wercker file again... 2015-03-03 17:56:55 +01:00
Torkel Ödegaard
48d83a4dc4 Updated wercker file 2015-03-03 17:56:08 +01:00
Torkel Ödegaard
2362f9574e Updated wercker file 2015-03-03 17:50:33 +01:00
Torkel Ödegaard
8ba9b8d7bd added custom wercker box 2015-03-03 17:47:26 +01:00
Torkel Ödegaard
c6d4b5cc86 Working on build steps 2015-03-03 17:42:50 +01:00
Torkel Ödegaard
0db55b6194 Work on deb and rpm packages, both seem to work now, #1476 2015-03-03 17:14:58 +01:00
Torkel Ödegaard
59da4a0b3b Updates to build and wercker file 2015-03-03 12:09:15 +01:00
Torkel Ödegaard
9192acf250 Fixed js style errors 2015-03-03 10:20:52 +01:00
Torkel Ödegaard
7e0f1a57af Progress on deb and rpm packaging, renamed config files, added file logging, #1476 2015-03-03 10:18:37 +01:00
Torkel Ödegaard
f5cd3d853d Small update to confirm dialog 2015-03-03 08:03:21 +01:00
Torkel Ödegaard
04d25dc58a Dashboard: When saving a dashboard and another user has made changes inbetween, the user is promted with a warning if he really wants to overwrite the other's changes, Closes #718 2015-03-02 22:24:01 +01:00
Torkel Ödegaard
56c83cefe9 Fixed so that scripted dashboards and json file based dashboards works as in 1.x, Closes #1548 2015-03-02 18:26:43 +01:00
Torkel Ödegaard
6850a4d25d Progress on deb and rpm packaging, init.d script etc, #1476 2015-03-02 17:21:52 +01:00
Torkel Ödegaard
ad2065afc7 Began work on deb and rpm packaging, #1476 2015-03-02 15:50:03 +01:00
Torkel Ödegaard
9710771f16 Added basic auth to data source edit/create, add support for basic auth in data source proxy code, Closes #1510 2015-03-02 09:58:35 +01:00
Torkel Ödegaard
ea1164322b Small fixes 2015-03-02 08:33:06 +01:00
Torkel Ödegaard
bee501da4a Added different time period override to singlestat panel, added option to hide panel time override info, Closes #171 2015-03-01 12:06:05 +01:00
Torkel Ödegaard
57b5b4c376 Worked on relative time and timeshift overrides for singlestat, still an issue for how to visualize the time override 2015-03-01 11:48:09 +01:00
Torkel Ödegaard
2c3d3d0fe3 Refactoring out common panel metric and query code to a panelHelper service 2015-03-01 11:03:41 +01:00
Torkel Ödegaard
d0d995da09 Inital work on SQL metric/annotation data source, #1542 2015-02-28 17:27:30 +01:00
Torkel Ödegaard
a3fe1efa2b Merge branch 'css-tweaks' into develop, #1465 2015-02-28 16:41:24 +01:00
Torkel Ödegaard
e84d0dd6b3 Light theme tweaks after merge with bulletfactorys light theme fixes 2015-02-28 16:41:02 +01:00
Torkel Ödegaard
0f3bf488f2 Merge branch 'develop' into css-tweaks 2015-02-28 15:48:37 +01:00
Torkel Ödegaard
04ca85fe89 Moved dashboard theme option from the dashboard to a persisted user setting, #1458 2015-02-28 14:30:08 +01:00
Torkel Ödegaard
962b316bcf Some clean up and polish of data source edit view 2015-02-28 14:00:04 +01:00
Torkel Ödegaard
ae3b9617b6 Fixed dataproxy test 2015-02-28 12:34:51 +01:00
Torkel Ödegaard
3c554953a2 Changed default OpenTSDB downsample aggregator from sum to avg 2015-02-28 12:33:20 +01:00
Torkel Ödegaard
0b1044b46f Fixed plugins go test 2015-02-28 11:38:44 +01:00
Torkel Ödegaard
ba56535fa6 Merge branch 'light-theme-tweaks' of github.com:bulletfactory/grafana into css-tweaks 
Conflicts:
	src/css/less/sidemenu.less
 2015-02-28 11:37:38 +01:00
Torkel Ödegaard
2e0e8ba705 Fixed solo panel test 2015-02-28 11:15:21 +01:00
Torkel Ödegaard
c283f0996d Fixed solo panel view (used for png rendering) 2015-02-28 11:07:22 +01:00