Torkel Ödegaard
e9d5e037e8
ux: merge branch navbarv2, new navbar with dashboard search available on all pages, closes #6475
2017-06-02 14:00:42 +02:00
Torkel Ödegaard
f1276774a0
typescript: updated tslint and fixed new warnings
2017-04-20 11:16:37 +02:00
Alexander Menzhinsky
30c334a2b8
Add common type for oauth authorization errors
2017-02-01 16:42:59 +03:00
Torkel Ödegaard
a361d1f488
feat(panel): refinements for panel help text, made the inspector the home for the model version
2016-12-16 16:09:02 +01:00
Dan Cech
6b16fcea52
Oauth2 Updates ( #6226 )
...
* break out go and js build commands
* support oauth providers that return errors via redirect
* remove extra call to get grafana.net org membership
* removed GitHub specifics from generic OAuth
* readded ability to name generic source
* revert to a backward-compatible state, refactor and clean up
* streamline oauth user creation, make generic oauth support more generic
2016-10-11 08:51:44 +02:00
Torkel Ödegaard
2750c8a801
feat(config): changed name of allow_user_login_pass to disable_login_form, changed the section of the config option to [auth], impacts merged PR #5423
2016-09-28 15:27:08 +02:00
Torkel Ödegaard
e5fc4332cd
feat(oauth): refactoring PR #6077
2016-09-28 15:10:50 +02:00
Dan Cech
248ed2672f
remove 'Github' from oauth login error messages
2016-09-21 09:42:06 -04:00
Dan Cech
b387c1291d
Merge branch 'master' into gnet-oauth
...
Conflicts:
pkg/api/login_oauth.go
2016-09-21 09:39:35 -04:00
Torkel Ödegaard
b4111d78e1
fix(security): fixed login issue that was a potential for social engineering, fixes #6014
2016-09-21 15:03:14 +02:00
Dan Cech
fc17ed351c
support logging in with grafana.net credentials
2016-09-19 16:48:07 -04:00
bergquist
4646723cbb
Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth
2016-09-07 08:15:44 +02:00
Torkel Ödegaard
f9b628ad0e
Merge branch 'v3.1.x'
...
Conflicts:
conf/defaults.ini
conf/sample.ini
pkg/metrics/graphite.go
pkg/metrics/graphite_test.go
2016-08-17 09:53:46 +02:00
Torkel Ödegaard
a5f0f508ea
feat(inspector): fixed error handling, showing response body when data proxy returns text/html body
2016-08-16 22:31:26 +02:00
Torkel Ödegaard
60abe75615
Merge branch 'v3.1.x'
2016-07-06 10:10:25 +02:00
Torkel Ödegaard
d74eb8c188
fix(login): fixed so that you get redirect back to the page or dashboard you where on when you clicked on sign in link, fixes #3312
2016-07-06 10:09:53 +02:00
Kevin Fitzpatrick
b4646b6c3a
Allow users to use a generic oauth that conforms to the github style.
...
Enables users to set their own link text.
2016-06-30 15:07:55 -07:00
bergquist
690a74c6b7
feat(login): invert naming for dissallow user pass login
2016-06-25 16:30:41 +02:00
Kevin Fitzpatrick
040586604b
Allow configuration to disable the username and password login interface.
...
Used for when admins only want users to login via OAuth.
2016-06-23 10:09:13 -07:00
Torkel Ödegaard
de26a17dc7
feat(footer): began work on page footer
2016-05-03 09:00:58 +02:00
Torkel Ödegaard
ab34b174f9
Added update notice to plugin list
2016-04-11 13:42:52 -04:00
utkarshcmu
23167a0bb3
Viewers restricted to edit panel
2016-02-12 07:34:56 -08:00
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
