3449 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	eace358f1c	Merge branch 'issue1907' of https://github.com/raintank/grafana ... Conflicts: pkg/api/dtos/models.go	2015-04-29 09:29:55 +02:00
Torkel Ödegaard	e7c43bf614	expose org id to frontend, Closes #1907	2015-04-29 09:26:12 +02:00
Anthony Woods	81636d8634	expose orgId via currentUser object. fixes #1907	2015-04-29 15:14:49 +08:00
Torkel Ödegaard	8a986ec340	Using CTRL+S should not work when dashboardMeta.canSave is false, #1834	2015-04-27 10:59:14 +02:00
Torkel Ödegaard	b0ef659add	Stop users from entering panel edit mode when dashboard editable is false, #1834	2015-04-27 10:56:36 +02:00
Torkel Ödegaard	29a7490af2	Small fix for unsaved changes when using save as feature	2015-04-27 10:29:04 +02:00
Torkel Ödegaard	ad45b63e79	Merge branch 'editable_false' of github.com:grafana/grafana into editable_false	2015-04-27 10:10:01 +02:00
Torkel Ödegaard	16fc6e8b42	More work on editable false dashboards, #1834	2015-04-27 10:09:32 +02:00
Torkel Ödegaard	af277f560f	Merge branch 'master' into editable_false	2015-04-27 08:53:57 +02:00
Torkel Ödegaard	d66e510c42	Merge pull request #1867 from maddenca/patch-1 ... Documented units for timepicker	2015-04-26 15:35:59 +02:00
Torkel Ödegaard	e410fbb558	Corrected SQL migration for snapshot table column type change, #1880	2015-04-25 20:28:50 +02:00
Torkel Ödegaard	4eeaa6bf9d	Merge pull request #1881 from raintank/issue1880 ... fixes #1880 correct mysql statement for modifying column data type	2015-04-25 20:24:22 +02: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
Torkel Ödegaard	a0cbca4cad	more work on editable false, #1834	2015-04-25 11:10:28 +02:00
Torkel Ödegaard	380b7f4d94	updated version to 2.1.0-pre1	2015-04-24 15:57:20 +02:00
Torkel Ödegaard	bad2d1a974	Merge pull request #1869 from marknoe1/extra_uom ... Added units for voltage, current and frequency	2015-04-24 15:55:53 +02:00
Torkel Ödegaard	4fd2c0570c	Replaced slug dependency with one that did not use gopkgs.com	2015-04-24 15:46:16 +02:00
Torkel Ödegaard	fd274592d4	Merge branch 'master' into editable_false	2015-04-24 12:06:50 +02:00
Torkel Ödegaard	7064d87106	Firefox/IE issue, invisible text in dashboard search fixed, Fixes #1872	2015-04-24 11:20:09 +02:00
Mark Oellermann	f8ceb341d6	Added units for voltage, current and frequency	2015-04-24 13:23:54 +10:00
Chris Madden	3fdab59029	Documented units for timepicker ... Timepicker units (like s, m, M, etc) were not in the documentation so I have added them.	2015-04-23 23:53:15 +02:00
Torkel Ödegaard	b99ee2562e	Restored sql integration tests to use in mem sqlite3	2015-04-23 16:21:49 +02:00
Torkel Ödegaard	8526025792	MySQL: Dashboard.data column type changed to mediumtext (sql migration added), Fixes #1863	2015-04-23 16:18:46 +02:00
Torkel Ödegaard	236c4e65f8	Began work on dashboard: editable flag, that actually stops users from changing anything, #1834	2015-04-23 15:26:48 +02:00
Torkel Ödegaard	d92fae07a5	Merge pull request #1860 from aibou/master ... Fix and update documents	2015-04-23 14:55:17 +02:00
aibou	968b1b4308	Fix and update documents	2015-04-23 17:42:04 +09:00
Torkel Ödegaard	e9a174d1c5	Merge pull request #1854 from ton31337/master ... Remove exit 0 at the end of init.d script	2015-04-23 08:45:26 +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
Donatas Abraitis	869cf705e0	Remove exit 0 at the end of init.d script	2015-04-22 22:29:56 +03:00
Torkel Ödegaard	9f6a348851	Updated install docs with 2.0.2 version	2015-04-22 19:23:28 +02:00
Torkel Ödegaard	aa52f6675c	updated changelog	2015-04-22 17:56:07 +02:00
Torkel Ödegaard	9cc5e981dd	Bumped version to 2.0.2	2015-04-22 17:51:50 +02:00
Torkel Ödegaard	da74fa0862	Updated configuration and http api docs	2015-04-22 17:44:47 +02:00
Torkel Ödegaard	1dfc576263	Panel timeshift: You can now use panel timeshift without a relative time override, Fixes #1848	2015-04-22 13:54:31 +02:00
Torkel Ödegaard	170e8a5d76	Another docs update	2015-04-22 13:47:15 +02:00
Torkel Ödegaard	bd0bf3747e	Began work on http api docs, #1822	2015-04-22 13:23:33 +02:00
Torkel Ödegaard	a11b180480	Snapshots: Fixed issue with snapshoting dashboards with an interval template variable, Fixes #1846	2015-04-22 12:27:12 +02:00
Torkel Ödegaard	f8cfbedefd	Removed semver dependency from go build script	2015-04-22 08:56:14 +02:00
Torkel Ödegaard	90a77bdf85	Fixed failure loop in init.d script when grafana will not start (due to permission issue or other), Fixes #1837	2015-04-22 08:47:53 +02:00
Torkel Ödegaard	e438d21cc0	fixed minor issue in build file	2015-04-22 08:26:49 +02:00
Torkel Ödegaard	dc88fff704	Migration: Import dashboards from Elasticsearch was capped at 100, now capped at 10000, Fixes #1843	2015-04-22 07:50:23 +02:00
Torkel Ödegaard	8ff316252e	Update info text in grafana test data source, Fixes #1840	2015-04-21 21:17:32 +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
Torkel Ödegaard	6fb6e44ece	updated rpm install docs	2015-04-21 17:17:08 +02:00
Torkel Ödegaard	6df299886e	Updated windows install instructions	2015-04-21 13:30:15 +02:00
Torkel Ödegaard	b25411ef6b	Updated license link on docs page	2015-04-21 10:23:10 +02:00
Torkel Ödegaard	dfa5b005cc	Updated docs makefile	2015-04-21 10:20:55 +02:00
Torkel Odegaard	73b512859a	Small ui align fix to graph axis and grid edit ui	2015-04-21 09:48:50 +02:00
Torkel Ödegaard	c2a4e4720b	Merge pull request #1827 from bergquist/set_default_line_fill_to_1 ... Change default values for linewidth and fill.	2015-04-21 09:43:46 +02:00