IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,304 Commits 5,454 Branches 554 Tags 1.9 GiB
41a0995db7
Commit Graph

47 Commits

Author SHA1 Message Date
Torkel Ödegaard
41a0995db7 feat(apps): minor progress on app meta data 2015-12-22 16:32:17 +01:00
Torkel Ödegaard
b8cb5e0367 feat(apps): WIP progress app views 2015-12-22 13:42:48 +01:00
Torkel Ödegaard
d0dead0a08 feat(apps): rewrote appsCtrl to app_list_ctrl and to typescript 2015-12-22 12:13:55 +01:00
Torkel Ödegaard
ad94f99d57 refactor(apps): more WIP work on apps 2015-12-22 11:37:44 +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
woodsaj
e7a0ab76c3 change plugin to app in breadcrumb 2015-12-18 22:09:33 +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
48cf56b69a more renaming. also moved apps and datasource menus 2015-12-18 13:46:40 +08:00
woodsaj
42db1378e0 rename app config directive to grafana-app-* 2015-12-17 23:59:01 +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
Torkel Ödegaard
5227dc679d fix(invite): removed resend invite button, button logic was not implemented, fixes #3484 2015-12-10 13:31:24 +01:00
Torkel Ödegaard
40f85e5ca3 refactor(http data source options): #3473 2015-12-09 13:05:05 +01:00
Torkel Ödegaard
2dba2f4a95 Merge branch 'with_credentials' of https://github.com/mtanda/grafana into mtanda-with_credentials 2015-12-09 12:54:00 +01:00
Torkel Ödegaard
70542fb730 refactor(table views): #3466 2015-12-09 12:04:51 +01:00
Mitsuhiro Tanda
cd742979b1 add withCredentials checkbox 2015-12-09 19:43:59 +09:00
woodsaj
523cf21b4a tune pluginConfig directive 2015-12-05 00:34:48 +08:00
woodsaj
3c13901695 add ui elements for plugins. 
This includes support for cusom plugin config directives.
 2015-12-04 19:21:33 +08:00
Nick Christus
91139672cc merge with master, conflicts fixed 2015-12-03 20:34:05 -06:00
Nick Christus
c9bd45ba13 removed filters and actions for now 2015-12-03 20:20:54 -06:00
Joakim Lahtinen
9c0141e84e Fixed some broken HTML. 
Simplified some control flow.
 2015-11-24 07:29:52 +01:00
Nick Christus
09ff042986 updated-list-views: added new table layout to additional pages 2015-11-19 21:02:38 -06:00
Nick Christus
58dc282ca0 updated-list-views: updating table layout for org users 2015-11-03 08:24:10 -06:00
Nick Christus
e63ff167a7 updated-list-views: added filter controls, updated tables on API Keys and Data Sources 2015-10-29 21:09:21 -05:00
Nick Christus
aa9093bcf6 updated-list-views: added filter-table less component, updating styles for data sources table 2015-10-27 23:26:11 -05:00
Torkel Ödegaard
358ba395ac fix(invite): minor fix to invite partials markup 2015-10-27 12:09:14 +01: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
daf64421f2 fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686 2015-09-08 13:06:18 +02:00
Torkel Ödegaard
212a8ad6a6 Merge branch 'master' of github.com:grafana/grafana 2015-09-08 09:18:03 +02:00
Torkel Ödegaard
14cb2b0143 began work on support index time patterns 2015-09-06 12:58:53 +02:00
Julien Danjou
697aaf7e70 partials: fix closing markup in datasourceHttpConfig 2015-09-04 17:14:27 +02:00
Torkel Ödegaard
e53c1e39d3 feat(invite): can now add org user with sername again, #2353 2015-08-10 14:03:08 +02:00
Matt Toback
b64c550989 Added some small styling tweaks to the modals, and adjusted some copy. 2015-08-04 15:58:07 -04:00
Torkel Ödegaard
5a160f426e feat(invite): trying to get username to work as well 2015-07-29 09:30:23 +02:00
Torkel Ödegaard
024c112944 feat(invite): redesign for pending invite list, added revoke button and link, copy invite also works now, #2353 2015-07-20 14:26: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
2c7e807738 feat(invite): small style change 2015-07-17 17:22:42 +02:00
Torkel Ödegaard
2724cf5db8 feat(invite): small progress 2015-07-17 14:42:49 +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
c3a5822a40 feat(user invite): progress on user invite feature, #2353 2015-07-16 12:38:55 +02:00
Torkel Ödegaard
57c78bc603 feat(invite): began work on invite users dialog, #2353 2015-07-16 10:44:55 +02:00
Torkel Ödegaard
ff3843bc7f Roles: New user role that replaces the old role behavior, Closes #2088 2015-06-01 17:01:04 +02:00
Torkel Ödegaard
afede880e6 added url validation when adding data source, Fixes #2043 2015-06-01 14:02:24 +02:00
Torkel Ödegaard
e2f6633d57 Began work on data source test / validation, #1997 & #2043 2015-06-01 12:15:49 +02:00
Torkel Ödegaard
788e7fd36d Lots of api refactoring for org routes, #2014 2015-05-19 10:16:32 +02:00
Torkel Ödegaard
e771d8e944 Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899 2015-05-01 09:48:07 +02:00
Torkel Ödegaard
ea800dd838 Added login to organization users table, Fixes #1683 2015-04-04 10:14:51 +02:00
Torkel Ödegaard
fde11be279 Renamed src directory to public 2015-03-29 12:57:28 +02:00