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
6,180 Commits 5,454 Branches 554 Tags 1.9 GiB
17b7dfb27b
Commit Graph

71 Commits

Author SHA1 Message Date
bergquist
17b7dfb27b ux(api-keys): tight-form -> gf-form 2016-02-24 07:33:04 +01:00
bergquist
06173b9194 ux(admin): tight-form -> gf-form 2016-02-24 07:25:05 +01:00
utkarshcmu
16656af847 some more nav fixes 2016-02-22 14:03:05 -08:00
Torkel Ödegaard
52241b8e0b ux(): completed gf-size class rename 2016-02-20 14:48:10 +01:00
Torkel Ödegaard
701a2fdcf3 ux(): tweaks and polish, and also simpifying width classes, gf-size-xxx and gf-size-max-xx are now width-(1-30), and max-width-(1-30) 2016-02-20 14:21:39 +01:00
Torkel Ödegaard
cae975cb39 ux(): fixed login, signup, signup step2 and invite views 2016-02-18 14:44:36 +01:00
Torkel Ödegaard
2f2326006d Merge remote-tracking branch 'origin/master' into style-changes-bulletfactory 2016-02-18 13:37:31 +01:00
Torkel Ödegaard
3003a8cb6e ux(sass): a lot of polish on headings and margins, ONLY USE bottom margins, othewise margin collapse causes issues 2016-02-18 12:16:47 +01:00
Torkel Ödegaard
c97dbf390e ux(): fixed invite box 2016-02-16 14:39:45 +01:00
Torkel Ödegaard
008a031493 ux(sass): fixes and tweaks 2016-02-16 14:07:41 +01:00
Torkel Ödegaard
422decde3b ux(): trying out flexbox for new form styles 2016-02-15 22:24:28 +01:00
Torkel Ödegaard
f3d277cbab ux(): general ux polish and experimental work on page header 2016-02-14 13:41:42 +01:00
utkarshcmu
68225d64aa Converted org_users_ctrl to typescript 2016-02-13 17:55:49 -08:00
Torkel Ödegaard
caa765ec32 ux(forms): major simplification of norm-form markup and css 2016-02-13 19:42:05 +01:00
Torkel Ödegaard
f7e3297a0f ux(): updated navbar on all pages to new style, no subnav/dropdown yet though 2016-02-13 14:32:20 +01:00
Trent White
d8b43a3d76 button size tweaks, user form tweaks 2016-02-11 14:41:21 -05:00
Trent White
6189208fa5 org and user form tweaks 2016-02-11 14:18:55 -05:00
Torkel Ödegaard
92c2f8d556 feat(pinned sidemenu): completed side menu pinned stuff 2016-01-29 16:52:30 -05:00
Torkel Ödegaard
7ad72ba905 ux(): minor style fixes to pages 2016-01-15 15:51:30 +01:00
Torkel Ödegaard
2bfded3c5f ux(): general ux polish 2016-01-15 14:42:59 +01:00
Torkel Ödegaard
ca3405afc5 feat(plugins): moved http settings to directive instad of just ng-include partial 2016-01-09 19:03:03 +01:00
Torkel Ödegaard
cf98a16db0 feat(plugins): made data source custom edit view into a directive instead of html path config in plugin.json 2016-01-09 18:07:42 +01:00
Torkel Ödegaard
f67563e9ee feat(apps): moving things around 2016-01-08 12:45:12 +01:00
Torkel Ödegaard
aa32459bc2 feat(apps): mini update to apps config view 2015-12-22 17:00:21 +01:00
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