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

107 commits

Author SHA1 Message Date
Manuel Rego Casasnovas
35eef28c41 Upgrade ZK version to 5.0.8 
FEA: ItEr75S04BugFixing
 2011-09-22 14:49:29 +02:00
Dmytro Melanchenko
f237b713fd Change dialect to MySQL5InnoDBDialect in order to fix issues with MySQL 5.5 
With MySQLInnoDBDialect it inserts type=InnoDB to CREATE TABLE instructions.
Correct statement in this case is engine=InnoDB but it comes to SQL DDL only
when dialect is MySQL5InnoDBDialect.
 2011-09-20 11:36:57 +02:00
Nacho Barrientos
6efe5f01f5 Change repository URI to make it point to the new Nexus location 
FEA: ItEr75S25LibrePlanWebsiteAndServices
 2011-09-07 10:19:43 +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
Nacho Barrientos
95f70ddb2a Add some exclusions to avoid conflicts in runtime 
During stress tests execution (when deploying on Jetty), it
was detected that there were several JARs providing different
versions of some classes. That caused some exceptions in runtime
when deploying the app, depending on the order classes were loaded.
Those exceptions highlighted the finding of incompatible methods
when calling them via introspection.

FEA: ItEr75S19DeployFrameworkItEr74S08
 2011-08-09 14:45:00 +02:00
Óscar González Fernández
3cc756bbc3 Upgrade ZK version to 5.0.7 
A dependency from timelinez must be excluded, otherwise it would
include a previous version of zcommon not compatible with the new ZK
version.

FEA: ItEr75S04BugFixing
 2011-07-22 18:55:12 +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
Manuel Rego Casasnovas
2c3abf9195 Merge branch 'master' into ldap 2011-07-07 15:49:06 +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
0acc29aadf Replaced tabs for 4-spaces in several files. 2011-07-01 09:49:46 +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
cb27eb81bb Removed HSQLDB profile as it's not working anymore since we use Liquibase. 
FEA: ItEr74S04BugFixing
 2011-06-15 09:38:14 +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
Óscar González Fernández
75c355f9db Move default log4j.properties to application 
Thus they can be reused by other servers. Some changes in the format
of the messages.

FEA: ItEr74S08DeployFramework
 2011-05-22 21:22:04 +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
7b42c10d11 Bump timeplot version to 1.0_2_4. 
* .jar artifact uploaded to nexus repository.

FEA: ItEr74S04BugFixing
 2011-04-29 12:36:55 +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
Diego Pino Garcia
1292828575 Rename property 'default.passwords.control' to 'default.passwordsControl' 
FEA : ItEr71S04BugFixing
 2011-02-27 20:04:03 +01:00
Manuel Rego Casasnovas
1983349ed5 Added comment in main pom.xml to mark the point where bundle folders for reports are specified. 2011-02-24 20:46:50 +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
Susana Montes Pedreira
4aed9a22ad adds compiling option to disable the warning changing default password. 
FEA : ItEr69S06AutocompleteAndPasswords
 2011-02-02 09:11:33 +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
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
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
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