Commit Graph

9 Commits

Author SHA1 Message Date
oesi 4e1fd64cf7 Adding Frameworks 2016-11-22 10:38:29 +01:00
oesi 4513da4cbb Removed Submodule 2016-11-22 10:34:35 +01:00
Andreas Moik 647cd1e8f9 bugfix 2016-09-09 09:36:19 +02:00
Stefan Puraner bc427f7d2b fixed config bugs in rest client 2016-04-05 11:35:06 +02:00
Andreas Moik b001360d69 new meta-includes for angular, angular-tablesort, and ajax fe/be 2016-02-25 09:23:50 +01:00
Stefan Puraner b43d8f18fb Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
Conflicts:
	include/dokument_export.class.php
	vendor/FHC-vendor/easyui/demo-mobile/accordion/_content.html
	vendor/FHC-vendor/easyui/demo-mobile/panel/_content.html
	vendor/FHC-vendor/easyui/demo/accordion/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/combotree/tree_data1.json
	vendor/FHC-vendor/easyui/demo/datagrid/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/layout/datagrid_data1.json
	vendor/FHC-vendor/easyui/demo/layout/propertygrid_data1.json
	vendor/FHC-vendor/easyui/demo/propertygrid/propertygrid_data1.json
	vendor/FHC-vendor/easyui/demo/tabs/_content.html
	vendor/FHC-vendor/easyui/demo/tabs/tree_data1.json
	vendor/FHC-vendor/easyui/demo/tooltip/_content.html
	vendor/FHC-vendor/easyui/demo/tree/tree_data1.json
	vendor/FHC-vendor/easyui/themes/bootstrap/datalist.css
	vendor/easyui/demo-mobile/accordion/_content.html
	vendor/easyui/demo-mobile/panel/_content.html
	vendor/easyui/demo/accordion/datagrid_data1.json
	vendor/easyui/demo/combotree/tree_data1.json
	vendor/easyui/demo/datagrid/datagrid_data1.json
	vendor/easyui/demo/layout/datagrid_data1.json
	vendor/easyui/demo/layout/propertygrid_data1.json
	vendor/easyui/demo/propertygrid/propertygrid_data1.json
	vendor/easyui/demo/tabs/tree_data1.json
	vendor/easyui/demo/tree/tree_data1.json
2015-12-03 11:20:52 +01:00
Stefan Puraner 1cb82aa653 merge 2015-12-03 10:49:00 +01:00
Andreas Moik a8a38dade5 diverse include-Umbauten
-vendor/FHC-vendor angelegt
	-.gitignore dementsprechend angepasst
	-easyui nach FHC-vendor verschoben
	-jquery meta-include angelegt
	-jquery-tablesorter meta-include angelegt
2015-11-30 15:54:44 +01:00
Andreas Moik bb3553a7c5 Integration von Composer 2015-11-11 15:44:14 +01:00