Commit Graph

3065 Commits

Author SHA1 Message Date
Torkel Ödegaard
e75acce6ed updated package.json upgrade of grunt contrib uglify 2015-03-10 13:46:50 +01:00
Torkel Ödegaard
390589fae2 Merge pull request #1580 from bbinet/fix-uglify-compress-issue
fix uglify TypeError
2015-03-10 13:40:25 +01:00
Bruno Binet
ae41fa3011 fix uglify TypeError
This patch fix the following uglify error:
TypeError: Cannot assign to read only property 'warnings' of true
Or we can upgrade grunt-contrib-uglify to latest v0.8.0 version which
should also fix the issue.

This issue has been reported on grunt-contrib-uglify bug tracker:
https://github.com/gruntjs/grunt-contrib-uglify/issues/298
2015-03-10 11:27:17 +01:00
Torkel Ödegaard
3119d15de5 Fixed issue in Dockerfile and docs VERSION file 2015-03-10 09:06:27 +01:00
Torkel Ödegaard
b99e7ed97e Updated docs version and updated build from source instructions 2015-03-10 09:03:05 +01:00
Torkel Ödegaard
f32c34c726 Merge branch 'master' into develop
Conflicts:
	.gitignore
2015-03-10 08:57:14 +01:00
Torkel Ödegaard
15cb1d8980 Added grafana 1.x docs to main repo 2015-03-10 08:56:03 +01:00
Torkel Ödegaard
99259d246b Fixed CLA in new docs 2015-03-10 08:51:26 +01:00
Torkel Ödegaard
8c7076c04a fixed doc image link 2015-03-10 08:20:50 +01:00
Torkel Ödegaard
81bae9a844 Updated docs 2015-03-09 21:58:01 +01:00
Torkel Ödegaard
d7ce7271fe Updated docs 2015-03-09 20:20:44 +01:00
Torkel Ödegaard
5ab64987eb Switching to mkdocs for documentation, and docs that are inside the main repo, adding existing docs, #1571 2015-03-09 17:12:59 +01:00
Torkel Ödegaard
dc46148ab6 Migrated from wercker to circle CI 2015-03-07 20:30:06 +01:00
Torkel Ödegaard
1b1bbcecec Added go vet step to circle.yml 2015-03-07 19:51:19 +01:00
Torkel Ödegaard
ebad9cb502 Fixed gofmt formating, updated precommit hook 2015-03-07 16:37:19 +01:00
Torkel Ödegaard
d8005af8ee updated circle with fmt formating test 2015-03-07 16:23:22 +01:00
Torkel Ödegaard
ba3ba0aca7 Removed docker as service from circle.yml 2015-03-07 15:58:35 +01:00
Torkel Ödegaard
880893914a Removed deploy step from circle, will go in another repo 2015-03-07 15:24:52 +01:00
Torkel Ödegaard
07a21e921d Updated circle.yml added package step 2015-03-07 14:04:12 +01:00
Torkel Ödegaard
2193f222c5 Fixed bug in build container build script 2015-03-07 13:58:28 +01:00
Torkel Ödegaard
f36ea13cb2 Added saving buildcontainer to cache directory 2015-03-07 13:55:12 +01:00
Torkel Ödegaard
595a1fe852 Added back test step to circle.yml 2015-03-07 13:53:10 +01:00
Torkel Ödegaard
3334e6bf61 Fixed bug in circle.yml 2015-03-07 13:48:02 +01:00
Torkel Ödegaard
0a82b75f2a Adding caching of buildcontainer 2015-03-07 13:46:27 +01:00
Torkel Ödegaard
5b563e3841 Updated circle.yml 2015-03-07 13:28:03 +01:00
Torkel Ödegaard
3a98ce775a Updated docker build script 2015-03-07 13:27:02 +01:00
Torkel Ödegaard
8c27a10612 Updated circle.yml 2015-03-07 13:23:57 +01:00
Torkel Ödegaard
e3ce8048ad Added deploy step that runs build in centos6 container 2015-03-07 13:22:52 +01:00
Torkel Ödegaard
0d367d4b54 Updated circle.yml 2015-03-07 13:07:22 +01:00
Torkel Ödegaard
028ae7053b Updated circle.yml added npm install and grunt test step 2015-03-07 12:55:26 +01:00
Torkel Ödegaard
3f3b14130b Updated circle 2015-03-07 12:52:31 +01:00
Torkel Ödegaard
820051d40b Updated circle.yml 2015-03-07 12:46:17 +01:00
Torkel Ödegaard
97499aaa75 Updated circle.yml 2015-03-07 12:43:17 +01:00
Torkel Ödegaard
cc89bc02f4 Working on trying to get CI builds on centos6 to solve GLIBC issue, #1568 2015-03-07 12:40:19 +01:00
Torkel Ödegaard
4cbcee7e15 Updated init.d script with chkconfig comment lines, now works on centos5 2015-03-06 11:21:41 +01:00
Torkel Ödegaard
ab47c2c734 Fixed influxdb 0.9 data source, renamed clone dashboard to Save As... 2015-03-06 10:01:18 +01:00
Torkel Ödegaard
3e6ec19fd4 Fixed bug in CloneDashboardCtrl 2015-03-06 08:23:36 +01:00
Torkel Ödegaard
5719e437ef Merge pull request #1556 from jwilder/jw-export
Add dashboards:export CLI command
2015-03-06 07:59:44 +01:00
Torkel Ödegaard
dba7062fbc Some more polish to confirm dialogs 2015-03-05 21:02:25 +01:00
Torkel Ödegaard
6786ffffac Small update to submenu (annotation/templating) css, #1554 2015-03-05 20:45:14 +01:00
Torkel Ödegaard
16320d66f2 Updated build file 2015-03-05 20:11:34 +01:00
Torkel Ödegaard
ec6dd35098 Fixed path to ZeroClipboard flash file 2015-03-05 20:10:05 +01:00
Torkel Ödegaard
f5f4689e7c Worked on styling for confirm dialogs, #1554 2015-03-05 20:04:54 +01:00
Torkel Ödegaard
259d330822 Began work on modal css polish, #1554 2015-03-05 18:01:41 +01:00
Torkel Ödegaard
79be106711 Fixed javascript style check error 2015-03-05 16:53:08 +01:00
Torkel Ödegaard
5ccd3e2f84 Updated share panel/dash look, added copy to clipboard button (using ZeroClipboard lib), #1554 2015-03-05 16:52:32 +01:00
Torkel Ödegaard
4f8d22796a Merge remote-tracking branch 'origin/master' into develop 2015-03-05 12:26:08 +01:00
Torkel Ödegaard
5be5ee9b1b Fixed panel error handling issue 2015-03-05 12:25:48 +01:00
Torkel Ödegaard
679f2aa262 removed console logging, left by mistake in last commit 2015-03-05 12:19:52 +01:00
Torkel Ödegaard
58034c24ce Merge remote-tracking branch 'origin/master' into develop 2015-03-05 11:17:39 +01:00