 utkarshcmu
|
78fe588330
|
Removed NewAddColumnMigration via 3473
|
2015-12-16 02:46:20 -08:00 |
|
 Torkel Ödegaard
|
201f50b121
|
Merge branch 'master' into external-plugins
Conflicts:
pkg/api/login.go
public/app/core/routes/all.js
public/app/core/table_model.ts
public/app/panels/table/table_model.ts
public/app/plugins/panels/table/editor.ts
public/app/plugins/panels/table/table_model.ts
|
2015-12-14 17:28:57 +01:00 |
|
|
Torkel Ödegaard
|
c7e3ed096f
|
fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505
|
2015-12-14 10:19:53 +01:00 |
|
 Mitsuhiro Tanda
|
6edd6c8f03
|
add with_credentials to datasource model
|
2015-12-09 14:44:28 +09:00 |
|
|
utkarshcmu
|
79d0f47ee7
|
Added columns in dashboard_snapshot
|
2015-12-07 04:24:29 -08:00 |
|
|
utkarshcmu
|
42d1205260
|
Fixed gofmt checks
|
2015-12-06 23:59:58 -08:00 |
|
|
utkarshcmu
|
3d90340446
|
Added new columns to dashboard table
|
2015-12-06 23:51:43 -08:00 |
|
 woodsaj
|
c4a0fe0234
|
add pluginBundle backend api methods and SQL storage
|
2015-12-03 23:43:55 +08:00 |
|
|
utkarshcmu
|
fe2d8f1ea0
|
Used dialect for postgres
|
2015-11-07 05:21:22 -08:00 |
|
|
utkarshcmu
|
2676f24e0a
|
Fixed user deletion in Postgres SQL
|
2015-11-06 20:17:27 -08:00 |
|
|
Torkel Ödegaard
|
c816ed2527
|
feat(usage stats): added data source count stats
|
2015-09-29 13:47:56 +02:00 |
|
|
woodsaj
|
86ed85aa6e
|
move toMap function to be a method on the quota structs
|
2015-09-15 17:18:26 +08:00 |
|
|
woodsaj
|
b7de847236
|
add unittests for quota sqltore methods.
|
2015-09-15 17:10:46 +08:00 |
|
|
woodsaj
|
3cf2cd4684
|
be sure to pass result obj by reference to xorm.
|
2015-09-15 17:10:16 +08:00 |
|
|
woodsaj
|
6488324cf1
|
enhance quota support.
now includes:
- perOrg (users, dashboards, datasources, api_keys)
- perUser (orgs)
- global (users, orgs, dashboards, datasources, api_keys, sessions)
|
2015-09-11 23:17:10 +08:00 |
|
|
woodsaj
|
852f9bd277
|
refactor quota settings
|
2015-09-11 01:47:33 +08:00 |
|
|
woodsaj
|
3d4d822528
|
implement updateQuota function
|
2015-09-11 01:04:29 +08:00 |
|
|
woodsaj
|
c238130842
|
quote table names passed by arguments
|
2015-09-11 01:04:22 +08:00 |
|
|
woodsaj
|
9023171940
|
inital backend suport for quotas. issue #321
Conflicts:
conf/defaults.ini
main.go
pkg/services/sqlstore/migrations/migrations.go
|
2015-09-11 01:01:36 +08:00 |
|
|
Torkel Ödegaard
|
e2cb66f8d7
|
fix(logging): removed temp dev logging code
|
2015-09-08 14:32:25 +02:00 |
|
|
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
|
aa89416bca
|
fix(invite): fixes to org invite stuff, #2630
|
2015-09-01 12:35:06 +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
|
01d9849e44
|
fix(user create): fixed for creating multiple users with empty email when auto assign org is set to false, fixes #2011
|
2015-08-18 20:15:24 +02:00 |
|
|
Torkel Ödegaard
|
16fa5c4df3
|
fix(mysql): fix for migration in newly added temp_user table, fixes #2509
|
2015-08-14 09:41:07 +02:00 |
|
|
Torkel Ödegaard
|
e6d09b3266
|
fix(db): remove stars and tags when removing user or dashboard, fixes #2016
|
2015-08-12 09:23:46 +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
|
e01c68dcea
|
fix(logging): removed db connection string from being printed in logs at app startup, fixes #2488
|
2015-08-11 11:26:28 +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
|
835fd383ad
|
fix(postgres): Dashboard search is now case insensitive when using Postgres, fixes #1896
|
2015-08-10 20:25:01 +02:00 |
|
|
Torkel Ödegaard
|
775e044e69
|
feat(invite): progress on invite feature, #2353
|
2015-08-10 13:47:06 +02:00 |
|
|
Torkel Ödegaard
|
90400bf5ad
|
fix(ldap): fix for ldap users with empty email address, fixes #2461
|
2015-08-07 10:14:36 +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
|
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
|
444807c35b
|
feat(invite): worked on db & domain model for temp users, #2353
|
2015-07-16 17:59:11 +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 |
|
|
Torkel Ödegaard
|
89418a155a
|
More work on email and notification infra #1456
|
2015-06-05 11:08:19 +02:00 |
|
|
Torkel Ödegaard
|
c709a28f02
|
More work on email and notification infra #1456
|
2015-06-05 08:15:38 +02:00 |
|
|
Torkel Ödegaard
|
50a1feb90a
|
Dashboard list panel: Now supports search by multiple tags, Closes #2096
|
2015-06-02 11:04:06 +02:00 |
|
|
Torkel Ödegaard
|
dc607b8e8a
|
Dashboard search now supports filtering by multiple dashboard tags, Closes #2095
|
2015-06-02 10:24:20 +02:00 |
|
|
Torkel Ödegaard
|
a8aab0cb2b
|
Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014
|
2015-05-19 11:47:14 +02:00 |
|