41 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Torkel Ödegaard	4dfe8b6f69	Working on login user name state	2014-09-17 15:25:07 +02:00
Torkel Ödegaard	ecafc7bf8f	Added support for delete dashboard	2014-09-17 13:34:42 +02:00
Torkel Ödegaard	2380a26987	updated	2014-09-17 09:49:28 +02:00
Torkel Ödegaard	f133a9de79	Merge branch 'master' of github.com:torkelo/grafana-pro ... Conflicts: grafana	2014-09-13 18:36:40 +02:00
Torkel Ödegaard	b876d193c4	updated	2014-09-13 18:33:52 +02:00
Torkel Ödegaard	31fe471da5	working on account registration and more	2014-08-22 18:05:37 +02:00
Torkel Ödegaard	c684b1ddab	dashboard load/save work and began work on register	2014-08-22 15:32:42 +02:00
Torkel Ödegaard	07d8b542bf	working on rethinkdb stuff	2014-08-21 22:09:48 +02:00
Torkel Ödegaard	d8dca20332	updated	2014-08-17 12:25:37 +02:00
Torkel Ödegaard	efed13b9fe	Work on login and sidemenu	2014-08-16 21:54:26 +02:00
Torkel Ödegaard	9e30599f1f	rename backend to pkg	2014-08-12 20:45:41 +02:00
Torkel Ödegaard	e7ce371ee8	working on login && auth	2014-08-12 15:07:20 +02:00
Torkel Ödegaard	56d449b2ce	updated	2014-08-12 12:20:15 +02:00
Torkel Ödegaard	24579d86d2	updated	2014-08-12 07:25:02 +02:00
Torkel Ödegaard	71573fb5a0	restructing api code	2014-08-11 20:18:46 +02:00
Torkel Ödegaard	3a5f718da8	updated	2014-08-11 16:37:44 +02:00
Torkel Ödegaard	380f707285	workin on png rendering	2014-08-09 11:57:54 +02:00
Torkel Ödegaard	c669f8c612	working on rendering panel with phantomjs	2014-08-08 15:53:31 +02:00
Torkel Ödegaard	8154b4f60d	search and save are 'working', barely	2014-08-08 12:35:15 +02:00