Torkel Ödegaard
b25cb60259
Merge branch 'new-logger'
...
Conflicts:
CHANGELOG.md
2016-06-08 08:09:59 +02:00
Zdenek Styblik
5eceabf810
fix(): Check Organization exists before User is added ( #5302 )
...
Commit adds a check whether Organization exists before User is added to
the organization.
Fixes #3151 .
2016-06-08 05:46:21 +02:00
Torkel Ödegaard
93fdc18fd4
feat(logging): fixed dependencies
2016-06-07 15:59:50 +02:00
Torkel Ödegaard
73b0e6c37b
feat(logging): disable migrator logging during test
2016-06-07 15:50:16 +02:00
Torkel Ödegaard
a02cf5beb7
feat(logging): added loging filters
2016-06-07 12:11:41 +02:00
Torkel Ödegaard
9741af2031
feat(logging): progress on new logging #4590
2016-06-07 09:29:47 +02:00
Torkel Ödegaard
22778e6efd
feat(logging): a lot of progress on moving to new logging lib, #4590
2016-06-06 23:06:44 +02:00
Karl
2f5ae85d33
Initial patch for grafana/grafana#4267 ( #5280 )
2016-06-06 07:15:37 +02:00
Anton Chevychalov
c6744925c4
Add new parameter to config: default_theme.
2016-05-12 18:21:11 +03:00
woodsaj
ad8dbbb559
allow updates to secureJsonData.
...
SecureJsonData is stored as a json object in the DB. As the
secureJsonData is never returned to the user they are unable
to provide the full json object when performing updates instead
the user can only provide the specific keys they wish to update.
This commit ensures that only the provided keys are updated and
existing keys in the secureJsonData object are left untouched.
2016-04-28 18:39:23 +08:00
Torkel Ödegaard
97656d65ec
db(dashboard): minor fix for dashboard delete
2016-04-25 11:22:13 +02:00
Torkel Ödegaard
9c14b9672f
fix(): admin stats and postgres
2016-04-11 18:16:35 -04: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
ab1048b7ee
feat(preferences): theme and home dashbord settings now work work on profile and org settings page
2016-04-02 13:54:06 -07:00
Torkel Ödegaard
38a10f8be4
progress
2016-04-01 17:34:30 -07:00
Torkel Ödegaard
7023dedc05
feat(preferences): refactoring PR #4399
2016-03-20 11:52:19 +01:00
Torkel Ödegaard
9e98c86ae1
Merge branch 'master' into preferences
2016-03-20 11:27:49 +01:00
utkarshcmu
66621d762e
Added getDashboardSlugById api
2016-03-17 01:01:58 -07:00
utkarshcmu
9dd6aefcec
Minor corrections
2016-03-16 23:35:06 -07:00
utkarshcmu
749fd618a9
Saving home dashboard id in table
2016-03-16 23:22:27 -07:00
Torkel Ödegaard
fcaf2bfdba
fix(datasource): when addding data source withCredentials did not get set, fixes #4389
2016-03-16 15:16:28 +01:00
Torkel Ödegaard
a88176e060
feat(preferences): lots of refactoring and changes to #3214
2016-03-15 22:49:52 +01:00
Torkel Ödegaard
e06756bcab
Merge branch 'preferences' of github.com:grafana/grafana into preferences
2016-03-15 22:15:27 +01:00
Torkel Ödegaard
9c222a445f
Merge branch 'master' into preferences
2016-03-15 22:14:35 +01:00
utkarshcmu
e371e03696
Able to save preference version, created, updated fields
2016-03-14 03:12:52 -07:00
Torkel Ödegaard
0398face05
feat(plugins): dashboard import for data sources is working! #4298
2016-03-12 10:13:49 +01:00
utkarshcmu
43b474143c
Preferences model updated
2016-03-11 06:30:05 -08:00
Torkel Ödegaard
dfaa6d8eb9
feat(plugins): a lot of work on #4298
2016-03-08 18:17:47 +01:00
bergquist
435d0f22f5
fix(dashlist): better handling of invalid dashboard ids
2016-03-07 11:04:02 +01:00
utkarshcmu
9c8d508247
Made API handling better, removed unused components
2016-03-06 12:32:22 -08:00
utkarshcmu
8f42bec270
Implemented GetUserPreferences API
2016-03-06 11:42:15 -08:00
utkarshcmu
660d3fa1e9
Implemented savePreferences API
2016-03-06 03:47:39 -08:00
utkarshcmu
cf926134ef
Added savePreferencesAPI
2016-03-05 13:15:49 -08:00
bergquist
dd7e215e78
feat(dashslist): make sure dashbords exists in recently viewd dashboards
...
closes #4249
2016-03-05 12:27:37 +01: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
56c080417a
fix(logging): only log to xorm.log when in dev mode, fixes #4182
2016-02-29 13:42:07 +01: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
Torkel Ödegaard
b5dc1727d2
fix(postgres): If password or user is empty use empty quotes for connection string, #3985
2016-02-12 10:10:07 +01:00
Torkel Ödegaard
37c6a1ddf0
feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template
2016-02-10 16:43:35 +01:00
Torkel Ödegaard
fcc960e9a2
Merge pull request #3792 from utkarshcmu/snapshot-view
...
UI Review: Snapshot view
2016-02-05 08:49:23 +01:00
utkarshcmu
338afc80d5
Merge branch 'master' of https://github.com/grafana/grafana into metadata
2016-02-01 10:32:36 -08:00
Torkel Ödegaard
12460af0ec
Merge pull request #3830 from raintank/apiPlugin
...
Add secureJsonData field to appSettings model
2016-01-29 17:17:37 -05:00
Daniel Lee
21632d22ab
Merge pull request #3882 from bergquist/playlist_tags
...
Add support for playlist based on tags
2016-01-29 21:32:58 +01:00
bergquist
d405176367
chore(playlist): remove commented code
2016-01-29 20:33:01 +01:00
bergquist
15087251fb
test(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstore
2016-01-29 20:24:19 +01:00
Anthony Woods
2e9272c778
Merge remote-tracking branch 'upstream/master' into apiPlugin
2016-01-30 01:38:01 +08:00
Anthony Woods
79e7ae4424
fix sql query in GetAdminStats. fixes #3883
2016-01-29 09:38:51 +08:00
bergquist
d27bb4d3fb
style(playlist): move dashboard access to dashboard.go
2016-01-29 01:41:23 +01:00
utkarshcmu
58121d89fc
Updated http_api docs
2016-01-27 22:02:33 -08:00
