woodsaj
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
utkarshcmu
cb5c1bd24d
Removed created_by and fixed gofmt
2015-12-18 02:30:20 -08:00
utkarshcmu
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
utkarshcmu
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
utkarshcmu
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
woodsaj
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08:00
woodsaj
c35b51a268
refactor.
...
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +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
Mitsuhiro Tanda
6edd6c8f03
add with_credentials to datasource model
2015-12-09 14:44:28 +09:00
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08:00
woodsaj
bd4cb549d6
add pluginBundle support
...
A plugnBundle is meta plugin that has a set of dependent plugins
to enable. This commit includes a plugin.json for a default
"core" bundle that enables all of the shipped panels and datasources.
2015-12-03 15:52:37 +08:00
utkarshcmu
1b7f4f31ca
Tired of gofmt
2015-11-20 04:52:50 -08:00
utkarshcmu
ca01604b43
Added statements in constructor
2015-11-20 04:37:24 -08:00
utkarshcmu
93f9a0c39c
Fixed created & updated columns in dashboard table
2015-11-20 03:10:24 -08:00
utkarshcmu
f5db9950f8
fixed gofmt tests
2015-11-16 07:28:38 -08:00
utkarshcmu
9485e8cfee
/api/admin/users returns user ID
2015-11-16 06:55:02 -08:00
Torkel Ödegaard
323e84375b
refactoring: minor refactoring and handling of known data source plugins
2015-10-26 16:37:45 +01: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
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
0688050552
add quota middleware to enforce quotas. issue #321
...
Conflicts:
pkg/api/api.go
2015-09-11 01:03:47 +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
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
de0f04ec3c
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 15:14:24 +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
Mitsuhiro Tanda
00f76ecaf6
CloudWatch proxy support
2015-08-20 00:51:23 +09: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
775e044e69
feat(invite): progress on invite feature, #2353
2015-08-10 13:47:06 +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
bae1e2f0c1
Fix for validating tags in dashboard json in backend, Fixes #2152
2015-06-12 09:04:10 +02:00
Torkel Ödegaard
7ce31bfaa0
changed dependency for gosimple/slug, they had finally removed the gopkgs dependency, Fixes #2153
2015-06-12 08:53:20 +02:00
Torkel Ödegaard
42fc68baa5
Simplified emailing system and combined mailer and notifications packages
2015-06-08 16:51:25 +02:00
Torkel Ödegaard
c8bc0b3bf8
Lots of work on user password reset, #1456
2015-06-08 13:39:02 +02:00
Torkel Ödegaard
aa4d60c21e
Worked on reset password views, refactored out password strength to a reusable directive
2015-06-08 10:57:01 +02:00
Torkel Ödegaard
89418a155a
More work on email and notification infra #1456
2015-06-05 11:08:19 +02:00
