Ó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 |
|
Manuel Rego Casasnovas
|
50aecc4cc3
|
Released 1.1.0 version.
* Bump to 1.1.0.
* Updated NEWS file.
* Updated debian package changelog.
FEA: ItEr74S03CommunityMaterialItEr73S03
|
2011-05-19 07:50:37 +02:00 |
|
Manuel Rego Casasnovas
|
8a408f7a21
|
Updated NEWS file and release date.
FEA: ItEr74S03CommunityMaterialItEr73S03
|
2011-04-27 17:31:14 +02:00 |
|
Manuel Rego Casasnovas
|
2873b64a80
|
Released 1.0.6 version.
* Bump to 1.0.6.
* Updated NEWS file.
* Updated debian package changelog.
FEA: ItEr74S03CommunityMaterialItEr73S03
|
2011-04-27 17:31:09 +02:00 |
|
Manuel Rego Casasnovas
|
e169de20a6
|
Released 1.0.5 version.
* Bump to 1.0.5.
* Updated NEWS file.
* Updated debian package changelog.
FEA: ItEr74S03CommunityMaterialItEr73S03
|
2011-04-08 11:47:18 +02:00 |
|
Manuel Rego Casasnovas
|
6708c308de
|
Released 1.0.4 version.
* Bump to 1.0.4.
* Updated NEWS file.
* Updated debian package changelog.
FEA: ItEr72S03CommunityMaterialItEr71S03
|
2011-03-17 13:07:52 +01:00 |
|
Manuel Rego Casasnovas
|
79407bac86
|
Released 1.0.3 version.
* Bump to 1.0.3.
* Updated NEWS file.
* Updated debian package changelog.
FEA: ItEr70S03CommunityMaterialItEr69S03
|
2011-02-16 08:08:09 +01:00 |
|
Manuel Rego Casasnovas
|
468797466b
|
Released 1.0.2 version.
* Bump to 1.0.2.
* Updated NEWS file.
* Updated debian package changelog.
FEA: ItEr68S03CommunityMaterialItEr67S03
|
2011-01-21 12:21:51 +01:00 |
|
Manuel Rego Casasnovas
|
fd16bbf8f8
|
Released 1.0.1 version.
* Bump to 1.0.1.
* Updated NEWS file.
* Updated debian package changelog.
FEA: ItEr67S03CommunityMaterialItEr66S03
|
2011-01-14 10:22:39 +01:00 |
|
Manuel Rego Casasnovas
|
e9bc699071
|
Released 1.0.1 version.
* Bump to 1.0.1.
* Updated NEWS file.
* Updated debian package changelog.
FEA: ItEr67S03CommunityMaterialItEr66S03
|
2011-01-14 10:16:15 +01:00 |
|
Manuel Rego Casasnovas
|
d5bb6b6f88
|
Released 1.0.0 version.
* Bump to 1.0.0.
* Updated NEWS and TODO files.
* Updated debian package.
FEA: ItEr67S03CommunityMaterialItEr66S03
|
2011-01-07 16:46:07 +01:00 |
|
Manuel Rego Casasnovas
|
060fdc76d0
|
ItEr14S11CUConfiguracionDeOrganizacionsDeTraballoConUnidadesTraballoItEr13S13: Moved README.txt file to INSTALL file. Added some new typical files, that will be filled in the future.
|
2009-06-29 15:07:39 +02:00 |
|