108 Commits

Author	SHA1	Message	Date
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	d1767144a8	Reworking configuration loading and overriding	2015-04-09 12:16:59 +02:00
Torkel Ödegaard	96ee1c17a3	Worked on new deb & rpm packaging and init.d scripts	2015-04-08 14:10:04 +02:00
Torkel Ödegaard	059db533d5	HTTP API: grafana /render calls nows with api keys, Fixes #1649	2015-04-08 08:59:12 +02:00
Torkel Ödegaard	a96e4a343c	Only create admin user specified in config file when there are no users in the database, Fixes #1680	2015-04-01 16:05:42 +02:00
Torkel Ödegaard	5422d13607	Postgres fix update	2015-04-01 08:26:02 +02:00
Torkel Ödegaard	d8f614ed98	Merge pull request #1665 from mattrobenolt/bool ... Let xorm convert `False` into the right type	2015-04-01 08:25:20 +02:00
Torkel Ödegaard	3c2bfbfc1c	Search: Dashboard results should be sorted alphabetically, Fixes #1685	2015-03-31 22:06:19 +02:00
Matt Robenolt	cedb11ebab	Let xorm convert False into the right type	2015-03-30 18:11:39 -07:00
Torkel Ödegaard	7be7aeb70a	Fixed sql migration issue with dashboard snapshots	2015-03-26 21:20:44 +01:00
Torkel Ödegaard	541cd2e430	Dashboard snapshot: more work on snapshot deletion, and saving external reference, #1623	2015-03-26 20:59:41 +01:00
Torkel Ödegaard	4322f29f34	Dashboard snapshot: added delete key which can be used to delete snapshots, #1623	2015-03-26 20:34:58 +01:00
Torkel Ödegaard	b1f85dc8f1	Added expire option to dashboard snapshots, #1623	2015-03-26 12:00:52 +01:00
Torkel Ödegaard	10618637e2	Fixed bug in sql migration, closes #1643	2015-03-25 13:53:58 +01:00
Torkel Ödegaard	49a0ea53c7	Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc ... Conflicts: src/app/features/dashboard/partials/shareDashboard.html	2015-03-22 22:04:13 -04:00
Torkel Ödegaard	d987532262	Added server metrics	2015-03-22 15:14:00 -04:00
Torkel Ödegaard	f48f5428e5	Adding snapshot storage and route, #1623	2015-03-21 10:56:26 -04:00
Torkel Ödegaard	964f0861d6	more work on dashboard snapshots	2015-03-21 08:53:16 -04:00
Torkel Ödegaard	eb8b9c4ac3	Increase api_key.key varchar to 255 length	2015-03-18 13:20:15 -04:00
Anthony Woods	fc5839d8f1	gofmt. remove extra whitespace	2015-03-17 23:42:16 +08:00
Anthony Woods	bce62c49d0	fixes #1606	2015-03-17 23:10:49 +08:00
Anthony Woods	6a09a7c398	fixes #1606 emit OrgCreated event when new org created.	2015-03-17 23:09:43 +08:00
Torkel Ödegaard	17063df3cc	Changed default org name form 'main' to 'Main Org.'	2015-03-12 19:43:52 +01:00
Torkel Ödegaard	f3d4d2782f	Simplified single org settings, now auto_assign_org, and auto_assign_org_role, new [users] config section, Closes #1585	2015-03-11 16:19:29 +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	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	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	d0d995da09	Inital work on SQL metric/annotation data source, #1542	2015-02-28 17:27:30 +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	011fdf7ab6	fixed bug in datasource schema migration	2015-02-26 19:36:11 +01:00
Torkel Ödegaard	c75aa23092	New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440	2015-02-26 17:23:28 +01:00
Torkel Ödegaard	7c241fd617	Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517	2015-02-26 15:43:48 +01:00
Torkel Ödegaard	3f96afba73	Merge branch 'fixDashboardDelete' of https://github.com/raintank/grafana into raintank-fixDashboardDelete ... Conflicts: pkg/services/sqlstore/dashboard.go	2015-02-25 14:31:44 +01:00
Torkel Ödegaard	563d5e3ad8	All migrations work in sqlite3, mysql and postgres	2015-02-25 07:57:51 +01:00
Torkel Ödegaard	16fd256225	Added missing common.go	2015-02-24 19:10:41 +01:00
Torkel Ödegaard	f3f79792ab	account -> org table migration is starting to work, need to test mysql and postgres	2015-02-24 18:32:29 +01:00
Torkel Ödegaard	ed68a4bb9a	More work on SQL migrations	2015-02-24 17:59:21 +01:00
Torkel Ödegaard	02a89c752b	Progress on database schema migration for account -> org refactor	2015-02-24 11:46:34 +01:00
Anthony Woods	b9b63f695d	fixes #1518 fix table name used in dashboard delete.	2015-02-24 08:56:10 +00:00
Torkel Ödegaard	da41d99aa7	Fixed sql integration test	2015-02-23 20:48:43 +01:00
Torkel Ödegaard	26e4809e2e	Big Backend Refatoring: Renamed Account -> Org	2015-02-23 20:07:49 +01:00
Torkel Ödegaard	47c6c6e1b7	Added change password feature, Closes #1455	2015-02-19 16:09:49 +01:00
Torkel Ödegaard	17004ce3ae	Fixed issue with login by username and uppercase letters in username, #1484	2015-02-18 13:00:39 +01:00
Torkel Ödegaard	56d8fe4a22	Small changes to CLI commands PR	2015-02-16 07:40:21 +01:00
Jason Wilder	f443b7087c	CLI: Add datasource:info command ... Describes the full datasource details given an account and datasource name.	2015-02-15 13:36:10 -07:00
Jason Wilder	90cd10e034	CLI: Add account:delete command	2015-02-15 13:36:10 -07:00
Jason Wilder	ca37b24455	CLI: Add account list command	2015-02-15 13:36:10 -07:00
Torkel Ödegaard	a88187023d	Added a sql integration test for api keys	2015-02-13 15:55:32 +01:00