RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7022 commits 1 branch 0 tags 56 MiB
Commit graph

65 commits

Author SHA1 Message Date
Manuel Rego Casasnovas
2826eece97 Change dependency to ZK CE 
FEA: ItEr75S08MigrationZK5
 2011-10-26 13:43:06 +02:00
Jacobo Aragunde Pérez
f8e61b5ea1 Replaced component master-detail with a GPL alternative based on the code of the ZK3 version. 
FEA: ItEr75S08MigrationZK5
 2011-10-20 10:14:55 +02:00
Manuel Rego Casasnovas
6b296df30c [i18n] Add command in pom.xml to copy English help to Russian folder too 2011-08-30 13:45:42 +02:00
Manuel Rego Casasnovas
ab522a8448 Release new version NavalPlan 1.1.3 
* Bump to 1.1.3.
* Updated NEWS file.
* Updated Debian package changelog.

FEA: ItEr75S03CommunityMaterial
 2011-08-12 13:10:52 +02:00
Manuel Rego Casasnovas
ac76796b9a Released 1.1.2 version. 
* Bump to 1.1.2.
* Updated NEWS file.
* Updated debian package changelog.

FEA: ItEr75S03CommunityMaterial
 2011-07-18 17:19:28 +02:00
Óscar González Fernández
59744bb15d Add Eclipse m2e settings to pom.xml files 
These are needed to ensure that Eclipse Indigo release works ok.

FEA: ItEr75S04BugFixing
 2011-07-11 17:49:09 +02:00
Manuel Rego Casasnovas
068b4f6eac Moved Spring LDAP dependencies to root pom.xml. 
FEA: ItEr74S09LdapAuhentication
 2011-07-04 11:54:31 +02:00
Manuel Rego Casasnovas
93294940f9 Merge branch 'master' into ldap 
Conflicts:
	navalplanner-business/src/main/java/org/navalplanner/business/common/Configuration.java
	navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java
	navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
	navalplanner-business/src/main/resources/org/navalplanner/business/users/entities/Users.hbm.xml
	navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
	navalplanner-webapp/src/main/webapp/common/configuration.zul
 2011-06-30 08:25:36 +02:00
Óscar González Fernández
d2c759bb03 Merge branch 'migration-to-ZK5' into master 
Conflicts:
	ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
	ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java

FEA: ItEr75S08MigrationZK5
 2011-06-28 20:00:26 +02:00
Manuel Rego Casasnovas
6beac59394 Released 1.1.1 version. 
* Bump to 1.1.1.
* Updated NEWS file.
* Updated debian package changelog.

FEA: ItEr74S03CommunityMaterialItEr73S03
 2011-06-07 11:11:05 +02:00
Ó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
Cristina Alvarino
7f42d8a721 Basic LDAP Authentication added on login form. 
* It's needed that users exist in database too.

FEA: ItEr74S09LdapAuhentication
 2011-05-25 13:50:14 +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
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
Óscar González Fernández
0d15bb29b7 Use deploy script to install locally the new timeplotz-modified dependency 
This jar should be moved to a remote repository.

FEA: ItEr74S05PrintingSupportItEr73S05
 2011-04-11 11:01:31 +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
Farruco Sanjurjo
93fcfcf4eb Added dependencies 
* With our GPL implementation of Jasperreport and JFreeChartEngine

FEA: ItEr02S03MigracionZK5
 2011-03-10 19:05:11 +01:00
Manuel Rego Casasnovas
06c276b534 Removed jfreechart-igalia dependency as it was not needed anymore. 
FEA: ItEr72S04BugFixing
 2011-03-10 16:17:21 +01:00
Farruco Sanjurjo
d5ceb18966 Deleted files related with JasperreportComponent 
* JasperreportComponent is now handled as a separate project
* Updated all required imports
* Added dependency to JasperreportComponent on pom.xml

FEA: ItEr02S03MigracionZK5
 2011-03-01 12:02:34 +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
Jacobo Aragunde Pérez
2876a85b92 Merge commit 'navalplan-1.0.1' into HEAD 
Conflicts:
	ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
	ganttzk/src/main/resources/i18n/keys.pot
	ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
	ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
	ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
	navalplanner-webapp/src/main/resources/i18n/keys.pot
	navalplanner-webapp/src/main/resources/logos
	navalplanner-webapp/src/main/webapp/calendars/_edition.zul
	navalplanner-webapp/src/main/webapp/common/configuration.zul
	navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
	navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul
	navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul
	navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul
	navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
	navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
	navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
 2011-01-21 12:55:30 +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
edfc986b0d Small fixes in debian/ folder and bump to version 0.9.2. 
FEA: ItEr67S03CommunityMaterialItEr66S03
 2011-01-04 16:07:27 +01:00
Manuel Rego Casasnovas
7a19c3f830 Updated Debian package and bump version to 0.9.1. 
FEA: ItEr66S03CommunityMaterialItEr65S04
 2010-12-23 00:20:49 +01:00
Susana Montes Pedreira
4bf30c6c2f it changes the version and add it to NavalPlan interface. 
FEA : ItEr65S03NavalPlanVersionItEr64S08
 2010-12-15 12:05:49 +01:00
Farruco Sanjurjo
52aee6429e Proper setup of zkforge dependencies 
* Proper setup of zkforge dependencies on the project's pom file. The zkoss' maven repository must be the first on the repo list
in order to be the first chosen

* Now we use the latest build of timplotz and timelinez

FEA: ItEr02S03MigracionZK5
 2010-08-26 20:54:09 +02:00
Farruco Sanjurjo
03d6a7a87f Conf. maven for sources.jar 
* Added configuration for generatig the *-sources.jar file for navalplanner-webapp

FEA: ItEr02S03MigracionZK5
 2010-08-26 20:53:57 +02:00
Susana Montes Pedreira
d5c7bf25ec ItEr60S04ValidacionEProbasFuncionaisItEr59S04: internationalize the reports. 2010-06-29 12:55:59 +02:00
Óscar González Fernández
8a94cdeffa Merge master into scenarios 2010-06-11 20:20:26 +02:00
Óscar González Fernández
0cbf984637 ItEr59S04ValidacionEProbasFuncionaisItEr58S04: Move user doc generation to its own profile. 
This allows to avoid its execution so the build is faster. For example
do mvn clean install -P-userguide if you don't want the user guide to
be generated.
 2010-06-03 18:55:12 +02:00
Óscar González Fernández
35c7566d9b ItEr59S04ValidacionEProbasFuncionaisItEr58S04: Move Jasper reports creation to its own profile. 
This allows to exclude the generation of reports from the build in
order to make it faster. For example, do: mvn clean install -P-reports
if you don't want the reports to be generated.
 2010-06-03 18:53:25 +02:00
Manuel Rego Casasnovas
e6d6cc02b8 Merge branch 'master' into scenarios 2010-04-09 11:16:31 +02:00
Óscar González Fernández
db2d1aa792 ItEr53S11RFInfraestucturaEscenariosItEr52S11: Add EasyMock classextension dependency to webapp 2010-04-08 00:35:47 +02:00
Javier Moran Rua
e9767d320c Replacing SUN jta.jar dependency by Apache Geronimo open source implementation of JTA. 2010-03-25 23:02:11 +01:00
Manuel Rego Casasnovas
be368f6b83 ItEr46S07ImplantacionAplicacionItEr45S07: Changed "Naval Planner" for "NavalPlan" in pom files and spring file. 2010-02-05 18:04:13 +01:00
Xavier Castaño
567e739a66 ItEr41S07DocumentacionFormacionItEr40S07: User doc compilation phase change. 
Now the help is compiled in maven phase process-resources instead of previous compile phase.
 2010-01-10 01:45:05 +01:00
Xavier Castaño
5829fab92d ItEr41S07DocumentacionFormacionItEr40S07 : Links to help html pages points are now relative. 
Now the help files are included inside navalplanner-webapp and the help links points at them.
 2010-01-10 01:45:05 +01:00
Xavier Castaño
af11cfaa90 ItEr41S07DocumentacionFormacionItEr40S07: Doc compilation is included in project build and html placed inside navalplanner-webapp 2010-01-10 01:44:16 +01:00
Javier Moran Rua
df91f31f60 ItEr39S13RFIntegracionSistemaXeracionInformesItEr38S19: Set up infrastructure for supporting reports (JasperReports) and add report for worked hours per worker. 2009-12-17 18:21:53 +01:00
Diego Pino Garcia
f51af145c9 ItEr38S16CUImpresionProxectosPlanificacionItEr37S21: Setup basic infraestructure for supporting printing 2009-12-09 14:08:03 +01:00
Fernando Bellas Permuy
0cad89b645 ItEr35S11ArquitecturaServidorItEr34S11: First version of the authentication system. 
It uses a basic integration with Spring Security to provide authentication to thhe Web application (Web services are not protected yet). Currently, two in-memory users have been created: "user" (with password "user") and "admin" (with password "admin"). The first one can access any page except the folder "Administration" and its contents. The last one can access any page.
 2009-11-20 15:54:25 +01:00
Javier Moran Rua
2318e315d6 ItEr33S13ArquitecturaServidorItEr32S16: Changed maven-gettext-plugin to execute dist target in compile phase to 
include Message*.class files into war.
 2009-11-10 12:52:04 +01:00
Diego Pino Garcia
44479c2045 ItEr33S13ArquitecturaServidorItEr32S16: Added new rule to navalplanner-webapp pom.xml: run gettext:dist on executing target package 2009-11-10 12:22:21 +01:00
Manuel Rego Casasnovas
3c01e0fa29 ItEr29S13CUVistaRecursosTempoEmpresa: Align chart and planner (aprox). 2009-10-13 21:29:58 +02:00
Manuel Rego Casasnovas
5a53984225 ItEr29S13CUVistaRecursosTempoEmpresa: Adding dependency to ZK Timeplot and ZK Timeline. 2009-10-13 19:47:07 +02:00
Fernando Bellas Permuy
c4bd06fbd0 ItEr29S09CUAltaSubcontrataItEr28S10: First version of the REST-based service layer. 
First version of the REST-based service layer, providing support for exporting and importing a list of CriterionType.
 2009-10-08 21:53:21 +02:00