Torkel Ödegaard
b62f1f00cd
feat(apps): auto update dashboard dashboards, #5529
2016-07-07 18:11:03 +02:00
Torkel Ödegaard
305a6ae110
feat(dashboards): dashboard sharing fixes
2016-06-17 11:36:35 +02:00
Torkel Ödegaard
ec0b09450c
Merge branch 'export-dashboard'
...
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
public/app/core/components/grafana_app.ts
public/app/core/core.ts
public/app/features/dashboard/dashboardCtrl.js
2016-06-16 08:06:43 +02:00
Torkel Ödegaard
086b59483e
feat(loggin): disable logging by default so unit tests are not full of logging
2016-06-11 11:38:25 +02:00
Torkel Ödegaard
73b0e6c37b
feat(logging): disable migrator logging during test
2016-06-07 15:50:16 +02:00
Torkel Ödegaard
0d4c76a029
feat(import): save gnetId for dashbards imported from grafana.net
2016-05-27 16:42:32 +02:00
Torkel Ödegaard
9b30634217
fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558
2016-04-05 11:24:21 -04:00
Torkel Ödegaard
a88176e060
feat(preferences): lots of refactoring and changes to #3214
2016-03-15 22:49:52 +01:00
utkarshcmu
e371e03696
Able to save preference version, created, updated fields
2016-03-14 03:12:52 -07:00
utkarshcmu
43b474143c
Preferences model updated
2016-03-11 06:30:05 -08:00
utkarshcmu
ac499b3aff
Minor Pre-PR fixes
2016-03-04 01:29:46 -08:00
utkarshcmu
662579e9a9
Added preferences migrations
2016-03-03 02:08:51 -08:00
Torkel Ödegaard
8db7cf49a6
feat(plugins): began refactoring AppSettings -> PluginSettings, and have the plugins list view and plugin edit view be common for all plugins
2016-02-25 14:55:31 +01:00
utkarshcmu
338afc80d5
Merge branch 'master' of https://github.com/grafana/grafana into metadata
2016-02-01 10:32:36 -08:00
utkarshcmu
58121d89fc
Updated http_api docs
2016-01-27 22:02:33 -08:00
utkarshcmu
753fd164d7
Added createdBy in metadata ui and dashboard table
2016-01-27 17:11:21 -08:00
Anthony Woods
05868bc1df
fix typo
2016-01-26 04:24:44 +08:00
Anthony Woods
40d946a6e3
add drop table to ensure existing installs get new schema
2016-01-26 04:18:18 +08:00
Anthony Woods
32f78d465b
add secureJsonData to appSettings model.
...
- adds the new column to the DB table.
- data stored in the DB is encrypted
- update appRouteHeaders templates to use the jsonData and
decrypted secureJsonData
2016-01-23 06:17:22 +08:00
Torkel Ödegaard
66eebd1ac3
refactor(playlist): refactor of playlist feature, and PR #3776
2016-01-18 16:01:14 +01:00
Torkel Ödegaard
e5b3f27a30
Merge branch 'apps'
2016-01-12 15:41:15 +01:00
bergquist
e8786b0747
feat(playlist): renames timespan to interval
2016-01-12 13:56:47 +01:00
bergquist
8a38991270
feat(playlist): changes to relation table
...
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
2016-01-12 08:17:44 +01:00
Torkel Ödegaard
c1e94e61d0
feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings
2016-01-10 21:37:11 +01:00
Torkel Ödegaard
69d0e82453
Merge branch 'master' into apps
...
Conflicts:
pkg/services/sqlstore/migrations/migrations.go
2016-01-08 10:20:46 +01:00
utkarshcmu
ca5099f53b
Fixed gofmt tests
2015-12-24 02:25:49 -08:00
utkarshcmu
5877e5e11a
Merged with master, resolved conflicts
2015-12-24 02:24:59 -08:00
Torkel Ödegaard
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
Ed Dawley
cd23ab9955
Issue 3461: Session table is now created automatically
2015-12-23 01:33:46 -06:00
Torkel Ödegaard
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
Torkel Ödegaard
eacc46da6d
feat(plugins): WIP on new apps concept
2015-12-21 23:09:27 +01:00
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
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
utkarshcmu
22fd2aed02
Removed columns from snapshot table
2015-12-18 00:30:44 -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
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
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
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
16fa5c4df3
fix(mysql): fix for migration in newly added temp_user table, fixes #2509
2015-08-14 09:41:07 +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
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
