Torkel Ödegaard
|
5849fbf04e
|
Merge branch 'master' of github.com:grafana/grafana into develop
|
2017-09-28 10:37:57 +02:00 |
|
Torkel Ödegaard
|
487c475a1e
|
tech: systemjs upgrade
|
2017-09-28 10:37:33 +02:00 |
|
Torkel Ödegaard
|
9ee343f33d
|
tech: systemjs upgrade
|
2017-09-27 15:42:06 +02:00 |
|
Torkel Ödegaard
|
c0c86c1138
|
tech: remove bower and moved remaining bower dependencies to npm
|
2017-09-22 09:47:25 +02:00 |
|
Torkel Ödegaard
|
18337f610d
|
Merge branch 'master' into develop
|
2017-09-22 08:42:07 +02:00 |
|
Torkel Ödegaard
|
f0e0e61809
|
tech: upgraded angularjs and moved dependency from bower to npm, closes #9327
|
2017-09-21 20:58:32 +02:00 |
|
Torkel Ödegaard
|
fed35909cc
|
tech: progress on react poc
|
2017-09-21 13:32:57 +02:00 |
|
Torkel Ödegaard
|
84b1519480
|
tech: initial react poc
|
2017-09-20 17:44:23 +02:00 |
|
Torkel Ödegaard
|
41e01184aa
|
Merge branch 'master' into develop
|
2017-09-18 12:32:29 +02:00 |
|
Torkel Ödegaard
|
210df23430
|
packaging: reducing package size be only including public vendor stuff we need
|
2017-09-14 17:33:58 +02:00 |
|
Torkel Ödegaard
|
a5c08a72fb
|
docs: update download links
|
2017-09-14 11:28:59 +02:00 |
|
Torkel Ödegaard
|
512535e8ff
|
release: bumped version to v4.5.0 stable
|
2017-09-14 10:51:21 +02:00 |
|
Torkel Ödegaard
|
a9e3130ef6
|
Merge branch 'master' into develop
|
2017-09-13 16:06:34 +02:00 |
|
bergquist
|
ee4bbf61a9
|
remove node restriction from package.json
yarn requires correct node version in package.json
and wont install with 4.x. removing since we dont
care about it.
|
2017-09-12 08:15:48 +02:00 |
|
bergquist
|
51d021a337
|
reduce readme to be about the code
|
2017-09-07 16:08:38 +02:00 |
|
Torkel Ödegaard
|
a38ded9e7e
|
Merge branch 'master' into develop-newgrid-row-design2
|
2017-09-07 15:05:41 +02:00 |
|
Torkel Ödegaard
|
bc690232fb
|
version bump to v4.5-beta1
|
2017-09-05 10:39:55 +02:00 |
|
Torkel Ödegaard
|
dda1cf1a88
|
Merge branch 'ace-editor'
|
2017-08-29 15:52:03 +02:00 |
|
Torkel Ödegaard
|
78ea1ea76e
|
Updated master version to v4.5
|
2017-08-29 10:13:16 +02:00 |
|
Torkel Ödegaard
|
637ff61f90
|
Merge branch 'develop' into develop-newgrid-rows
|
2017-08-17 15:56:38 +02:00 |
|
Torkel Ödegaard
|
6609dbff90
|
ux: sidenav fixes and dashboard search changes
|
2017-08-17 12:06:51 +02:00 |
|
Torkel Ödegaard
|
7bf6904119
|
ux: scrollbar stuff
|
2017-08-15 11:51:47 +02:00 |
|
Torkel Ödegaard
|
8356871636
|
grid: updated gridstack to use grafana fork
|
2017-08-09 16:02:00 +02:00 |
|
Alexander Zobnin
|
e4dabb657c
|
code-editor: initial directive for rich code editor (ace)
|
2017-08-07 19:31:50 +03:00 |
|
Torkel Ödegaard
|
a0a2eda5c6
|
Merge branch 'master' into gridstack
|
2017-08-04 13:09:26 +02:00 |
|
Alexander Gängel
|
92937c591f
|
upgrade grunt-sass to 2.0.0 (#8808)
|
2017-07-12 06:55:15 +02:00 |
|
Daniel Lee
|
ba1c79b7a8
|
package.json to v5.0.0-pre1
|
2017-07-05 22:14:03 +02:00 |
|
Daniel Lee
|
3583057155
|
release: v4.4.0
|
2017-07-04 23:42:22 +02:00 |
|
Torkel Ödegaard
|
35c440eb79
|
Gridstack: testing
|
2017-06-13 12:59:37 -04:00 |
|
Torkel Ödegaard
|
48fdfe721e
|
build: updated master version to 4.4.0-pre1
|
2017-05-23 13:52:07 +02:00 |
|
Torkel Ödegaard
|
d9c6f7a141
|
release: bumped version to 4.3.0
|
2017-05-23 11:14:53 +02:00 |
|
Daniel Lee
|
3a892727b3
|
release version bump 4.3.0-beta1
|
2017-05-12 11:45:26 +02:00 |
|
Torkel Ödegaard
|
f1276774a0
|
typescript: updated tslint and fixed new warnings
|
2017-04-20 11:16:37 +02:00 |
|
Torkel Ödegaard
|
473006e8cf
|
build: updated grunt watch to explain best usage
|
2017-04-18 15:36:38 +02:00 |
|
Daniel Lee
|
4f06202e9a
|
build: bumped version to 4.3.0
|
2017-03-08 17:10:51 +01:00 |
|
bergquist
|
2de8cdb85c
|
tech(build): remove unused deps
|
2017-01-30 14:28:39 +01:00 |
|
bergquist
|
9b57005540
|
tech(build): makes npm paths absolute
|
2017-01-23 15:53:47 +01:00 |
|
bergquist
|
3d5efd3350
|
tech(build): removes coveralls
|
2017-01-23 15:53:16 +01:00 |
|
Valeriy Simonov
|
1aa1f7b12c
|
Use https instead of git for tether-drop
git protocol (tcp/udp/9418) is forbidden when using some corporate
proxies. HTTPS is used more widely.
|
2017-01-09 10:00:07 +05:00 |
|
Torkel Ödegaard
|
69d31c560d
|
bumped master to 4.2
|
2017-01-06 12:14:58 +01:00 |
|
Torkel Ödegaard
|
083a42942f
|
fix(phantomsj): fixed issue with y axis label rotation in phantomjs rendered graphs, fixes #6924
|
2017-01-02 12:01:48 +01:00 |
|
bergquist
|
034db646ab
|
release v4.1.0-beta1
|
2016-12-20 11:25:58 +01:00 |
|
Torkel Ödegaard
|
b9043c915e
|
feat(panel): working on panel help text, #4079 , #6847
|
2016-12-16 11:48:32 +01:00 |
|
Gabriel Nepomuceno
|
2f46c56672
|
removing type validation because copy needs to be done first
|
2016-12-09 23:41:07 +00:00 |
|
Gabriel Nepomuceno
|
7ff07aa7b1
|
Revoming old files
|
2016-12-09 22:05:11 +00:00 |
|
Gabriel Nepomuceno
|
a8ae0a5b79
|
fixing compilation of grunt
|
2016-12-09 21:53:00 +00:00 |
|
Gabriel Nepomuceno
|
f3ebd2d849
|
upgrading bases and correcting identation missing tslint
|
2016-12-09 14:57:25 +00:00 |
|
bergquist
|
aed695ebe0
|
tech(build): set master to 4.1.0 pre
|
2016-11-29 18:03:20 +01:00 |
|
Torkel Ödegaard
|
c643466d57
|
bumped version to v4-beta2
|
2016-11-21 09:51:59 +01:00 |
|
Torkel Ödegaard
|
d1bedfc1d1
|
updated version to beta1
|
2016-11-09 12:10:03 +01:00 |
|
Torkel Ödegaard
|
6fa89456d6
|
build(): updated glob node package
|
2016-11-04 13:58:06 +01:00 |
|
Torkel Ödegaard
|
2fa7100c3b
|
ux(dashboard): lots of tweaks and polish to row menu, added remove X to add panel and row option views, #6442
|
2016-11-04 11:43:49 +01:00 |
|
Torkel Ödegaard
|
40ea014fa8
|
ux(dashboar): added shortcut for build mode, switched keybinding lib to mousetrap, supports sequences so also added for Go to home dashboard, open search with starred dashbords prefiltered, go to profile, #6442
|
2016-11-02 12:55:58 +01:00 |
|
Torkel Ödegaard
|
9c50893221
|
progress on new design
|
2016-10-27 21:51:57 +02:00 |
|
Torkel Ödegaard
|
74dbd7fb36
|
feat(alerting): disable visual thresholds while alert is enabled
|
2016-08-12 13:19:06 +02:00 |
|
Torkel Ödegaard
|
08202dcb83
|
Merge branch 'v3.1.x'
|
2016-07-11 09:39:17 +02:00 |
|
Torkel Ödegaard
|
4c4cb20bde
|
tech(sass): changed sass lint version to 1.7.0
|
2016-07-08 22:12:10 +02:00 |
|
Torkel Ödegaard
|
4133526d8d
|
feat(build): updated sass lint
|
2016-07-08 21:04:58 +02:00 |
|
Torkel Ödegaard
|
ad1d7f0ffb
|
Update package.json
|
2016-07-06 07:22:29 +02:00 |
|
Soulou
|
122b0d20a9
|
Fix node version in package.json
Value was incoherent since
1900c81d9f
|
2016-06-28 14:36:15 +02:00 |
|
Torkel Ödegaard
|
23345c563c
|
changed version in master to 3.2-pre
|
2016-06-24 16:51:55 +02:00 |
|
Torkel Ödegaard
|
f3c1a894de
|
changed version to 3.1-beta1
|
2016-06-23 09:12:17 +02:00 |
|
Torkel Ödegaard
|
90c063060a
|
fix(png): fixed phantomjs rendering issue with graph and y-axis label rotation, fixes #5220
|
2016-06-17 14:36:10 +02:00 |
|
nfnty
|
46551e9d65
|
package.json: Upgrade grunt-contrib-compress, Fixes #5071
|
2016-05-26 01:03:22 +02:00 |
|
Torkel Ödegaard
|
0cd2e150d5
|
feat(snapshots): performance improvements to deep clone, makes snapshot's a lot quicker for big dashboards with a lot of panels and data
|
2016-05-18 11:50:40 +02:00 |
|
Torkel Ödegaard
|
494bee1d6b
|
bumped version
|
2016-05-16 11:39:16 +02:00 |
|
Torkel Ödegaard
|
731c35540f
|
packaging(): default RESTART_ON_UPGRADE to true, closes #4993
|
2016-05-12 07:29:33 +02:00 |
|
Torkel Ödegaard
|
bbd52c0b71
|
changelog(): updated and updated version
|
2016-05-11 09:36:07 +02:00 |
|
Torkel Ödegaard
|
43182cb1eb
|
updated
|
2016-05-02 14:49:50 +02:00 |
|
Torkel Ödegaard
|
70d03b7a1c
|
fix(query editor): Fixed issue with removing query for data sources without collapsable query editors, fixes #4856
|
2016-04-29 23:20:48 +02:00 |
|
Dan Cech
|
2244224b12
|
add basic Makefile, remove need for global grunt-cli
|
2016-04-25 12:44:26 -04:00 |
|
Torkel Ödegaard
|
297c829bdc
|
tech(): updatad sass-lint
|
2016-04-22 09:47:30 +02:00 |
|
Torkel Ödegaard
|
83ba6638a1
|
bumped version
|
2016-04-15 10:50:21 -04:00 |
|
Torkel Ödegaard
|
924800b7df
|
bumped version
|
2016-04-14 14:15:47 -04:00 |
|
Torkel Ödegaard
|
e7626befc5
|
updated version
|
2016-04-12 10:17:39 -04:00 |
|
Torkel Ödegaard
|
4d63b576f7
|
tech(): put in a real event emitter instead of rxjs based on that was broken
|
2016-04-07 19:47:48 -04:00 |
|
Torkel Ödegaard
|
44cf66d7ff
|
refactoring(): fixing event things
|
2016-04-07 19:23:20 -04:00 |
|
Torkel Ödegaard
|
43896dc416
|
fix(): updated changelog and version to beta3
|
2016-04-05 11:29:12 -04:00 |
|
Torkel Ödegaard
|
6e6ebc5947
|
trying to fix karma issue
|
2016-04-03 09:43:33 -04:00 |
|
Torkel Ödegaard
|
2f2029a5c1
|
fix(dashboard): fixed dashboard layout for mobile devices, fixes #4529
|
2016-04-01 10:56:56 -07:00 |
|
Torkel Ödegaard
|
2bf305b177
|
build(): updated build version
|
2016-03-30 22:30:41 -07:00 |
|
Torkel Ödegaard
|
97b304abc9
|
build(): added unix timestamp to iteration builds
|
2016-03-30 10:05:30 -07:00 |
|
Torkel Ödegaard
|
8451de8752
|
tech(): changed deps in package.json
|
2016-03-30 08:10:22 -07:00 |
|
Torkel Ödegaard
|
d4ada51fad
|
build(): fixed issue with peer dependencies in package.json, fixes #4487
|
2016-03-29 06:16:49 +02:00 |
|
Torkel Ödegaard
|
637db29fad
|
tech(): updated phantomjs npm package to use phantomjs-prebuilt
|
2016-03-23 13:26:38 +01:00 |
|
Torkel Ödegaard
|
7366cef1fe
|
Merge branch 'master' into websocket
|
2016-03-22 18:33:39 +01:00 |
|
Torkel Ödegaard
|
1854381456
|
tech(): updated es6-shim, removed es5-shim, no longer needed as we upraded phantomjs to 2.x, also removed es6-promise, dont think we need it
|
2016-03-22 18:32:08 +01:00 |
|
bergquist
|
bbc4c361bb
|
fix(npm): updates phantomjs requirement
|
2016-03-22 17:23:15 +01:00 |
|
Torkel Ödegaard
|
9ddf22ea93
|
Merge branch 'master' into websocket
|
2016-03-17 10:16:05 +01:00 |
|
bergquist
|
a08809f8fe
|
fix(phantomjs): upgrades to 2.1.1 for ssl support
closes #4371
|
2016-03-16 16:30:08 +01:00 |
|
Torkel Ödegaard
|
92f20b9b7d
|
feat(websocket): reconnection and resubscription handling, #4355
|
2016-03-14 19:21:32 +01:00 |
|
Torkel Ödegaard
|
f4666df7da
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-03-07 18:04:06 +01:00 |
|
Torkel Ödegaard
|
4cd4ce504d
|
feat(plugins): worked on markdown support for plugin page, #4275
|
2016-03-07 18:03:45 +01:00 |
|
bergquist
|
b912edbbef
|
feat(grunt): add autoprefix with postcss
closes #4250
|
2016-03-07 17:49:47 +01:00 |
|
Torkel Ödegaard
|
2cf1193b56
|
Merge branch 'variable-value-formatting-rethink'
|
2016-03-01 19:13:11 +01:00 |
|
Torkel Ödegaard
|
f3ad71d751
|
feat(templating): lots of progress on template variable context specific formats, #2918, all elasticsearch / lucene use cases seem to work now
|
2016-03-01 08:43:54 +01:00 |
|
Matt Toback
|
efe25db40f
|
Update repo in package.json to point to official
|
2016-03-01 11:25:54 +08:00 |
|
Torkel Ödegaard
|
363f36dfae
|
ux(): tweaks
|
2016-02-21 15:21:01 +01:00 |
|
Torkel Ödegaard
|
f3fe1a5320
|
fix(build): trying to fix build
|
2016-02-20 17:54:51 +01:00 |
|
Torkel Ödegaard
|
d0d21ba9a6
|
ux(): updated orange color and fixed sidemenu background on dark theme
|
2016-02-19 15:33:24 +01:00 |
|
Torkel Ödegaard
|
c21b353042
|
ux(): color/grays palate refactoring
|
2016-02-19 12:26:59 +01:00 |
|
Torkel Ödegaard
|
f8e233e400
|
commit(): saas changs
|
2016-02-15 15:27:41 +01:00 |
|
Torkel Ödegaard
|
f7e3297a0f
|
ux(): updated navbar on all pages to new style, no subnav/dropdown yet though
|
2016-02-13 14:32:20 +01:00 |
|
Torkel Ödegaard
|
e7a202fe4d
|
Merge branch 'master' into style-changes-bulletfactory
|
2016-02-12 10:14:06 +01:00 |
|
Torkel Ödegaard
|
f797b19825
|
fix(build): changed from postinstall script to regular grunt task for the copying of npm dependencies into public dir, fixes #4003
|
2016-02-12 09:58:00 +01:00 |
|
Torkel Ödegaard
|
2ea548850e
|
Merge branch 'master' into style-changes-bulletfactory
Conflicts:
pkg/api/index.go
public/less/sidemenu.less
|
2016-02-11 21:23:54 +01:00 |
|
Torkel Ödegaard
|
ae39ec8585
|
feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk
|
2016-02-10 13:09:39 +01:00 |
|
Matthew Toback
|
21b0945d08
|
Beginnings of form restyling, nowhere near merge yet
|
2016-02-06 17:37:33 -05:00 |
|
Torkel Ödegaard
|
714129c8e3
|
fix(): package.json use local grunt in postinstall script
|
2016-02-04 22:44:25 +01:00 |
|
Torkel Ödegaard
|
9914714eeb
|
removed npm frontend assets from repo, installed using npm install postinstall script
|
2016-01-28 14:37:24 -05:00 |
|
Torkel Ödegaard
|
6fae264222
|
feat(plugins): upgraded influxdb to new plugin format
|
2016-01-14 15:35:14 +01:00 |
|
Torkel Ödegaard
|
08caf4bbde
|
feat(tslint): more tslint work
|
2016-01-13 21:22:39 +01:00 |
|
Torkel Ödegaard
|
59c928acc2
|
feat(tslint): added more tslint rules
|
2016-01-13 21:07:57 +01:00 |
|
David Keijser
|
1896bd0920
|
Add missing peer dependency: phantomjs
|
2016-01-08 16:27:43 +01:00 |
|
Torkel Ödegaard
|
4522b02925
|
tech(systemjs): almost all tests are passing
|
2015-12-21 16:00:58 +01:00 |
|
Torkel Ödegaard
|
f7888886e9
|
tech(systemjs): working on getting tests to work
|
2015-12-21 11:10:16 +01:00 |
|
Torkel Ödegaard
|
93e424de4c
|
tech(systemjs): work on systemjs builder
|
2015-12-18 15:59:27 +01:00 |
|
Torkel Ödegaard
|
545c39356a
|
tech(systemjs): starting work on systemjs bundling
|
2015-12-17 19:18:30 +01:00 |
|
Torkel Ödegaard
|
ca84ef38f8
|
angular2 test
|
2015-12-16 12:21:13 +01:00 |
|
Torkel Ödegaard
|
7ee290cc57
|
tech(systemjs): systemjs and jspm work
|
2015-12-15 17:56:16 +01:00 |
|
Torkel Ödegaard
|
55448de92a
|
updated master version to 3.0.0-pre1
|
2015-12-14 17:10:30 +01:00 |
|
Torkel Ödegaard
|
fcd3af30ec
|
updated version to 2.6.0
|
2015-12-14 15:18:01 +01:00 |
|
Torkel Ödegaard
|
cdc36dd171
|
Updated version
|
2015-12-08 15:41:34 +01:00 |
|
Torkel Ödegaard
|
df366da721
|
updated version to 2.6.0-beta1
|
2015-12-04 10:39:50 +01:00 |
|
Torkel Ödegaard
|
8eb3e48bc7
|
fix(build): fixed build issues with concat not including require_config
|
2015-12-02 18:22:47 +01:00 |
|
Torkel Ödegaard
|
d315ff2b96
|
changelog: updated master version to 2.6 and merged develop branch
|
2015-11-12 13:47:12 +01:00 |
|
Torkel Ödegaard
|
4729bea1a2
|
fix(dashboard): fix for collapse row by clicking on row title, fixes #3065
|
2015-10-28 15:04:58 +01:00 |
|
Torkel Ödegaard
|
6397b8c1ef
|
docs(): updated version to 2.5.0
|
2015-10-28 09:31:57 +01:00 |
|
Torkel Ödegaard
|
22a4ef42fc
|
version change to 2.5-pre2
|
2015-10-27 12:22:30 +01:00 |
|
Torkel Ödegaard
|
d705108be5
|
feat(timepicker2): added date math tests
|
2015-09-16 18:48:41 +02:00 |
|
Torkel Ödegaard
|
1900c81d9f
|
tech(nodejs upgrade): upgraded to nodejs 4.0 for grunt build
|
2015-09-13 12:13:47 +02:00 |
|
Torkel Ödegaard
|
dceec44671
|
removed tsconfig
|
2015-09-10 14:36:05 +02:00 |
|
Torkel Ödegaard
|
da832368f0
|
dev building and optimized builds work
|
2015-09-10 12:42:24 +02:00 |
|
Torkel Ödegaard
|
abac8bccc6
|
tech(typescript): its looking good
|
2015-09-10 11:26:40 +02:00 |
|
Torkel Ödegaard
|
3c40310e9b
|
tech(typescript): testing for how to migrate to typescript
|
2015-09-09 09:57:06 +02:00 |
|
Torkel Ödegaard
|
171ed497f9
|
version bumped to 2.5
|
2015-09-08 09:20:46 +02:00 |
|
Mat Schaffer
|
be3f657073
|
Use SPDB license id
This avoids an npm warning telling you to use such an id.
|
2015-08-27 07:35:59 +09:00 |
|
Torkel Ödegaard
|
90169d6a05
|
Bumped master version to 2.2.0-pre1
|
2015-08-11 11:18:39 +02:00 |
|
Torkel Ödegaard
|
be7a3a0940
|
pumped version to 2.1.1
|
2015-08-11 10:48:19 +02:00 |
|
Torkel Ödegaard
|
956a2bbdbe
|
Updated version
|
2015-08-05 16:06:55 +02:00 |
|
Torkel Ödegaard
|
925ead51b6
|
Updated version to 2.1
|
2015-08-04 16:19:48 +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
|
8c0e1060e6
|
Graph: Define series color using regex rule, Closes #590
|
2015-05-14 12:34:30 +02:00 |
|
Torkel Ödegaard
|
a4a8cd05d2
|
Updated to nodejs packages and karma code coverage setup
|
2015-05-02 16:59:19 +02:00 |
|
Torkel Ödegaard
|
59fcd3914d
|
corrected master version
|
2015-05-01 08:08:31 +02:00 |
|
Torkel Ödegaard
|
5175cf70ef
|
fixed version in package.json
|
2015-04-27 15:07:13 +02:00 |
|
Torkel Ödegaard
|
380b7f4d94
|
updated version to 2.1.0-pre1
|
2015-04-24 15:57:20 +02:00 |
|
Torkel Ödegaard
|
2c52224013
|
/api/login/ping Fix for issue when behind reverse proxy and subpath, Fixes #1857
|
2015-04-23 08:24:30 +02:00 |
|
Torkel Ödegaard
|
9cc5e981dd
|
Bumped version to 2.0.2
|
2015-04-22 17:51:50 +02:00 |
|
Torkel Ödegaard
|
dabdf1b7fd
|
Graph Panel + Legend Table mode: Many series casued zero height graph, now legend will never reduce the height of the graph below 50% of row height, Fixes #1832
|
2015-04-21 18:46:44 +02:00 |
|