Torkel Ödegaard
6da3af5e89
Merge branch 'new_macaron'
2016-01-13 15:48:49 +01:00
Torkel Ödegaard
bdb67d4909
fix(build): fixed dependency and build issue
2016-01-13 15:38:54 +01:00
bergquist
4fe72ebf69
feat(macaron): upgrades macaron version
2016-01-13 15:11:23 +01:00
Shaofeng Chen
dc427d5a2c
add get org by name api
2016-01-12 13:50:56 -08:00
Torkel Ödegaard
e5b3f27a30
Merge branch 'apps'
2016-01-12 15:41:15 +01:00
bergquist
1ec97e5199
feat(playlist): shortens urls
2016-01-12 14:36:04 +01:00
bergquist
07fdf6491c
fix(playlist): new url for viewing playlist
2016-01-12 08:17:44 +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
bergquist
22c001c8a6
fix(playlist): implement api according to new standard
2016-01-08 14:21:30 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08: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
woodsaj
48cf56b69a
more renaming. also moved apps and datasource menus
2015-12-18 13:46:40 +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
5eab5dc47b
feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch
2015-12-15 10:28:52 +01:00
Torkel Ödegaard
2ec5bc77d7
Merge branch 'external-plugins'
2015-12-15 10:10:48 +01:00
Carl Bergquist
280f9befae
Merge pull request #2949 from shoonoise/master
...
Add option to hide raintank share button
Fixes #2727
2015-12-14 17:29:09 +01:00
woodsaj
3c13901695
add ui elements for plugins.
...
This includes support for cusom plugin config directives.
2015-12-04 19:21:33 +08:00
woodsaj
c4a0fe0234
add pluginBundle backend api methods and SQL storage
2015-12-03 23:43:55 +08: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
32f9f8fcce
fix(http api): correct return status code for /api/datasources/:id so it eturns 404 when not found, fixes #3217
2015-11-13 09:43:25 +01:00
woodsaj
d503c5d83d
refer to plugins are ExternalPlugin instead of thirdParty
2015-11-11 14:30:07 +08:00
shoonoise
b4a2b96e32
Add options to manage snapshot publishing
2015-10-29 16:40:03 +03:00
Torkel Ödegaard
6fecb4bf3e
fix(http route): fixed dashboard-solo route to not return 404, fixes #2979
2015-10-20 10:02:56 -04:00
Anthony Woods
cf89b565a6
initial import of thirdParty route support
2015-10-15 04:14:09 +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
555cbeffa5
allow all users to retrieve org and quota data.
2015-09-11 01:18:36 +08:00
woodsaj
0688050552
add quota middleware to enforce quotas. issue #321
...
Conflicts:
pkg/api/api.go
2015-09-11 01:03:47 +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
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
Torkel Ödegaard
d19e101e6b
feat(signup): almost done with new sign up flow, #2353
2015-08-31 11:35:07 +02:00
Torkel Ödegaard
24dfa55465
feat(signup): progress on new sign up and email verification flow, #2353
2015-08-28 09:24:30 +02:00
Torkel Ödegaard
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
Torkel Ödegaard
43ef9f909a
feat(admin): admin page for all grafana organizations (list / edit view), #2457
2015-08-11 15:20:50 +02:00
Torkel Ödegaard
775e044e69
feat(invite): progress on invite feature, #2353
2015-08-10 13:47:06 +02:00
Torkel Ödegaard
ab54971763
feat(invite): more progress on completing invite form and actually creating a real user, #2353
2015-07-20 17:46:48 +02:00
Torkel Ödegaard
d75f96fdd5
feat(invite): more progress on invited / sigup view, #2353
2015-07-20 15:52:49 +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
4ac652b127
feat(invite): began work on invited signup view, also added backdrop to login view, #2353
2015-07-19 12:34:03 +02:00
Torkel Ödegaard
6088f83408
feat(invite): inital pass on sending new user invite email, #2353
2015-07-18 17:39:12 +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
Torkel Ödegaard
0ef7271326
Started work on LDAP again, #1450
2015-07-10 11:10:48 +02:00
Torkel Ödegaard
5962bcbc6c
Do not show create org link when allow_org_create is set to false, Fixes #2135
2015-06-11 08:16:09 +02:00
Torkel Ödegaard
2266ef6809
Minor api refactoring / code clean up
2015-06-10 10:15:42 +02:00
Torkel Ödegaard
c8bc0b3bf8
Lots of work on user password reset, #1456
2015-06-08 13:39:02 +02:00
Torkel Ödegaard
aa4d60c21e
Worked on reset password views, refactored out password strength to a reusable directive
2015-06-08 10:57:01 +02:00
Torkel Ödegaard
eb793f7feb
Initial work on ldap support, #1450
2015-06-04 09:34:42 +02:00
Torkel Ödegaard
e2f6633d57
Began work on data source test / validation, #1997 & #2043
2015-06-01 12:15:49 +02:00
Torkel Ödegaard
3354365177
Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling
2015-05-20 14:59:38 +02:00
Torkel Ödegaard
51af06edf7
Merge pull request #2022 from dalmatinerdb/proxy-url-fix
...
fixing #2021
2015-05-20 09:03:23 +02:00
