ca5099f53b
Fixed gofmt tests
2015-12-24 02:25:49 -08:00
5877e5e11a
Merged with master, resolved conflicts
2015-12-24 02:24:59 -08:00
69eb62c09f
Merge pull request #3597 from eddawley/ISSUE-3461
...
Issue 3461: Session table is now created automatically
2015-12-24 09:59:34 +01:00
4da56b65ab
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-23 15:06:28 -06:00
cd23ab9955
Issue 3461: Session table is now created automatically
2015-12-23 01:33:46 -06:00
3f9f0679ec
gofmt
2015-12-22 13:10:34 +00:00
ea566fff24
Add TLS for mysql
...
Use ssl_mode for mysql and add docs
add docs for the new parameters in config
Tolerate ssl_mode without client authentication
Client cert is not necessary for a SSL connection. So we tolerate
failure if client cert is not provided.
Improve error message if missing server_cert_name and mode is not
skip-verify.
2015-12-22 12:42:52 +00:00
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
eacc46da6d
feat(plugins): WIP on new apps concept
2015-12-21 23:09:27 +01:00
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
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
22fd2aed02
Removed columns from snapshot table
2015-12-18 00:30:44 -08:00
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08:00
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
78fe588330
Removed NewAddColumnMigration via 3473
2015-12-16 02:46:20 -08:00
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
c7e3ed096f
fix(postgres): fixes db migration issue with_credentials column for postgres, fixes #3505
2015-12-14 10:19:53 +01:00
6edd6c8f03
add with_credentials to datasource model
2015-12-09 14:44:28 +09:00
79d0f47ee7
Added columns in dashboard_snapshot
2015-12-07 04:24:29 -08:00
42d1205260
Fixed gofmt checks
2015-12-06 23:59:58 -08:00
3d90340446
Added new columns to dashboard table
2015-12-06 23:51:43 -08:00
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08:00
fe2d8f1ea0
Used dialect for postgres
2015-11-07 05:21:22 -08:00
2676f24e0a
Fixed user deletion in Postgres SQL
2015-11-06 20:17:27 -08:00
c816ed2527
feat(usage stats): added data source count stats
2015-09-29 13:47:56 +02:00
86ed85aa6e
move toMap function to be a method on the quota structs
2015-09-15 17:18:26 +08:00
b7de847236
add unittests for quota sqltore methods.
2015-09-15 17:10:46 +08:00
3cf2cd4684
be sure to pass result obj by reference to xorm.
2015-09-15 17:10:16 +08:00
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
852f9bd277
refactor quota settings
2015-09-11 01:47:33 +08:00
3d4d822528
implement updateQuota function
2015-09-11 01:04:29 +08:00
c238130842
quote table names passed by arguments
2015-09-11 01:04:22 +08:00
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
e2cb66f8d7
fix(logging): removed temp dev logging code
2015-09-08 14:32:25 +02:00
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
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
aa89416bca
fix(invite): fixes to org invite stuff, #2630
2015-09-01 12:35:06 +02:00
d19e101e6b
feat(signup): almost done with new sign up flow, #2353
2015-08-31 11:35:07 +02:00
14884d5a2b
feat(signup): progress on new signup flow, #2353
2015-08-30 18:56:53 +02:00
de0f04ec3c
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 15:14:24 +02:00
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
16fa5c4df3
fix(mysql): fix for migration in newly added temp_user table, fixes #2509
2015-08-14 09:41:07 +02:00
e6d09b3266
fix(db): remove stars and tags when removing user or dashboard, fixes #2016
2015-08-12 09:23:46 +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
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
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
utkarshcmu
Torkel Ödegaard
Ed Dawley
Daniel Low
woodsaj
Mitsuhiro Tanda