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

79 commits

Author SHA1 Message Date
Farruco Sanjurjo
93fcfcf4eb Added dependencies 
* With our GPL implementation of Jasperreport and JFreeChartEngine

FEA: ItEr02S03MigracionZK5
 2011-03-10 19:05:11 +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
Farruco Sanjurjo
2c8ec71262 Changed timeplotz version 
* Now we are using one customized by us for solving several fixes
* The new version is on Igalia's maven repo

FEA: ItEr02S03MigracionZK5
 2011-01-20 13:42:19 +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
Farruco Sanjurjo
69bec5175b Upgraded to ZK 5.0.5 
* We need to exclude jruby as a transitive dependency of org.zkoss.zk. Loading jruby caused problems with joda-time (something like this http://jira.codehaus.org/browse/JRUBY-3559)

FEA: ItEr02S03MigracionZK5
 2010-12-27 12:49:25 +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
Manuel Rego Casasnovas
fe9ed34c6c Adding first changelog with database creation to avoid problems with empty databases. 
* Disabled Hibernate schema generation (hbm2dll). Now it just validates the schema.

FEA: ItEr65S05DatabaseUpgradeItEr64S07
 2010-12-10 10:28:54 +01:00
Manuel Rego Casasnovas
8e11d6d893 Adding LiquiBase plugin depedency and basic configuration. 
FEA: ItEr64S07DatabaseUpgrade
 2010-11-30 20:28:09 +01:00
Manuel Rego Casasnovas
564439d762 Deleted GanttZK Demo module as is not working and not being maintained anymore. 2010-11-29 13:20:00 +01:00
Farruco Sanjurjo
4464734858 Fixed onflicts: 
ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java

FEA: ItEr02S03MigracionZK5
 2010-11-15 14:05:22 +01:00
Óscar González Fernández
bb53ec7060 Merge branch 'master' into migration-to-ZK5-dev 
Conflicts:
	ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
	ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
	ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
	pom.xml
 2010-10-26 17:17:49 +02:00
Diego Pino Garcia
ed02e52b8d Update cobertura plugin to 2.4 and increase heap memory size of cobertura 
FEA: ItEr61S05BugFixing
 2010-10-01 11:50:27 +02:00
Diego Pino Garcia
d3ce1413ef Added report 'hours worked per worker in a month' 
FEA: ItEr61S06ExceptionTypeEntity
 2010-09-30 00:05:29 +02:00
Farruco Sanjurjo
edf67c3fea Updated timelinez version to 2.3.1_50 2010-09-09 13:46:34 +02:00
Óscar González Fernández
51738e447a Fix broken build, zkex dependency not found. 
The zkex dependency was moved to professional edition ZK repository in
version 3.6.4. This move must have been done after our migration to
3.6.4 from 3.6.3. This error happens when doing a maven
install on a machine that hasn't dowloaded the zkex dependency
previously.

The solution is to add professional edition ZK repository. Taking a
look at the source code of zkex it turns out it's GPL 3 licensed (at
least for 3.6.4) so this is safe.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-04 18:23:31 +02: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
090a7e7bb9 Upgraded timelinez version 
* ZK 5 needs the  version 2.3.0_51 of timelinez package

FEA: ItEr02S03MigracionZK5
 2010-08-26 20:53:50 +02:00
Farruco Sanjurjo
b479e7268d Upgraded timeplot package 
FEA: ItEr02S03MigracionZK5
 2010-08-26 20:53:49 +02:00
Farruco Sanjurjo
aac8dad6f9 Upgrade ZK version to 5.0.3 
FEA: ItEr02S03MigracionZK5
 2010-08-26 20:52:03 +02:00
Farruco Sanjurjo
d69ff90f82 Upgrade ZK version from 3.6.2 to 3.6.4 2010-07-23 13:46:52 +02:00
Jacobo Aragunde Pérez
b40d6678e3 ItEr60S12MellorasGlobalesRendementoItEr59S22: Configure Hibernate second level cache. 
It is left disabled by default, it has to be enabled in the file navalplanner-business-hibernate.cfg.xml.
 2010-07-09 16:52:23 +02:00
Susana Montes Pedreira
d5c7bf25ec ItEr60S04ValidacionEProbasFuncionaisItEr59S04: internationalize the reports. 2010-06-29 12:55:59 +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
Óscar González Fernández
efcf58672e ItEr51S04ValidacionEProbasFuncionaisItEr50S04: Adding AspectJ support. 
Using Spring AOP runtime support. This means aspects are only applied on
spring beans.
 2010-03-16 16:01:03 +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
Óscar González Fernández
77e6fd1b0c ItEr44S16CUAsignacionRecursosEspecificosAPlanificacionItEr37S10: Adding commons-math dependency 2010-01-25 02:22:32 +01:00
Javier Moran Rua
105ef3e017 ItEr43S10SoporteImpresionMultiplesPaxinasItEr42S15: Increment de version of timeplotz to 1.0.2_2 2010-01-18 13:42:46 +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
Javier Moran Rua
c18289ac5d ItEr39S15ArquitecturaServidorItEr38S17: Turn off second-level cache. 2009-12-15 19:09:19 +01:00
Diego Pino Garcia
f51af145c9 ItEr38S16CUImpresionProxectosPlanificacionItEr37S21: Setup basic infraestructure for supporting printing 2009-12-09 14:08:03 +01:00
Javier Moran Rua
27c6282ce1 ItEr37S16RFMaquetacionDesenhoAplicacionItEr36S18: Added dependency to timeplotz custom version 1.0_2_1. 
Modified js of timeplotz for solid area charts. Uploaded .jar to nexus.naval.igalia.com.
 2009-12-08 13:18:34 +01:00
Javier Moran Rua
176d0c155d ItEr37S07ArquitecturaServidorItEr36S10: Adding second-level cache to hibernate configuration. 
ehcache the provider chosen.
 2009-12-06 02:28:58 +01:00
Javier Moran Rua
9b5ae7bee4 ItEr36S07ValidacionEProbasFuncionaisItEr35S08: [Bug #95] Fixed bug by upgrading to hibernate 3.2.7. 2009-11-26 12:33:22 +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
Diego Pino Garcia
a7cfc28034 ItEr30S06CUAltaMaquina: Assign valid Criterion to Resource 2009-10-19 11:14:42 +02: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
Javier Moran Rua
e6e1b040de ItEr29S03ContornaItEr28S03: Activates logging in embedded jetty. 
The configuration uses log4 and INFO loggin level.
 2009-10-11 14:08:10 +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
Javier Moran Rua
2049629354 ItEr28S13MontaxeProbasUnidadeItEr19S05:Added resource filtering to adapt table names to different DBMS 2009-10-02 21:47:48 +02:00
Javier Moran Rua
b80ae13ab8 ItEr28S13MontaxeProbasUnidadeItEr19S05: Integrated DBUnit with Spring TestContext. 2009-10-02 21:47:48 +02:00
Lorenzo Tilve
abf98b4d9d ItEr26S10CUCreacionProxectoPlanificacionItEr25S11: Configured jfreechart maven dependencies again nexus.naval.igalia.com 
* It was included a pie chart under ResourceLoad graph
 2009-09-18 16:09:07 +02:00
Óscar González Fernández
15102a2f15 ItEr26S05XestionDaComunidadeItEr25S05: Upgrading zk version to 3.6.2 2009-09-17 19:33:54 +02:00
Óscar González Fernández
935d448108 ItEr25S07CUAsignacionGrupoRecursosAPlanificacionItEr24S08: Adding class extension easymock for mocking objects of classes that are not interfaces 2009-09-08 18:43:14 +02:00
Óscar González Fernández
74431e9571 ItEr23S03ContornaItEr22S03: Adding html report type since it's useful to have when doing tests 2009-08-24 14:36:07 +02:00
Diego Pino Garcia
7b9070b61b ItEr22S04ArquitecturaServidorItEr21S04: [FixBug] Added version number for maven plugins cobertura and tomcat to pom 2009-08-19 11:12:31 +02:00
Óscar González Fernández
008dea8839 ItEr21S06XestionDaComunidadeItEr20S06: Fixing errors introduced at fed9b20915. 
Gannzk project was renamed but the pom.xml files were not changed accordingly.
 2009-08-17 09:32:25 +02:00