RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
TASKPM/debian
History
Óscar González Fernández f56fe6ba8d Merge branch 'master' into migration-to-ZK5-merging 
Conflicts:
	NEWS
	debian/changelog
	ganttzk/pom.xml
	ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
	ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java
	ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
	ganttzk/src/main/java/org/zkoss/ganttz/util/LongOperationFeedback.java
	ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
	ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul
	navalplanner-business/pom.xml
	navalplanner-webapp/pom.xml
	navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ExtendedJasperreport.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyDTO.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReport.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceReport.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java
	navalplanner-webapp/src/main/resources/i18n/es.po
	navalplanner-webapp/src/main/resources/i18n/gl.po
	navalplanner-webapp/src/main/resources/i18n/keys.pot
	navalplanner-webapp/src/main/webapp/calendars/_edition.zul
	navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
	navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
	navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul
	navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul
	navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
	navalplanner-webapp/src/main/webapp/planner/order.zul
	navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
	navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul
	navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul
	navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
	navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul
	navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul
	navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
	pom.xml
2011-06-03 18:42:09 +02:00
..
.gitignore Packaging for Ubuntu Karmic 2010-04-15 17:11:37 +02:00
51navalplan.policy Some renames in Debian package. 2010-12-21 17:33:24 +01:00
changelog Released 1.1.0 version. 2011-05-19 07:50:37 +02:00
compat Packaging for Ubuntu Karmic 2010-04-15 17:11:37 +02:00
control Fixed issue upgrading Debian package and removed unneeded dependency. 2011-05-18 08:43:30 +02:00
control.lucid Some fix on Debian package folder. 2011-02-01 09:56:39 +01:00
control.squeeze Some fix on Debian package folder. 2011-02-01 09:56:39 +01:00
copyright Small fixes in debian/ folder and bump to version 0.9.2. 2011-01-04 16:07:27 +01:00
maven-settings.xml Packaging for Ubuntu Karmic 2010-04-15 17:11:37 +02:00
navalplan.config Packaging for Ubuntu Karmic 2010-04-15 17:11:37 +02:00
navalplan.install Fixed missing file for upgrading database with Debian package. 2011-05-18 09:24:04 +02:00
navalplan.postinst Fixed issue upgrading Debian package and removed unneeded dependency. 2011-05-18 08:43:30 +02:00
navalplan.postrm Packaging for Ubuntu Karmic 2010-04-15 17:11:37 +02:00
navalplan.prerm Fixed small issues related with PostgreSQL Java library link. 2010-12-21 18:10:26 +01:00
rules Fixed issue upgrading Debian package and removed unneeded dependency. 2011-05-18 08:43:30 +02:00