Torkel Ödegaard
|
fad1d4cf98
|
feat(organization): added update org address to http api and to org details settings view, closes #2672
|
2015-09-08 14:22:44 +02:00 |
|
Torkel Ödegaard
|
daf64421f2
|
fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686
|
2015-09-08 13:06:18 +02:00 |
|
Torkel Ödegaard
|
3ed63d09d9
|
Merge branch 'master' into cloudwatch
|
2015-09-01 17:25:36 +02:00 |
|
Torkel Ödegaard
|
aa89416bca
|
fix(invite): fixes to org invite stuff, #2630
|
2015-09-01 12:35:06 +02:00 |
|
Torkel Ödegaard
|
ffbf70af25
|
Merge branch 'cloudwatch' of https://github.com/mtanda/grafana into cloudwatch
|
2015-08-31 15:45:49 +02:00 |
|
Torkel Ödegaard
|
d19e101e6b
|
feat(signup): almost done with new sign up flow, #2353
|
2015-08-31 11:35:07 +02:00 |
|
Torkel Ödegaard
|
14884d5a2b
|
feat(signup): progress on new signup flow, #2353
|
2015-08-30 18:56:53 +02:00 |
|
Torkel Ödegaard
|
de0f04ec3c
|
feat(signup): progress on new sign up and email verification flow, #2353
|
2015-08-28 15:14:24 +02:00 |
|
Torkel Ödegaard
|
24dfa55465
|
feat(signup): progress on new sign up and email verification flow, #2353
|
2015-08-28 09:24:30 +02:00 |
|
Torkel Ödegaard
|
d25624a8ad
|
feat(signup): began work on new / alternate signup flow that includes email verification, #2353
|
2015-08-27 13:59:58 +02:00 |
|
Torkel Ödegaard
|
3d37c9c9a3
|
feat(tagmanager): support to add google tagmanager id, closes #2569
|
2015-08-21 09:30:39 +02:00 |
|
Mitsuhiro Tanda
|
00f76ecaf6
|
CloudWatch proxy support
|
2015-08-20 00:51:23 +09:00 |
|
Torkel Ödegaard
|
50281f12b9
|
fix(default datasource): minor fix for handling of default datasource
|
2015-08-18 14:54:56 +02:00 |
|
Torkel Ödegaard
|
9a9c9b2b12
|
Merge branch 'query-editor-breakout'
Conflicts:
CHANGELOG.md
|
2015-08-18 08:23:13 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
4a6b5274bc
|
feat(invite): fixes for org invite enhancement story, #2353
|
2015-08-17 10:55:52 +02:00 |
|
Torkel Ödegaard
|
a16c63a43e
|
feat(mixed datasources): continued work on editor design change
|
2015-08-16 20:52:30 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
43ef9f909a
|
feat(admin): admin page for all grafana organizations (list / edit view), #2457
|
2015-08-11 15:20:50 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
74932e6311
|
feat(invite): added specific email for invites to existing grafana users
|
2015-08-11 10:35:10 +02:00 |
|
Torkel Ödegaard
|
e53c1e39d3
|
feat(invite): can now add org user with sername again, #2353
|
2015-08-10 14:03:08 +02:00 |
|
Torkel Ödegaard
|
775e044e69
|
feat(invite): progress on invite feature, #2353
|
2015-08-10 13:47:06 +02:00 |
|
Torkel Ödegaard
|
19f64bc561
|
fix(data source proxy): clear proxies request from cookies, fixes #2470
|
2015-08-10 12:11:18 +02:00 |
|
Torkel Ödegaard
|
0ed4744a33
|
influxdb(auth): fixed issue with using basic auth and influxdb, fixes #2455
|
2015-08-07 11:02:32 +02:00 |
|
Torkel Ödegaard
|
9d25d2674b
|
fix(invite): fixed link in email
|
2015-08-04 20:23:04 +02:00 |
|
Torkel Ödegaard
|
5a160f426e
|
feat(invite): trying to get username to work as well
|
2015-07-29 09:30:23 +02:00 |
|
Torkel Ödegaard
|
6d6af09296
|
feat(invite): handling of existing org user case when inviting, #2353
|
2015-07-21 12:18:11 +02:00 |
|
Torkel Ödegaard
|
ab54971763
|
feat(invite): more progress on completing invite form and actually creating a real user, #2353
|
2015-07-20 17:46:48 +02:00 |
|
Torkel Ödegaard
|
d75f96fdd5
|
feat(invite): more progress on invited / sigup view, #2353
|
2015-07-20 15:52:49 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
3242354a4b
|
feat(invite): worked on pending invitations list, revoke invite now works, #2353
|
2015-07-20 10:57:39 +02:00 |
|
Torkel Ödegaard
|
4ac652b127
|
feat(invite): began work on invited signup view, also added backdrop to login view, #2353
|
2015-07-19 12:34:03 +02:00 |
|
Torkel Ödegaard
|
6088f83408
|
feat(invite): inital pass on sending new user invite email, #2353
|
2015-07-18 17:39:12 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
2724cf5db8
|
feat(invite): small progress
|
2015-07-17 14:42:49 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
0b5ba55131
|
feat(ldap): work on reading ldap config from toml file, #1450
|
2015-07-15 10:08:23 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
0ef7271326
|
Started work on LDAP again, #1450
|
2015-07-10 11:10:48 +02:00 |
|
Dieter Plaetinck
|
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 |
|
Donn Pebe
|
df33cbc8c5
|
Fix wrong metrics counter
|
2015-06-30 12:52:55 +07:00 |
|
Torkel Ödegaard
|
24bab47f14
|
fix(create org): Anonymous user can no longer create org, Fixes #2227
|
2015-06-25 17:06:43 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
fb7b475457
|
Backend: Load dashboards with capital letters in the dashboard url slug (url id), Fixes #2163
|
2015-06-19 14:42:55 -04:00 |
|
Torkel Ödegaard
|
3675b3fcaa
|
Fixed issue with clearing admin permissions, Fixes #2143
|
2015-06-11 08:29:12 +02:00 |
|
Torkel Ödegaard
|
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 |
|
Torkel Ödegaard
|
2266ef6809
|
Minor api refactoring / code clean up
|
2015-06-10 10:15:42 +02:00 |
|
Torkel Ödegaard
|
db0c442eaf
|
Added configuration options for smtp
|
2015-06-08 17:56:56 +02:00 |
|