branch develop updated (268e77a -> 965a77e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from 268e77a [jgitflow-maven-plugin]updating poms for 0.4-SNAPSHOT development new 84bfe5f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d399f98 [jgitflow-maven-plugin]updating poms for 0.3.2 branch with snapshot versions new 0f4e67d [jgitflow-maven-plugin]updating poms for branch'release/0.3.2' with non-snapshot versions new 67ec711 [jgitflow-maven-plugin]merging 'release/0.3.2' into 'master' new e5fe9c3 [jgitflow-maven-plugin]merging 'master' into 'develop' new 965a77e [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 965a77e7bfdad7cf2e342bd042e4e5c953337957 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e5fe9c37aa392c6cf39537030deb101bc06a7ff8 Merge: 84bfe5f 67ec711 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 84bfe5ff5d67c985a1086937489bdc7e2879a6b6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 67ec7114e29f4282f260cd8044c175edc59d4f59 Merge: 8d27e63 0f4e67d Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:23 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.3.2' into 'master' commit 0f4e67dda3210f783a98f2ea029f460f9ea8218c Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:40:13 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.3.2' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git commit 67ec7114e29f4282f260cd8044c175edc59d4f59 Merge: 8d27e63 0f4e67d Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:23 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.3.2' into 'master' chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 17 ++- .../financial/AccountBillingReportAction.java | 6 +- .../financial/BillingPerAccountReportAction.java | 74 ++++++---- .../financial/BillingPerProjectReportAction.java | 96 ++++++++----- .../financial/ProjectBillingReportAction.java | 6 +- .../actions/sales/AccountSalesReportAction.java | 6 +- .../actions/sales/ProjectSalesReportAction.java | 6 +- .../chorem/webmotion/actions/sales/SalesData.java | 18 +-- .../actions/sales/SalesPerAccountReportAction.java | 2 +- .../actions/sales/SalesPerProjectReportAction.java | 2 +- .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 6 +- .../jsp/financial/expenseAccountEntryEdit.html | 1 + .../WEB-INF/jsp/financial/expenseAccountView.jsp | 62 ++++---- .../WEB-INF/jsp/salesReports/salesFunnel.jsp | 6 +- chorem-webmotion/src/main/webapp/js/salesFunnel.js | 17 +-- chorem-webmotion/src/main/webapp/js/ui-date.js | 158 +++++++++++++++++++++ pom.xml | 41 +++--- src/site/site.xml | 13 +- 20 files changed, 376 insertions(+), 165 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git commit 84bfe5ff5d67c985a1086937489bdc7e2879a6b6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chorem-entities/pom.xml b/chorem-entities/pom.xml index d161e17..d4d70ee 100644 --- a/chorem-entities/pom.xml +++ b/chorem-entities/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3.2</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index ea299a1..69bf1cd 100644 --- a/chorem-webmotion/pom.xml +++ b/chorem-webmotion/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3.2</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index 6b51c9b..48a8b1d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.3.2</version> <packaging>pom</packaging> <name>Chorem</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git commit e5fe9c37aa392c6cf39537030deb101bc06a7ff8 Merge: 84bfe5f 67ec711 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository chorem. See http://git.chorem.org/chorem.git commit 965a77e7bfdad7cf2e342bd042e4e5c953337957 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 15:41:26 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chorem-entities/pom.xml b/chorem-entities/pom.xml index d4d70ee..d161e17 100644 --- a/chorem-entities/pom.xml +++ b/chorem-entities/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.2</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index 69bf1cd..ea299a1 100644 --- a/chorem-webmotion/pom.xml +++ b/chorem-webmotion/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.2</version> + <version>0.4-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index 48a8b1d..6b51c9b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.2</version> + <version>0.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Chorem</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm