bergquist
|
b469904c7f
|
fix(login): hide divider if no oath
closes #3980
|
2016-02-10 10:41:43 +01:00 |
|
bergquist
|
13d993a836
|
fix(search): remove old search ctrl
|
2016-01-26 23:28:06 +01:00 |
|
Torkel Ödegaard
|
c201f4c63e
|
feat(sidemenu): added handling of click outside to hide sidemenu, also refactored grafana_ctrl to a more general grafana component
|
2016-01-16 18:55:13 +01:00 |
|
Torkel Ödegaard
|
59c928acc2
|
feat(tslint): added more tslint rules
|
2016-01-13 21:07:57 +01:00 |
|
Torkel Ödegaard
|
e081a5c5a0
|
feat(apps): worked on pinning apps
|
2016-01-11 18:03:08 +01:00 |
|
Torkel Ödegaard
|
c5635f9c89
|
feat(plugins): changed what datasources should return, they should now return the datasource constructor
|
2016-01-09 13:21:16 +01:00 |
|
Torkel Ödegaard
|
60e7c6d150
|
Merge branch 'master' into apps
Conflicts:
public/app/partials/sidemenu.html
|
2016-01-08 18:10:53 +01:00 |
|
Torkel Ödegaard
|
6c1fee736b
|
feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687
|
2016-01-08 17:58:46 +01:00 |
|
Torkel Ödegaard
|
f67563e9ee
|
feat(apps): moving things around
|
2016-01-08 12:45:12 +01:00 |
|
Torkel Ödegaard
|
d1145ed3fb
|
Merge branch 'master' into apps
|
2015-12-22 13:59:25 +01:00 |
|
Torkel Ödegaard
|
f074c1eaff
|
refactor(lodash): changed how lodash is referenced from typescript
|
2015-12-22 13:59:11 +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 |
|
Torkel Ödegaard
|
0a9f705308
|
tech(systemjs): more fixes for optmized build
|
2015-12-21 16:34:18 +01:00 |
|
woodsaj
|
48cf56b69a
|
more renaming. also moved apps and datasource menus
|
2015-12-18 13:46:40 +08:00 |
|
Torkel Ödegaard
|
df1e52e394
|
tech(systemjs): more stuff is starting to work
|
2015-12-17 16:30:53 +01:00 |
|
Torkel Ödegaard
|
c24935b519
|
minor progress
|
2015-12-16 17:01:34 +01:00 |
|
Torkel Ödegaard
|
ca84ef38f8
|
angular2 test
|
2015-12-16 12:21:13 +01:00 |
|
Torkel Ödegaard
|
04ff97cd72
|
tech(systemjs): tricky mixing systemjs and requirejs, might need to migrate
|
2015-12-15 20:23:55 +01:00 |
|
Torkel Ödegaard
|
7ee290cc57
|
tech(systemjs): systemjs and jspm work
|
2015-12-15 17:56:16 +01:00 |
|
Torkel Ödegaard
|
2ec5bc77d7
|
Merge branch 'external-plugins'
|
2015-12-15 10:10:48 +01: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 |
|
carl bergquist
|
1cfa523f49
|
style(sidemenu): rename signup method to signout
|
2015-12-14 17:19:26 +01:00 |
|
Carl Bergquist
|
548ee47aa7
|
Merge pull request #3122 from shoonoise/hide_signout
Disable sign out button in case of auth proxy enabled
|
2015-12-14 17:18:04 +01:00 |
|
carl bergquist
|
fab1062c0b
|
Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints
Conflicts:
conf/defaults.ini
pkg/setting/setting.go
closes #2571
closes #2494
|
2015-12-11 15:16:57 +01:00 |
|
shoonoise
|
5cf3425b93
|
Disable sign out button in case of auth proxy enabled
|
2015-11-26 17:56:45 +03:00 |
|
Torkel Ödegaard
|
df0bc7bbc4
|
feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185
|
2015-11-20 09:43:10 +01:00 |
|
Torkel Ödegaard
|
69daede583
|
feat(external plugins): worked on supporting external plugins better
|
2015-11-19 18:44:07 +01:00 |
|
Torkel Ödegaard
|
b21fa2daa0
|
Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins
|
2015-11-19 11:05:27 +01:00 |
|
Torkel Ödegaard
|
d8f68eb118
|
refactoring: moving and renaming things
|
2015-10-30 16:06:29 +01:00 |
|
Torkel Ödegaard
|
152b484eb5
|
refactoring: moved app/controllers -> app/core/controllers
|
2015-10-30 15:16:05 +01:00 |
|