169 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Torkel Ödegaard	1663cbbb34	Merge branch 'master' of github.com:torkelo/grafana-pro ... Conflicts: .bra.toml	2014-12-15 20:50:38 +01:00
Torkel Ödegaard	26ec858903	Moved grafana bin file to bin folder	2014-12-15 17:36:42 +01:00
Torkel Ödegaard	6c351c724d	merged grafana upstream	2014-12-15 16:18:24 +01:00
Torkel Ödegaard	a40c6e65dd	Merge branch 'master' of github.com:torkelo/grafana-pro	2014-12-15 16:17:29 +01:00
Torkel Ödegaard	29749809d2	Updated	2014-12-15 16:17:20 +01:00
Torkel Ödegaard	90ae59ccaf	Fixed png rending	2014-12-01 13:25:57 -08:00
Torkel Ödegaard	ff6a2d014a	Refactored command/query interface	2014-12-01 08:56:03 -08:00
Torkel Ödegaard	246f41b88a	Bus experiment	2014-11-28 22:16:49 +01:00
Torkel Ödegaard	a799fac983	Added Godeps and embedded dependencies	2014-11-28 11:56:03 +01:00
Torkel Ödegaard	50164324f3	moved back to a main.go file in root	2014-11-28 11:51:34 +01:00
Torkel Ödegaard	d8d5516e24	Create README.md	2014-11-26 12:57:16 +01:00
Torkel Ödegaard	d7ee4b4573	Added missing files	2014-11-26 09:58:36 +01:00
Torkel Ödegaard	a492eceff0	refactoring	2014-11-24 17:37:20 +01:00
Torkel Ödegaard	be781bdb98	Tried postgres	2014-11-24 10:17:13 +01:00
Torkel Ödegaard	a8f915f049	Merge branch 'macaron'	2014-11-24 08:20:22 +01:00
Torkel Ödegaard	e750080f00	removed old code	2014-11-24 08:20:16 +01:00
Torkel Ödegaard	fcdcd63dc7	get other accounts works	2014-11-24 08:04:41 +01:00
Torkel Ödegaard	f04932aa67	More work on collaborators, and sql store	2014-11-21 16:43:04 +01:00
Torkel Ödegaard	4eefa73441	Progress on account and dashboard save/load	2014-11-20 15:19:44 +01:00
Torkel Ödegaard	00b4d233cc	Small progress, save search works	2014-11-20 13:02:25 +01:00
Torkel Ödegaard	eb2c078898	Progres on move to sql from rethinkdb	2014-11-20 12:11:07 +01:00
Torkel Ödegaard	9b68911d00	Made it it compile again	2014-11-20 09:16:28 +01:00
Torkel Ödegaard	21a4f3cc05	updated	2014-11-14 17:16:40 +01:00
Torkel Ödegaard	41fb2b4cc4	updated	2014-11-14 17:14:34 +01:00
Torkel Ödegaard	f5b1b192a0	Macaron and sqllite	2014-11-14 17:13:33 +01:00
Torkel Ödegaard	d7cd2b970e	OAuth remake	2014-10-07 17:56:37 -04:00
Torkel Ödegaard	450d242d5f	working on oauth	2014-10-07 15:54:38 -04:00
Torkel Ödegaard	2783196547	updated	2014-10-07 13:44:20 -04:00
Torkel Ödegaard	e84f06b503	more macaroon stuff	2014-10-07 11:53:25 -04:00
Torkel Ödegaard	222319d924	macaron transition progress	2014-10-05 21:13:07 +02:00
Torkel Ödegaard	201e1d3e6d	Macaron rewrite	2014-10-05 16:50:04 +02:00
Torkel Ödegaard	2c72831be1	before macaron	2014-10-05 15:34:24 +02:00
Torkel Ödegaard	a4204880e8	started work on new arch	2014-10-04 13:33:20 +02:00
Torkel Ödegaard	5d120de70e	Filtered logging and url query helper	2014-10-03 09:03:16 +02:00
Torkel Ödegaard	5f1b4e6183	added ldap dev docker file	2014-10-02 13:42:25 +02:00
Torkel Ödegaard	05f9e5eef1	rendering	2014-10-01 21:07:58 +02:00
Torkel Ödegaard	4a73e2d0e9	Solo panel and phantom rendering work	2014-10-01 13:20:30 +02:00
Torkel Ödegaard	b499bdea3b	working on panel rendering	2014-10-01 11:37:04 +02:00
Torkel Ödegaard	3bba8b2c26	Github oauth login works	2014-09-22 11:39:40 +02:00
Torkel Ödegaard	b0b77d667c	added gravatar	2014-09-22 10:46:56 +02:00
Torkel Ödegaard	ed8f5dbd22	Lots of progress on account management	2014-09-21 15:02:19 +02:00
Torkel Ödegaard	cd9306df45	Lots of progress on account management	2014-09-21 15:01:59 +02:00
Torkel Ödegaard	19a35673fa	updated	2014-09-20 16:55:54 +02:00
Torkel Ödegaard	015c929bd7	more account stuff	2014-09-20 13:24:06 +02:00
Torkel Ödegaard	992efda7f6	Account stuff	2014-09-20 12:14:19 +02:00
Torkel Ödegaard	40ff57d8c4	Account stuff	2014-09-20 12:13:46 +02:00
Torkel Ödegaard	cdabe50320	Merge branch 'master' of github.com:torkelo/grafana-pro ... Conflicts: grafana	2014-09-20 08:58:17 +02:00
Torkel Ödegaard	a9a06ad51d	Working on collaborators	2014-09-19 17:37:18 +02:00
Torkel Ödegaard	1705734435	updated	2014-09-18 12:04:22 +02:00
Torkel Ödegaard	158b708eac	Small progress on adding collaborator	2014-09-18 12:03:46 +02:00