265 Commits

Author SHA1 Message Date
24dfa55465 feat(signup): progress on new sign up and email verification flow, #2353 2015-08-28 09:24:30 +02:00
d25624a8ad feat(signup): began work on new / alternate signup flow that includes email verification, #2353 2015-08-27 13:59:58 +02:00
3d37c9c9a3 feat(tagmanager): support to add google tagmanager id, closes #2569 2015-08-21 09:30:39 +02:00
50281f12b9 fix(default datasource): minor fix for handling of default datasource 2015-08-18 14:54:56 +02:00
9a9c9b2b12 Merge branch 'query-editor-breakout'
Conflicts:
	CHANGELOG.md
2015-08-18 08:23:13 +02:00
6ee0f2c6a7 feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436 2015-08-17 17:07:33 +02:00
4a6b5274bc feat(invite): fixes for org invite enhancement story, #2353 2015-08-17 10:55:52 +02:00
a16c63a43e feat(mixed datasources): continued work on editor design change 2015-08-16 20:52:30 +02:00
8fcaa4997d feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457 2015-08-12 08:59:39 +02:00
43ef9f909a feat(admin): admin page for all grafana organizations (list / edit view), #2457 2015-08-11 15:20:50 +02:00
234d1291f9 Merge branch 'invite'
Conflicts:
	public/css/less/gfbox.less
	public/emails/reset_password.html
	public/emails/welcome_on_signup.html
2015-08-11 11:22:43 +02:00
1ea0b5371a feat(invite): new user invites are now also added to correct org after sign up is completed, #2353 2015-08-11 10:45:03 +02:00
74932e6311 feat(invite): added specific email for invites to existing grafana users 2015-08-11 10:35:10 +02:00
e53c1e39d3 feat(invite): can now add org user with sername again, #2353 2015-08-10 14:03:08 +02:00
775e044e69 feat(invite): progress on invite feature, #2353 2015-08-10 13:47:06 +02:00
19f64bc561 fix(data source proxy): clear proxies request from cookies, fixes #2470 2015-08-10 12:11:18 +02:00
0ed4744a33 influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455 2015-08-07 11:02:32 +02:00
9d25d2674b fix(invite): fixed link in email 2015-08-04 20:23:04 +02:00
5a160f426e feat(invite): trying to get username to work as well 2015-07-29 09:30:23 +02:00
6d6af09296 feat(invite): handling of existing org user case when inviting, #2353 2015-07-21 12:18:11 +02:00
ab54971763 feat(invite): more progress on completing invite form and actually creating a real user, #2353 2015-07-20 17:46:48 +02:00
d75f96fdd5 feat(invite): more progress on invited / sigup view, #2353 2015-07-20 15:52:49 +02:00
024c112944 feat(invite): redesign for pending invite list, added revoke button and link, copy invite also works now, #2353 2015-07-20 14:26:49 +02:00
3242354a4b feat(invite): worked on pending invitations list, revoke invite now works, #2353 2015-07-20 10:57:39 +02:00
4ac652b127 feat(invite): began work on invited signup view, also added backdrop to login view, #2353 2015-07-19 12:34:03 +02:00
6088f83408 feat(invite): inital pass on sending new user invite email, #2353 2015-07-18 17:39:12 +02:00
e92f2ecea1 feat(invite): existing grafana users now result in new org user directly, no temp user is created, #2353 2015-07-18 11:43:34 +02:00
2724cf5db8 feat(invite): small progress 2015-07-17 14:42:49 +02:00
0ffcce1b5d feat(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353 2015-07-17 09:51:34 +02:00
0b5ba55131 feat(ldap): work on reading ldap config from toml file, #1450 2015-07-15 10:08:23 +02:00
bfe7b77313 More work on ldap auth, got memberOf working in the docker ldap test server, playing with config options and structures, #1450 2015-07-13 14:23:59 +02:00
0ef7271326 Started work on LDAP again, #1450 2015-07-10 11:10:48 +02:00
66ba19b7ba clearer errors
"Not found" should only be for http path/method not found (404)
if it's about specific resources, we should be explicit for clarity
2015-07-08 08:55:31 +02:00
df33cbc8c5 Fix wrong metrics counter 2015-06-30 12:52:55 +07:00
24bab47f14 fix(create org): Anonymous user can no longer create org, Fixes #2227 2015-06-25 17:06:43 +02:00
3f917b0af5 Updated org creation view, after creating new org user is switched to that org and redirect to org details view, Closes #2198 2015-06-22 08:13:21 +02:00
fb7b475457 Backend: Load dashboards with capital letters in the dashboard url slug (url id), Fixes #2163 2015-06-19 14:42:55 -04:00
3675b3fcaa Fixed issue with clearing admin permissions, Fixes #2143 2015-06-11 08:29:12 +02:00
5962bcbc6c Do not show create org link when allow_org_create is set to false, Fixes #2135 2015-06-11 08:16:09 +02:00
2266ef6809 Minor api refactoring / code clean up 2015-06-10 10:15:42 +02:00
db0c442eaf Added configuration options for smtp 2015-06-08 17:56:56 +02:00
c8bc0b3bf8 Lots of work on user password reset, #1456 2015-06-08 13:39:02 +02:00
aa4d60c21e Worked on reset password views, refactored out password strength to a reusable directive 2015-06-08 10:57:01 +02:00
89418a155a More work on email and notification infra #1456 2015-06-05 11:08:19 +02:00
c709a28f02 More work on email and notification infra #1456 2015-06-05 08:15:38 +02:00
3f5ab189cd Began work on emailing service #1456 2015-06-04 14:29:39 +02:00
eb793f7feb Initial work on ldap support, #1450 2015-06-04 09:34:42 +02:00
2c7d33cdfa Merge branch 'master' into ldap 2015-06-03 14:54:48 +02:00
50a1feb90a Dashboard list panel: Now supports search by multiple tags, Closes #2096 2015-06-02 11:04:06 +02:00
dc607b8e8a Dashboard search now supports filtering by multiple dashboard tags, Closes #2095 2015-06-02 10:24:20 +02:00