[chorem] branch develop updated (add8535 -> a4b614d)
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 add8535 include some hotfix from tag 0.3 new a4b614d fixes #1129: Migrates to git The 1 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 a4b614de0fa008e8c74e51d80991b6cb0276b641 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 27 19:44:24 2014 +0100 fixes #1129: Migrates to git Summary of changes: .gitignore | 14 + chorem-entities/pom.xml | 4 +- .../com/inamik/utils/AbstractTableFormatter.java | 2 - .../com/inamik/utils/SimpleTableFormatter.java | 2 - .../main/java/com/inamik/utils/TableFormatter.java | 2 - .../src/main/java/org/chorem/ChoremAction.java | 4 +- .../src/main/java/org/chorem/ChoremClient.java | 4 +- .../src/main/java/org/chorem/ChoremConfig.java | 4 +- .../main/java/org/chorem/ChoremConfigAction.java | 4 +- .../main/java/org/chorem/ChoremConfigOption.java | 4 +- .../src/main/java/org/chorem/ChoremMain.java | 4 +- .../main/java/org/chorem/ChoremQueryHelper.java | 4 +- .../src/main/java/org/chorem/ChoremQueryMaker.java | 4 +- .../src/main/java/org/chorem/ChoremUtil.java | 2 - .../main/java/org/chorem/ImportChoremTopia.java | 4 +- .../src/main/java/org/chorem/Saint.java | 4 +- .../org/chorem/entities/EmployeeMigration.java | 4 +- .../org/chorem/entities/ExpenseClaimStatus.java | 4 +- .../java/org/chorem/entities/InvoiceMigration.java | 4 +- .../java/org/chorem/entities/InvoiceStatus.java | 4 +- .../java/org/chorem/entities/InvoiceableUtil.java | 4 +- .../org/chorem/entities/Quotation18Migration.java | 2 - .../org/chorem/entities/QuotationMigration.java | 4 +- .../java/org/chorem/entities/QuotationStatus.java | 4 +- .../main/java/org/chorem/entities/TaskStatus.java | 4 +- .../org/chorem/entities/VacationMigration.java | 4 +- .../java/org/chorem/entities/VacationStatus.java | 4 +- .../java/org/chorem/project/AdcCalculation.java | 2 - .../main/java/org/chorem/project/Calculation.java | 2 - .../org/chorem/project/QuotationCalculation.java | 2 - .../java/org/chorem/project/TaskCalculation.java | 2 - .../chorem/project/TotalQuotationCalculation.java | 2 - .../src/main/resources/chorem.properties | 4 +- .../src/main/resources/log4j.properties | 5 +- .../src/main/xmi/chorem-model.properties | 4 +- chorem-entities/src/main/xmi/vacations.rst | 4 +- chorem-entities/src/site/rst/dataModel.rst | 4 +- chorem-entities/src/site/rst/gepeto.rst | 2 - .../src/site/site.xml | 35 +- .../src/test/java/org/chorem/ChoremUtilTest.java | 2 - .../org/chorem/entities/InvoiceableUtilTest.java | 4 +- chorem-webmotion/pom.xml | 9 +- chorem-webmotion/src/jetty/jetty-context.xml | 6 +- .../java/org/chorem/webmotion/ChoremDateUtil.java | 4 +- .../org/chorem/webmotion/ChoremWebMotionUtil.java | 4 +- .../java/org/chorem/webmotion/PaginatedResult.java | 2 - .../webmotion/actions/AdcDashboardAction.java | 2 - .../org/chorem/webmotion/actions/AdminAction.java | 4 +- .../org/chorem/webmotion/actions/BIAction.java | 2 - .../chorem/webmotion/actions/DashboardAction.java | 4 +- .../webmotion/actions/DashboardHRAction.java | 4 +- .../webmotion/actions/EmployeeEditAction.java | 2 - .../chorem/webmotion/actions/GenericAction.java | 4 +- .../org/chorem/webmotion/actions/HrAction.java | 6 +- .../chorem/webmotion/actions/MapWithDefault.java | 4 +- .../webmotion/actions/WikittyRestAction.java | 2 - .../webmotion/actions/crm/AccountAction.java | 2 - .../webmotion/actions/crm/ContactRowForExport.java | 2 - .../actions/crm/ContactRowForExportModel.java | 2 - .../chorem/webmotion/actions/crm/ExportAction.java | 2 - .../webmotion/actions/crm/QuotationAction.java | 2 - .../financial/AccountBillingReportAction.java | 2 - .../financial/BillingPerAccountReportAction.java | 2 - .../financial/BillingPerProjectReportAction.java | 2 - .../actions/financial/BillingReportAction.java | 2 - .../actions/financial/BillingReportHelper.java | 2 - .../actions/financial/ExpenseAccountAction.java | 2 - .../financial/ProjectBillingReportAction.java | 2 - .../actions/project/DashboardProjectAction.java | 2 - .../webmotion/actions/project/GanttAction.java | 2 - .../webmotion/actions/project/ProjectsAction.java | 2 - .../webmotion/actions/project/QuotationData.java | 2 - .../actions/project/QuotationStatusAction.java | 2 - .../chorem/webmotion/actions/project/TaskData.java | 2 - .../sales/AcceptedQuotationsReportAction.java | 2 - .../actions/sales/AccountSalesReportAction.java | 2 - .../webmotion/actions/sales/FunnelAction.java | 2 - .../actions/sales/ProjectSalesReportAction.java | 2 - .../webmotion/actions/sales/QuotationYearData.java | 2 - .../webmotion/actions/sales/SalesAction.java | 4 +- .../chorem/webmotion/actions/sales/SalesData.java | 2 - .../actions/sales/SalesPerAccountReportAction.java | 2 - .../actions/sales/SalesPerProjectReportAction.java | 2 - .../webmotion/actions/sales/SalesReportAction.java | 2 - .../webmotion/actions/sales/SalesReportHelper.java | 2 - .../actions/sales/SentQuotationsReportAction.java | 2 - .../bean/financial/ExpenseAccountBean.java | 2 - .../bean/financial/ExpenseAccountEntryBean.java | 2 - .../webmotion/filters/AuthenticationFilter.java | 4 +- .../webmotion/filters/ChoremClientFilter.java | 4 +- .../chorem/webmotion/filters/DecoratorFilter.java | 4 +- .../webmotion/injector/InjectorListener.java | 4 +- .../org/chorem/webmotion/render/RenderWikitty.java | 2 - .../chorem/webmotion/render/RenderWikittyJson.java | 2 - .../org/wikitty/web/jsptag/WikittyDisplay.java | 4 +- .../java/org/wikitty/web/jsptag/WikittyInput.java | 4 +- .../src/main/resources/log4j.properties | 4 +- .../main/webapp/WEB-INF/jsp/admin/importExport.jsp | 4 +- .../webapp/WEB-INF/jsp/bi/reportDefinition.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/contact.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/crm/account.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/crm/company.jsp | 2 - .../main/webapp/WEB-INF/jsp/crm/editQuotation.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/crm/project.jsp | 2 - .../src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardBudget.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardEmployee.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardInvoice.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardMultiProject.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardProfitability.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardProject.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardQuotation.jsp | 4 +- .../WEB-INF/jsp/dashboardRequestVacation.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardSingleProject.jsp | 6 +- .../main/webapp/WEB-INF/jsp/dashboardSummary.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardVacation.jsp | 6 +- .../webapp/WEB-INF/jsp/dashboardVacationAsked.jsp | 4 +- .../WEB-INF/jsp/dashboardVacationByEmployee.jsp | 4 +- .../jsp/dashboardWorkingProjectDaysByEmployee.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/edit.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/editMulti.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/editRelated.jsp | 6 +- .../webapp/WEB-INF/jsp/editVacationRequest.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/employeeEdit.jsp | 4 +- .../WEB-INF/jsp/financial/expenseAccountView.jsp | 2 - .../WEB-INF/jsp/financial/expenseAccounts.jsp | 2 - .../jsp/financial/reports/accountBillingReport.jsp | 8 +- .../financial/reports/billingPerAccountReport.jsp | 8 +- .../financial/reports/billingPerProjectReport.jsp | 8 +- .../jsp/financial/reports/billingReport.jsp | 8 +- .../webapp/WEB-INF/jsp/financial/reports/menu.jsp | 4 +- .../jsp/financial/reports/projectBillingReport.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/hr.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/index.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/login.jsp | 6 +- .../webapp/WEB-INF/jsp/projects/editProject.html | 4 +- .../main/webapp/WEB-INF/jsp/projects/projects.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/report.jsp | 4 +- .../WEB-INF/jsp/salesReports/acceptedQuotation.jsp | 8 +- .../jsp/salesReports/accountSalesReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/dialog-cancel.html | 4 +- .../jsp/salesReports/dialog-draftToSent.html | 4 +- .../jsp/salesReports/dialog-leadToDraft.html | 4 +- .../jsp/salesReports/dialog-sentToAccepted.html | 4 +- .../jsp/salesReports/dialog-sentToRejected.html | 4 +- .../main/webapp/WEB-INF/jsp/salesReports/menu.jsp | 4 +- .../jsp/salesReports/projectSalesReport.jsp | 8 +- .../main/webapp/WEB-INF/jsp/salesReports/sales.jsp | 8 +- .../WEB-INF/jsp/salesReports/salesFunnel.jsp | 8 +- .../jsp/salesReports/salesPerAccountReport.jsp | 8 +- .../jsp/salesReports/salesPerProjectReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/salesReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/sentQuotation.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/search.jsp | 4 +- .../main/webapp/WEB-INF/jsp/simpleWikiFields.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/vacationDiv.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/view.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionCompany.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionEmployee.jsp | 4 +- .../WEB-INF/jsp/viewActionFinancialTransaction.jsp | 8 +- .../main/webapp/WEB-INF/jsp/viewActionPerson.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionProject.jsp | 4 +- .../webapp/WEB-INF/jsp/viewActionQuotation.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/viewActionTask.jsp | 4 +- .../src/main/webapp/WEB-INF/nuiton-js.properties | 2 - chorem-webmotion/src/main/webapp/WEB-INF/web.xml | 4 +- chorem-webmotion/src/main/webapp/WEB-INF/wro.xml | 2 - chorem-webmotion/src/main/webapp/css/chorem-bi.css | 4 +- .../src/main/webapp/css/chorem-crm.css | 4 +- .../src/main/webapp/css/chorem-sales.css | 4 +- .../src/main/webapp/css/employeeEdit.css | 2 - .../main/webapp/css/jquery-ui-timepicker-addon.css | 4 +- .../src/main/webapp/css/jquery.fn.gantt.css | 2 - .../src/main/webapp/css/ng-grid.min.css | 4 +- .../src/main/webapp/css/select2/select2.css | 2 - .../src/main/webapp/css/vacationRequest.css | 4 +- chorem-webmotion/src/main/webapp/js/chorem.js | 6 +- .../src/main/webapp/js/dashboardAdc.js | 4 +- .../src/main/webapp/js/employeeEdit.js | 4 +- .../src/main/webapp/js/financial/expenseAccount.js | 2 +- .../webapp/js/financial/expenseAccountListCtrl.js | 2 +- .../src/main/webapp/js/jquery.fn.gantt.js | 2 - .../src/main/webapp/js/js-hypercube.min.js | 4 +- chorem-webmotion/src/main/webapp/js/less-1.3.3.js | 2 - .../src/main/webapp/js/ng-grid-2.0.7.debug.js | 4 +- .../src/main/webapp/js/ng-grid-2.0.7.min.js | 4 +- chorem-webmotion/src/main/webapp/js/ng-select2.js | 2 - chorem-webmotion/src/main/webapp/js/ng-wikitty.js | 2 - .../src/main/webapp/js/paginationTable.js | 4 +- .../src/main/webapp/js/projectPagination.js | 4 +- chorem-webmotion/src/main/webapp/js/salesFunnel.js | 4 +- chorem-webmotion/src/main/webapp/js/select2.min.js | 4 +- .../src/{jetty/jetty-context.xml => site/site.xml} | 35 +- .../src/test/resources/log4j.properties | 4 +- pom.xml | 452 +++++++++++---------- src/site/rst/calculations.rst | 2 - src/site/rst/chorem-cdc.rst | 4 +- src/site/rst/doc-devel.rst | 4 +- src/site/rst/index.rst | 6 +- src/site/rst/requisite.rst | 4 +- src/site/site.xml | 69 ++++ src/site/site_fr.xml | 113 ------ 205 files changed, 534 insertions(+), 950 deletions(-) create mode 100644 .gitignore copy chorem-webmotion/src/jetty/jetty-context.xml => chorem-entities/src/site/site.xml (54%) copy chorem-webmotion/src/{jetty/jetty-context.xml => site/site.xml} (54%) create mode 100644 src/site/site.xml delete mode 100644 src/site/site_fr.xml -- 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 a4b614de0fa008e8c74e51d80991b6cb0276b641 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 27 19:44:24 2014 +0100 fixes #1129: Migrates to git --- .gitignore | 14 + chorem-entities/pom.xml | 4 +- .../com/inamik/utils/AbstractTableFormatter.java | 2 - .../com/inamik/utils/SimpleTableFormatter.java | 2 - .../main/java/com/inamik/utils/TableFormatter.java | 2 - .../src/main/java/org/chorem/ChoremAction.java | 4 +- .../src/main/java/org/chorem/ChoremClient.java | 4 +- .../src/main/java/org/chorem/ChoremConfig.java | 4 +- .../main/java/org/chorem/ChoremConfigAction.java | 4 +- .../main/java/org/chorem/ChoremConfigOption.java | 4 +- .../src/main/java/org/chorem/ChoremMain.java | 4 +- .../main/java/org/chorem/ChoremQueryHelper.java | 4 +- .../src/main/java/org/chorem/ChoremQueryMaker.java | 4 +- .../src/main/java/org/chorem/ChoremUtil.java | 2 - .../main/java/org/chorem/ImportChoremTopia.java | 4 +- .../src/main/java/org/chorem/Saint.java | 4 +- .../org/chorem/entities/EmployeeMigration.java | 4 +- .../org/chorem/entities/ExpenseClaimStatus.java | 4 +- .../java/org/chorem/entities/InvoiceMigration.java | 4 +- .../java/org/chorem/entities/InvoiceStatus.java | 4 +- .../java/org/chorem/entities/InvoiceableUtil.java | 4 +- .../org/chorem/entities/Quotation18Migration.java | 2 - .../org/chorem/entities/QuotationMigration.java | 4 +- .../java/org/chorem/entities/QuotationStatus.java | 4 +- .../main/java/org/chorem/entities/TaskStatus.java | 4 +- .../org/chorem/entities/VacationMigration.java | 4 +- .../java/org/chorem/entities/VacationStatus.java | 4 +- .../java/org/chorem/project/AdcCalculation.java | 2 - .../main/java/org/chorem/project/Calculation.java | 2 - .../org/chorem/project/QuotationCalculation.java | 2 - .../java/org/chorem/project/TaskCalculation.java | 2 - .../chorem/project/TotalQuotationCalculation.java | 2 - .../src/main/resources/chorem.properties | 4 +- .../src/main/resources/log4j.properties | 5 +- .../src/main/xmi/chorem-model.properties | 4 +- chorem-entities/src/main/xmi/vacations.rst | 4 +- chorem-entities/src/site/rst/dataModel.rst | 4 +- chorem-entities/src/site/rst/gepeto.rst | 2 - .../src/site/site.xml | 35 +- .../src/test/java/org/chorem/ChoremUtilTest.java | 2 - .../org/chorem/entities/InvoiceableUtilTest.java | 4 +- chorem-webmotion/pom.xml | 9 +- chorem-webmotion/src/jetty/jetty-context.xml | 6 +- .../java/org/chorem/webmotion/ChoremDateUtil.java | 4 +- .../org/chorem/webmotion/ChoremWebMotionUtil.java | 4 +- .../java/org/chorem/webmotion/PaginatedResult.java | 2 - .../webmotion/actions/AdcDashboardAction.java | 2 - .../org/chorem/webmotion/actions/AdminAction.java | 4 +- .../org/chorem/webmotion/actions/BIAction.java | 2 - .../chorem/webmotion/actions/DashboardAction.java | 4 +- .../webmotion/actions/DashboardHRAction.java | 4 +- .../webmotion/actions/EmployeeEditAction.java | 2 - .../chorem/webmotion/actions/GenericAction.java | 4 +- .../org/chorem/webmotion/actions/HrAction.java | 6 +- .../chorem/webmotion/actions/MapWithDefault.java | 4 +- .../webmotion/actions/WikittyRestAction.java | 2 - .../webmotion/actions/crm/AccountAction.java | 2 - .../webmotion/actions/crm/ContactRowForExport.java | 2 - .../actions/crm/ContactRowForExportModel.java | 2 - .../chorem/webmotion/actions/crm/ExportAction.java | 2 - .../webmotion/actions/crm/QuotationAction.java | 2 - .../financial/AccountBillingReportAction.java | 2 - .../financial/BillingPerAccountReportAction.java | 2 - .../financial/BillingPerProjectReportAction.java | 2 - .../actions/financial/BillingReportAction.java | 2 - .../actions/financial/BillingReportHelper.java | 2 - .../actions/financial/ExpenseAccountAction.java | 2 - .../financial/ProjectBillingReportAction.java | 2 - .../actions/project/DashboardProjectAction.java | 2 - .../webmotion/actions/project/GanttAction.java | 2 - .../webmotion/actions/project/ProjectsAction.java | 2 - .../webmotion/actions/project/QuotationData.java | 2 - .../actions/project/QuotationStatusAction.java | 2 - .../chorem/webmotion/actions/project/TaskData.java | 2 - .../sales/AcceptedQuotationsReportAction.java | 2 - .../actions/sales/AccountSalesReportAction.java | 2 - .../webmotion/actions/sales/FunnelAction.java | 2 - .../actions/sales/ProjectSalesReportAction.java | 2 - .../webmotion/actions/sales/QuotationYearData.java | 2 - .../webmotion/actions/sales/SalesAction.java | 4 +- .../chorem/webmotion/actions/sales/SalesData.java | 2 - .../actions/sales/SalesPerAccountReportAction.java | 2 - .../actions/sales/SalesPerProjectReportAction.java | 2 - .../webmotion/actions/sales/SalesReportAction.java | 2 - .../webmotion/actions/sales/SalesReportHelper.java | 2 - .../actions/sales/SentQuotationsReportAction.java | 2 - .../bean/financial/ExpenseAccountBean.java | 2 - .../bean/financial/ExpenseAccountEntryBean.java | 2 - .../webmotion/filters/AuthenticationFilter.java | 4 +- .../webmotion/filters/ChoremClientFilter.java | 4 +- .../chorem/webmotion/filters/DecoratorFilter.java | 4 +- .../webmotion/injector/InjectorListener.java | 4 +- .../org/chorem/webmotion/render/RenderWikitty.java | 2 - .../chorem/webmotion/render/RenderWikittyJson.java | 2 - .../org/wikitty/web/jsptag/WikittyDisplay.java | 4 +- .../java/org/wikitty/web/jsptag/WikittyInput.java | 4 +- .../src/main/resources/log4j.properties | 4 +- .../main/webapp/WEB-INF/jsp/admin/importExport.jsp | 4 +- .../webapp/WEB-INF/jsp/bi/reportDefinition.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/contact.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/crm/account.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/crm/company.jsp | 2 - .../main/webapp/WEB-INF/jsp/crm/editQuotation.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/crm/project.jsp | 2 - .../src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardBudget.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardEmployee.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardInvoice.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardMultiProject.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardProfitability.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardProject.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardQuotation.jsp | 4 +- .../WEB-INF/jsp/dashboardRequestVacation.jsp | 4 +- .../webapp/WEB-INF/jsp/dashboardSingleProject.jsp | 6 +- .../main/webapp/WEB-INF/jsp/dashboardSummary.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp | 4 +- .../main/webapp/WEB-INF/jsp/dashboardVacation.jsp | 6 +- .../webapp/WEB-INF/jsp/dashboardVacationAsked.jsp | 4 +- .../WEB-INF/jsp/dashboardVacationByEmployee.jsp | 4 +- .../jsp/dashboardWorkingProjectDaysByEmployee.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/decorator.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/edit.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/editMulti.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/editRelated.jsp | 6 +- .../webapp/WEB-INF/jsp/editVacationRequest.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/employeeEdit.jsp | 4 +- .../WEB-INF/jsp/financial/expenseAccountView.jsp | 2 - .../WEB-INF/jsp/financial/expenseAccounts.jsp | 2 - .../jsp/financial/reports/accountBillingReport.jsp | 8 +- .../financial/reports/billingPerAccountReport.jsp | 8 +- .../financial/reports/billingPerProjectReport.jsp | 8 +- .../jsp/financial/reports/billingReport.jsp | 8 +- .../webapp/WEB-INF/jsp/financial/reports/menu.jsp | 4 +- .../jsp/financial/reports/projectBillingReport.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/hr.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/index.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/login.jsp | 6 +- .../webapp/WEB-INF/jsp/projects/editProject.html | 4 +- .../main/webapp/WEB-INF/jsp/projects/projects.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/report.jsp | 4 +- .../WEB-INF/jsp/salesReports/acceptedQuotation.jsp | 8 +- .../jsp/salesReports/accountSalesReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/dialog-cancel.html | 4 +- .../jsp/salesReports/dialog-draftToSent.html | 4 +- .../jsp/salesReports/dialog-leadToDraft.html | 4 +- .../jsp/salesReports/dialog-sentToAccepted.html | 4 +- .../jsp/salesReports/dialog-sentToRejected.html | 4 +- .../main/webapp/WEB-INF/jsp/salesReports/menu.jsp | 4 +- .../jsp/salesReports/projectSalesReport.jsp | 8 +- .../main/webapp/WEB-INF/jsp/salesReports/sales.jsp | 8 +- .../WEB-INF/jsp/salesReports/salesFunnel.jsp | 8 +- .../jsp/salesReports/salesPerAccountReport.jsp | 8 +- .../jsp/salesReports/salesPerProjectReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/salesReport.jsp | 8 +- .../WEB-INF/jsp/salesReports/sentQuotation.jsp | 8 +- .../src/main/webapp/WEB-INF/jsp/search.jsp | 4 +- .../main/webapp/WEB-INF/jsp/simpleWikiFields.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/vacationDiv.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/view.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionCompany.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionEmployee.jsp | 4 +- .../WEB-INF/jsp/viewActionFinancialTransaction.jsp | 8 +- .../main/webapp/WEB-INF/jsp/viewActionPerson.jsp | 4 +- .../main/webapp/WEB-INF/jsp/viewActionProject.jsp | 4 +- .../webapp/WEB-INF/jsp/viewActionQuotation.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/viewActionTask.jsp | 4 +- .../src/main/webapp/WEB-INF/nuiton-js.properties | 2 - chorem-webmotion/src/main/webapp/WEB-INF/web.xml | 4 +- chorem-webmotion/src/main/webapp/WEB-INF/wro.xml | 2 - chorem-webmotion/src/main/webapp/css/chorem-bi.css | 4 +- .../src/main/webapp/css/chorem-crm.css | 4 +- .../src/main/webapp/css/chorem-sales.css | 4 +- .../src/main/webapp/css/employeeEdit.css | 2 - .../main/webapp/css/jquery-ui-timepicker-addon.css | 4 +- .../src/main/webapp/css/jquery.fn.gantt.css | 2 - .../src/main/webapp/css/ng-grid.min.css | 4 +- .../src/main/webapp/css/select2/select2.css | 2 - .../src/main/webapp/css/vacationRequest.css | 4 +- chorem-webmotion/src/main/webapp/js/chorem.js | 6 +- .../src/main/webapp/js/dashboardAdc.js | 4 +- .../src/main/webapp/js/employeeEdit.js | 4 +- .../src/main/webapp/js/financial/expenseAccount.js | 2 +- .../webapp/js/financial/expenseAccountListCtrl.js | 2 +- .../src/main/webapp/js/jquery.fn.gantt.js | 2 - .../src/main/webapp/js/js-hypercube.min.js | 4 +- chorem-webmotion/src/main/webapp/js/less-1.3.3.js | 2 - .../src/main/webapp/js/ng-grid-2.0.7.debug.js | 4 +- .../src/main/webapp/js/ng-grid-2.0.7.min.js | 4 +- chorem-webmotion/src/main/webapp/js/ng-select2.js | 2 - chorem-webmotion/src/main/webapp/js/ng-wikitty.js | 2 - .../src/main/webapp/js/paginationTable.js | 4 +- .../src/main/webapp/js/projectPagination.js | 4 +- chorem-webmotion/src/main/webapp/js/salesFunnel.js | 4 +- chorem-webmotion/src/main/webapp/js/select2.min.js | 4 +- .../src/{jetty/jetty-context.xml => site/site.xml} | 35 +- .../src/test/resources/log4j.properties | 4 +- pom.xml | 452 +++++++++++---------- src/site/rst/calculations.rst | 2 - src/site/rst/chorem-cdc.rst | 4 +- src/site/rst/doc-devel.rst | 4 +- src/site/rst/index.rst | 6 +- src/site/rst/requisite.rst | 4 +- src/site/site.xml | 69 ++++ src/site/site_fr.xml | 113 ------ 205 files changed, 534 insertions(+), 950 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5fb0960 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +.idea +*.ipr +*.iws +*.iml +*.log +*~ +/*/*~ +atlassian-ide-plugin.xml +target/* +*/target/* +*/*.ipr +*/*.iws +*/*.iml +*/.idea diff --git a/chorem-entities/pom.xml b/chorem-entities/pom.xml index cd9ed78..5e297e2 100644 --- a/chorem-entities/pom.xml +++ b/chorem-entities/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -64,7 +65,6 @@ <dependency> <groupId>org.parboiled</groupId> <artifactId>parboiled-core</artifactId> - <version>1.1.6</version> </dependency> <dependency> diff --git a/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java b/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java index da74077..faab013 100644 --- a/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java +++ b/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java @@ -9,8 +9,6 @@ package com.inamik.utils; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java b/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java index e1ae525..8da21c3 100644 --- a/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java +++ b/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java @@ -9,8 +9,6 @@ package com.inamik.utils; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java b/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java index 839cf58..0d2367c 100644 --- a/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java +++ b/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java @@ -9,8 +9,6 @@ package com.inamik.utils; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremAction.java b/chorem-entities/src/main/java/org/chorem/ChoremAction.java index a376743..c470503 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremAction.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremAction.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremClient.java b/chorem-entities/src/main/java/org/chorem/ChoremClient.java index aedb2ab..5e7e6b5 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremClient.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremClient.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremConfig.java b/chorem-entities/src/main/java/org/chorem/ChoremConfig.java index bb7fdbb..8ade139 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremConfig.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremConfig.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java b/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java index 3706ee4..485fdee 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java b/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java index da14337..b7e151c 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremMain.java b/chorem-entities/src/main/java/org/chorem/ChoremMain.java index d51692a..c0cd47b 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremMain.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremMain.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java b/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java index e1c9496..6a550bd 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java @@ -2,9 +2,7 @@ package org.chorem; /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java b/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java index cda06f0..f8ab911 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java @@ -2,9 +2,7 @@ package org.chorem; /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ChoremUtil.java b/chorem-entities/src/main/java/org/chorem/ChoremUtil.java index 5e1085d..3d509ab 100644 --- a/chorem-entities/src/main/java/org/chorem/ChoremUtil.java +++ b/chorem-entities/src/main/java/org/chorem/ChoremUtil.java @@ -3,8 +3,6 @@ package org.chorem; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java b/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java index 08d6d1c..cd55408 100644 --- a/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java +++ b/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/Saint.java b/chorem-entities/src/main/java/org/chorem/Saint.java index 4296cf3..42bcf32 100644 --- a/chorem-entities/src/main/java/org/chorem/Saint.java +++ b/chorem-entities/src/main/java/org/chorem/Saint.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java b/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java index 74761ec..edc265b 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java +++ b/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java @@ -6,9 +6,7 @@ package org.chorem.entities; /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java b/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java index f1d6427..b2a9a72 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java +++ b/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java b/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java index 81e9c6a..f532f57 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java +++ b/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java @@ -6,9 +6,7 @@ package org.chorem.entities; /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java b/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java index 1b617f3..23c96dd 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java +++ b/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java b/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java index 22ccaa8..1cbbbaf 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java +++ b/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java b/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java index ff2b61f..e13ebca 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java +++ b/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java @@ -3,8 +3,6 @@ package org.chorem.entities; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java b/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java index 9fa8345..a0562d3 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java +++ b/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java b/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java index 65333c1..9bc3d80 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java +++ b/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java b/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java index 624606a..a57c368 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java +++ b/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java b/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java index 488c25a..44fd2be 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java +++ b/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java b/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java index effa639..d5fb29a 100644 --- a/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java +++ b/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java b/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java index c1d0653..9064e5b 100644 --- a/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java +++ b/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java @@ -3,8 +3,6 @@ package org.chorem.project; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/project/Calculation.java b/chorem-entities/src/main/java/org/chorem/project/Calculation.java index 1dc9577..2dcf317 100644 --- a/chorem-entities/src/main/java/org/chorem/project/Calculation.java +++ b/chorem-entities/src/main/java/org/chorem/project/Calculation.java @@ -3,8 +3,6 @@ package org.chorem.project; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java b/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java index 0984823..09e0621 100644 --- a/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java +++ b/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java @@ -3,8 +3,6 @@ package org.chorem.project; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java b/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java index 2a1f9c7..6a29ce1 100644 --- a/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java +++ b/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java @@ -3,8 +3,6 @@ package org.chorem.project; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java b/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java index e5ded99..5fc5bef 100644 --- a/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java +++ b/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java @@ -3,8 +3,6 @@ package org.chorem.project; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/main/resources/chorem.properties b/chorem-entities/src/main/resources/chorem.properties index bdb7d5c..7a314af 100644 --- a/chorem-entities/src/main/resources/chorem.properties +++ b/chorem-entities/src/main/resources/chorem.properties @@ -1,8 +1,6 @@ ### # #%L -# Chorem entities -# $Id$ -# $HeadURL$ +# Chorem :: entities # %% # Copyright (C) 2011 - 2012 CodeLutin # %% diff --git a/chorem-entities/src/main/resources/log4j.properties b/chorem-entities/src/main/resources/log4j.properties index 253d378..d2c5f19 100644 --- a/chorem-entities/src/main/resources/log4j.properties +++ b/chorem-entities/src/main/resources/log4j.properties @@ -1,9 +1,6 @@ ### # #%L -# bow -# -# $Id$ -# $HeadURL$ +# Chorem :: entities # %% # Copyright (C) 2010 CodeLutin # %% diff --git a/chorem-entities/src/main/xmi/chorem-model.properties b/chorem-entities/src/main/xmi/chorem-model.properties index a24c6e8..0291743 100644 --- a/chorem-entities/src/main/xmi/chorem-model.properties +++ b/chorem-entities/src/main/xmi/chorem-model.properties @@ -1,8 +1,6 @@ ### # #%L -# Chorem entities -# $Id$ -# $HeadURL$ +# Chorem :: entities # %% # Copyright (C) 2011 - 2012 CodeLutin # %% diff --git a/chorem-entities/src/main/xmi/vacations.rst b/chorem-entities/src/main/xmi/vacations.rst index 52d7692..2ffd765 100644 --- a/chorem-entities/src/main/xmi/vacations.rst +++ b/chorem-entities/src/main/xmi/vacations.rst @@ -1,8 +1,6 @@ .. - .. * #%L -.. * Chorem entities -.. * $Id$ -.. * $HeadURL$ +.. * Chorem :: entities .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% diff --git a/chorem-entities/src/site/rst/dataModel.rst b/chorem-entities/src/site/rst/dataModel.rst index f3a5788..b20c441 100644 --- a/chorem-entities/src/site/rst/dataModel.rst +++ b/chorem-entities/src/site/rst/dataModel.rst @@ -1,8 +1,6 @@ .. - .. * #%L -.. * Chorem entities -.. * $Id$ -.. * $HeadURL$ +.. * Chorem :: entities .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% diff --git a/chorem-entities/src/site/rst/gepeto.rst b/chorem-entities/src/site/rst/gepeto.rst index 3882f54..092e5c8 100644 --- a/chorem-entities/src/site/rst/gepeto.rst +++ b/chorem-entities/src/site/rst/gepeto.rst @@ -1,8 +1,6 @@ .. - .. * #%L .. * Chorem :: entities -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2014 CodeLutin .. * %% diff --git a/chorem-webmotion/src/jetty/jetty-context.xml b/chorem-entities/src/site/site.xml similarity index 54% copy from chorem-webmotion/src/jetty/jetty-context.xml copy to chorem-entities/src/site/site.xml index 0296a60..0b0c75a 100644 --- a/chorem-webmotion/src/jetty/jetty-context.xml +++ b/chorem-entities/src/site/site.xml @@ -1,9 +1,6 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> <!-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: entities %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -11,23 +8,35 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + <bannerLeft> + <src>logo.jpg</src> + <name>${project.name}</name> + <href>index.html</href> + <alt>Chorem</alt> + </bannerLeft> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> + <body> -<Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Call name="setAttribute"> - <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> - <Arg>.*/.*webmotion-[^/]\.jar$|.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> - </Call> -</Configure> \ No newline at end of file + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + <menu ref="reports"/> + + </body> + +</project> diff --git a/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java b/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java index 7345000..7df98d3 100644 --- a/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java +++ b/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java @@ -3,8 +3,6 @@ package org.chorem; /* * #%L * Chorem :: entities - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java b/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java index 6dfc0d4..2cd1ba0 100644 --- a/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java +++ b/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem entities - * $Id$ - * $HeadURL$ + * Chorem :: entities * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index dbe942e..aee3720 100644 --- a/chorem-webmotion/pom.xml +++ b/chorem-webmotion/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -66,13 +67,13 @@ <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-api</artifactId> </dependency> - + <dependency> <groupId>org.chorem.chorem</groupId> <artifactId>chorem-entities</artifactId> <version>${project.version}</version> </dependency> - + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -165,7 +166,7 @@ <artifactId>nuiton-js-wro</artifactId> </dependency> - <dependency> + <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angularjs</artifactId> </dependency> diff --git a/chorem-webmotion/src/jetty/jetty-context.xml b/chorem-webmotion/src/jetty/jetty-context.xml index 0296a60..74d850b 100644 --- a/chorem-webmotion/src/jetty/jetty-context.xml +++ b/chorem-webmotion/src/jetty/jetty-context.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -30,4 +28,4 @@ <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> <Arg>.*/.*webmotion-[^/]\.jar$|.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> </Call> -</Configure> \ No newline at end of file +</Configure> diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java index ff2c0c4..31affb2 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java @@ -6,9 +6,7 @@ package org.chorem.webmotion; /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java index 10fff43..180b3ac 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java @@ -1,9 +1,7 @@ package org.chorem.webmotion; /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java index 597b774..7087cd5 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java @@ -3,8 +3,6 @@ package org.chorem.webmotion; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java index ab7b14d..f036ffc 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java index 8bf48f6..9d10da2 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java index 1cf6158..6bfdd77 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java index 8f85c65..dca0603 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java index 75acde1..5933186 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java index 67179bf..b825915 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java index e7f7498..f1d8276 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java index 27453b9..a613036 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java @@ -3,9 +3,7 @@ package org.chorem.webmotion.actions; /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -254,4 +252,4 @@ public class HrAction extends GenericAction { EmployeeHR.FIELD_EMPLOYEEHR_OTHERLEAVE, Double.toString(eAmount)); } } -} \ No newline at end of file +} diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java index 7f5f42b..888ef23 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java @@ -2,9 +2,7 @@ package org.chorem.webmotion.actions; /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java index b0f8e56..e6b72e4 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java index b9a3306..141b0e7 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.crm; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java index bb25b42..da8f21a 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.crm; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java index 630ccd0..9f30662 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.crm; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java index 4b40b47..b67f18b 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.crm; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java index a2c30b7..6d88ebc 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.crm; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java index bab0e37..38253c9 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/AccountBillingReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingPerAccountReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingPerAccountReportAction.java index e68b371..2bd1477 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingPerAccountReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingPerAccountReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingPerProjectReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingPerProjectReportAction.java index d106cbe..39d35e2 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingPerProjectReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingPerProjectReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingReportAction.java index a5fec60..af9faaa 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingReportHelper.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingReportHelper.java index 6a6bb1e..6247a15 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingReportHelper.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/BillingReportHelper.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java index a766514..7b4e4f3 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java index 9330838..1450120 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ProjectBillingReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java index 3b3ec09..8b184b8 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.project; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java index e99093e..ea9f8f9 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.project; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java index bbc864b..e7403f3 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.project; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java index 2efdaa4..26f2687 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.project; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java index f3cb032..64fb50f 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.project; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java index 9a89d06..d618759 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.project; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java index 91e31ab..bc207b5 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java index d4de0ed..82d84c2 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java index 9ecc3e6..29dafb0 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java index a46c644..7d5382d 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java index 25adb95..27a93a6 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java index 30b551d..285ca6e 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java @@ -2,9 +2,7 @@ package org.chorem.webmotion.actions.sales; /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java index 5db8d45..3bc467b 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java index e4ddfb1..08e35b0 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java index ede3a00..015e666 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java index c8782ac..72b0a43 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java index 19eb348..e95b886 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java index 2cf6364..eb388d8 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.actions.sales; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java index c160d52..3ed8a94 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.bean.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java index cb60c5d..655f1de 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.bean.financial; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java index 8496627..c9519da 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java index 1d001dd..9d0b022 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java index d63a233..7613970 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java index 7d9b467..6c5cd5d 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java index 3b22fce..c492de5 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.render; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java b/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java index abe1437..9e604d2 100644 --- a/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java +++ b/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java @@ -3,8 +3,6 @@ package org.chorem.webmotion.render; /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java b/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java index 43701d7..afb9345 100644 --- a/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java +++ b/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java b/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java index 3b9f981..5cf10cf 100644 --- a/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java +++ b/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/resources/log4j.properties b/chorem-webmotion/src/main/resources/log4j.properties index 2e2b2d8..d38b6d1 100644 --- a/chorem-webmotion/src/main/resources/log4j.properties +++ b/chorem-webmotion/src/main/resources/log4j.properties @@ -1,8 +1,6 @@ ### # #%L -# Chorem webmotion -# $Id$ -# $HeadURL$ +# Chorem :: webmotion # %% # Copyright (C) 2011 - 2012 CodeLutin # %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp index 37163a3..a665b73 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp @@ -1,8 +1,6 @@ <%-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -34,4 +32,4 @@ <form action="<c:url value="/admin/doExport"/>" method="POST"> <input type="text" name="query"/> <input type="submit" value="Export"/> -</form> \ No newline at end of file +</form> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp index 53400a6..9fc1e77 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -226,4 +224,4 @@ $scope.sumChildren = function (row) { </div> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp index 69afee4..513bb34 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp index 476c4aa..731b0bd 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -111,4 +107,4 @@ </div> <div style="clear:both;"/> -</body> \ No newline at end of file +</body> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp index 759a5e9..a799023 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp @@ -1,8 +1,6 @@ <%-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp index b9a7d72..81af17b 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -37,4 +33,4 @@ </div> <div style="clear:both;"/> -</body> \ No newline at end of file +</body> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp index 759a5e9..a799023 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp @@ -1,8 +1,6 @@ <%-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp index fa14aee..1578e6d 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp index bde9162..e109fb3 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp index 8202cfb..b675ab7 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp index 3389148..603f1eb 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp index 7a08a76..06b4960 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp index 32f7c42..2af697b 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp index f5d60cc..a66c046 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp index 4323712..a65bc28 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp index 152a556..3e0e287 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp index 014fca0..654115b 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp index 8345c89..b90c029 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -246,4 +244,4 @@ </c:forEach> -<script src="<c:url value='/js/jquery.fn.gantt.js'/>"></script> \ No newline at end of file +<script src="<c:url value='/js/jquery.fn.gantt.js'/>"></script> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp index 9eeda45..a192b02 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -306,4 +304,4 @@ </div> </div> - --> \ No newline at end of file + --> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp index 4e98a78..d570886 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp index 63e53a3..486e795 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -52,4 +50,4 @@ </tr> </tbody> </c:forEach> -</table> \ No newline at end of file +</table> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp index 25bf9c4..c2c6d18 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp index f097b17..d7198b5 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp index 81de12d..a760af8 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp index f264a13..5bc90d5 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp index b60ae65..bc0ea85 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp index 7546426..c4cf0aa 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -61,4 +59,4 @@ <a class="btn btn-success" href="<c:url value="#"/>"><i class="icon-plus icon-white"></i> Add ${extensions}</a> </c:if> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp index d0dfa2f..bf985cf 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -47,4 +45,4 @@ </c:forEach> </c:forEach> </c:forEach> -</c:forEach> \ No newline at end of file +</c:forEach> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp index 4cc6c2c..e906c00 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -103,4 +101,4 @@ </c:forEach> </c:forEach> </form> -</c:if> \ No newline at end of file +</c:if> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp index 265b06e..afd45ef 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp index c5e3edd..a21f57c 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp @@ -1,8 +1,6 @@ <%-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp index 6227148..e6fe515 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp @@ -1,8 +1,6 @@ <%-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp index 4468542..11f52a9 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/accountBillingReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -119,4 +115,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp index 46b0edc..1be0524 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerAccountReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -103,4 +99,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp index ae1fac6..a3dfafe 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingPerProjectReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -103,4 +99,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingReport.jsp index 5830685..7e7a6f0 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/billingReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -121,4 +117,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp index 8ec0f6c..37f703d 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/menu.jsp @@ -1,8 +1,6 @@ <%-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -28,4 +26,4 @@ <li class="list-group-item"><a href="<c:url value="/financial/report/billing"/>"><i class="icon-chevron-right"></i> Facturation</a></li> <li class="list-group-item"><a href="<c:url value="/financial/report/billingPerAccount"/>"><i class="icon-chevron-right"></i> Facturation par client</a></li> <li class="list-group-item"><a href="<c:url value="/financial/report/billingPerProject"/>"><i class="icon-chevron-right"></i> Facturation par projet</a></li> -</ul> \ No newline at end of file +</ul> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp index 4468542..11f52a9 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/reports/projectBillingReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -119,4 +115,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp index 6ede48a..97e521e 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp index d1f130d..78ef389 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp index 552620b..fca5929 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -31,4 +29,4 @@ Bienvenue sur Chorem, l'outil de gestion d'entreprise. <input type="text" name="choremLogin" placeholder="login"/> <input type="password" name="choremPassword" placeholder="password"/> <input type="submit"/> -</form> \ No newline at end of file +</form> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html index 620e159..bf50b2f 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html @@ -1,8 +1,6 @@ <!-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -31,4 +29,4 @@ </td> <td><input type="button" value="cancel" ng-click="cancelEdit()"></td> </tr> -</table> \ No newline at end of file +</table> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp index 8cb179e..3ce749e 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp @@ -1,8 +1,6 @@ <%-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -60,4 +58,4 @@ </table> </div> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp index 76e1f30..4bcc952 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp index f9624f1..b558229 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -121,4 +117,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp index fde6d56..aa43fdc 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -119,4 +115,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html index 5dff8d8..81179e9 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html @@ -1,8 +1,6 @@ <!-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -44,4 +42,4 @@ <div class="modal-footer"> <button ng-click="cancel()">Annuler</button> <button ng-click="validate()">Valider</button> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html index 0d1a557..9c6f263 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html @@ -1,8 +1,6 @@ <!-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -39,4 +37,4 @@ <div class="modal-footer"> <button ng-click="cancel()">Annuler</button> <button ng-click="validate()">Envoyer</button> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html index c2282ad..c9a5ab5 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html @@ -1,8 +1,6 @@ <!-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -46,4 +44,4 @@ <div class="modal-footer"> <button ng-click="cancel()">Annuler</button> <button ng-click="validate()">Envoyer</button> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html index 02d1267..fff730f 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html @@ -1,8 +1,6 @@ <!-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -39,4 +37,4 @@ <div class="modal-footer"> <button ng-click="cancel()">Annuler</button> <button ng-click="validate()">Accepter</button> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html index 861a30c..3c6063f 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html @@ -1,8 +1,6 @@ <!-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -39,4 +37,4 @@ <div class="modal-footer"> <button ng-click="cancel()">Annuler</button> <button ng-click="validate()">Rejeter</button> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp index f0a647d..b0fdebf 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp @@ -1,8 +1,6 @@ <%-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% @@ -29,4 +27,4 @@ <li class="list-group-item"><a href="<c:url value="/sales/report/salesPerProject"/>"><i class="icon-chevron-right"></i> Ventes par projet</a></li> <li class="list-group-item"><a href="<c:url value="/sales/report/sentQuotation"/>"><i class="icon-chevron-right"></i> Devis envoyés</a></li> <li class="list-group-item"><a href="<c:url value="/sales/report/acceptedQuotation"/>"><i class="icon-chevron-right"></i> Devis acceptés</a></li> -</ul> \ No newline at end of file +</ul> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp index fde6d56..aa43fdc 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -119,4 +115,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp index 6efa316..dfd7fa0 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -26,4 +22,4 @@ <jsp:include page="/fragment/sales/lead"/> <jsp:include page="/fragment/sales/draft"/> <jsp:include page="/fragment/sales/sent"/> - <jsp:include page="/fragment/sales/accepted"/> \ No newline at end of file + <jsp:include page="/fragment/sales/accepted"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp index 3f099c1..2614a76 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -137,4 +133,4 @@ </div> <div style="clear:both;"/> -</body> \ No newline at end of file +</body> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp index b4bd7e1..edf2979 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -103,4 +99,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp index 85681af..1019585 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -103,4 +99,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp index 5240874..a3e1279 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -121,4 +117,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp index 0de02f3..94ae8aa 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -121,4 +117,4 @@ </div> </div> -<div style="clear:both;"/> \ No newline at end of file +<div style="clear:both;"/> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp index a9373f6..dc598fb 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp index dab82f3..d2cf291 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -46,4 +44,4 @@ <i class="icon-ok icon-white"></i> Mettre à jour </button> -</form> \ No newline at end of file +</form> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp index 915117c..9b8af9c 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -69,4 +67,4 @@ </c:forEach> </c:if> -</div> \ No newline at end of file +</div> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp index 0e2a479..ae0d45d 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp index 8eb7fe1..2d96a99 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp index a5d177c..c925841 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp index fa689ed..3ba5f28 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2013 CodeLutin %% @@ -10,12 +8,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -23,4 +19,4 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<a class="btn btn-success" href="<c:url value="/report?report=budget"/>"><i class="icon-th icon-white"></i> Budget</a> \ No newline at end of file +<a class="btn btn-success" href="<c:url value="/report?report=budget"/>"><i class="icon-th icon-white"></i> Budget</a> diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp index b5b8f18..d472b83 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp index b802805..f8884a6 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp index 75493df..1e59d0b 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp index e00cd4a..942315d 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp +++ b/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp @@ -1,8 +1,6 @@ <%-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties b/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties index 30b6772..528b01d 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties +++ b/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties @@ -1,8 +1,6 @@ ### # #%L # Chorem :: webmotion -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2011 - 2014 CodeLutin # %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/web.xml b/chorem-webmotion/src/main/webapp/WEB-INF/web.xml index ce2d01f..557d8ea 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/web.xml +++ b/chorem-webmotion/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,6 @@ <!-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin, Chatellier Eric %% diff --git a/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml b/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml index 0df2b43..7edbae2 100644 --- a/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml +++ b/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml @@ -1,8 +1,6 @@ <!-- #%L Chorem :: webmotion - $Id$ - $HeadURL$ %% Copyright (C) 2011 - 2014 CodeLutin %% diff --git a/chorem-webmotion/src/main/webapp/css/chorem-bi.css b/chorem-webmotion/src/main/webapp/css/chorem-bi.css index 78a8fdf..9854435 100644 --- a/chorem-webmotion/src/main/webapp/css/chorem-bi.css +++ b/chorem-webmotion/src/main/webapp/css/chorem-bi.css @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -28,4 +26,4 @@ .select { width: 800px; -} \ No newline at end of file +} diff --git a/chorem-webmotion/src/main/webapp/css/chorem-crm.css b/chorem-webmotion/src/main/webapp/css/chorem-crm.css index 0ad91ab..4a3a879 100644 --- a/chorem-webmotion/src/main/webapp/css/chorem-crm.css +++ b/chorem-webmotion/src/main/webapp/css/chorem-crm.css @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -48,4 +46,4 @@ .elementId{ display: none; -} \ No newline at end of file +} diff --git a/chorem-webmotion/src/main/webapp/css/chorem-sales.css b/chorem-webmotion/src/main/webapp/css/chorem-sales.css index 889173d..c30cea0 100644 --- a/chorem-webmotion/src/main/webapp/css/chorem-sales.css +++ b/chorem-webmotion/src/main/webapp/css/chorem-sales.css @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -42,4 +40,4 @@ .salesFunnelItemButton { margin-top:10px; -} \ No newline at end of file +} diff --git a/chorem-webmotion/src/main/webapp/css/employeeEdit.css b/chorem-webmotion/src/main/webapp/css/employeeEdit.css index 42b177b..d9c719a 100644 --- a/chorem-webmotion/src/main/webapp/css/employeeEdit.css +++ b/chorem-webmotion/src/main/webapp/css/employeeEdit.css @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css b/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css index 34d68c4..104d466 100644 --- a/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css +++ b/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css b/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css index f3cb223..2f206a5 100644 --- a/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css +++ b/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/css/ng-grid.min.css b/chorem-webmotion/src/main/webapp/css/ng-grid.min.css index bd90c45..4db1b4d 100644 --- a/chorem-webmotion/src/main/webapp/css/ng-grid.min.css +++ b/chorem-webmotion/src/main/webapp/css/ng-grid.min.css @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -20,4 +18,4 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -.ngGrid{background-color:#fdfdfd}.ngGrid input[type="checkbox"]{margin:0;padding:0}.ngGrid input{vertical-align:top}.ngGrid.unselectable{-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.ngViewport{overflow:auto;min-height:20px}.ngViewport:focus{outline:0}.ngCanvas{position:relative}.ngVerticalBar{position:absolute;right:0;width:0}.ngVerticalBarVisible{width:1px;background-color:#d4d4d4}.ngHeaderContainer{position:relative;overfl [...] \ No newline at end of file +.ngGrid{background-color:#fdfdfd}.ngGrid input[type="checkbox"]{margin:0;padding:0}.ngGrid input{vertical-align:top}.ngGrid.unselectable{-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.ngViewport{overflow:auto;min-height:20px}.ngViewport:focus{outline:0}.ngCanvas{position:relative}.ngVerticalBar{position:absolute;right:0;width:0}.ngVerticalBarVisible{width:1px;background-color:#d4d4d4}.ngHeaderContainer{position:relative;overfl [...] diff --git a/chorem-webmotion/src/main/webapp/css/select2/select2.css b/chorem-webmotion/src/main/webapp/css/select2/select2.css index fca728c..cf1f598 100644 --- a/chorem-webmotion/src/main/webapp/css/select2/select2.css +++ b/chorem-webmotion/src/main/webapp/css/select2/select2.css @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/css/vacationRequest.css b/chorem-webmotion/src/main/webapp/css/vacationRequest.css index 8c16709..3c83582 100644 --- a/chorem-webmotion/src/main/webapp/css/vacationRequest.css +++ b/chorem-webmotion/src/main/webapp/css/vacationRequest.css @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/js/chorem.js b/chorem-webmotion/src/main/webapp/js/chorem.js index 3d8274b..62ab93d 100644 --- a/chorem-webmotion/src/main/webapp/js/chorem.js +++ b/chorem-webmotion/src/main/webapp/js/chorem.js @@ -1,8 +1,6 @@ /* * #%L - * Chorem webmotion - * $Id$ - * $HeadURL$ + * Chorem :: webmotion * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -352,4 +350,4 @@ $(document).ready(function($) { -}); \ No newline at end of file +}); diff --git a/chorem-webmotion/src/main/webapp/js/dashboardAdc.js b/chorem-webmotion/src/main/webapp/js/dashboardAdc.js index 3a5168c..e07da47 100644 --- a/chorem-webmotion/src/main/webapp/js/dashboardAdc.js +++ b/chorem-webmotion/src/main/webapp/js/dashboardAdc.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -66,4 +64,4 @@ $(document).ready(function() { -}); \ No newline at end of file +}); diff --git a/chorem-webmotion/src/main/webapp/js/employeeEdit.js b/chorem-webmotion/src/main/webapp/js/employeeEdit.js index a6a94bb..f981a85 100644 --- a/chorem-webmotion/src/main/webapp/js/employeeEdit.js +++ b/chorem-webmotion/src/main/webapp/js/employeeEdit.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -275,4 +273,4 @@ $(document).ready(function() { -}); \ No newline at end of file +}); diff --git a/chorem-webmotion/src/main/webapp/js/financial/expenseAccount.js b/chorem-webmotion/src/main/webapp/js/financial/expenseAccount.js index 7c2c27a..4cfb6bc 100644 --- a/chorem-webmotion/src/main/webapp/js/financial/expenseAccount.js +++ b/chorem-webmotion/src/main/webapp/js/financial/expenseAccount.js @@ -122,4 +122,4 @@ app.directive("autoComplete", function() { }); } } -}); \ No newline at end of file +}); diff --git a/chorem-webmotion/src/main/webapp/js/financial/expenseAccountListCtrl.js b/chorem-webmotion/src/main/webapp/js/financial/expenseAccountListCtrl.js index b0c9e14..46bea4a 100644 --- a/chorem-webmotion/src/main/webapp/js/financial/expenseAccountListCtrl.js +++ b/chorem-webmotion/src/main/webapp/js/financial/expenseAccountListCtrl.js @@ -57,4 +57,4 @@ app.controller("expenseAccountListCtrl", function($scope, $resource, $timeout, $ } $scope.tableParams.reload(); }); -}); \ No newline at end of file +}); diff --git a/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js b/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js index 5def696..39b9863 100644 --- a/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js +++ b/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js b/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js index 62fe76e..b8ae40e 100644 --- a/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js +++ b/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -20,4 +18,4 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -var ps=Object.create?Object.create(null):{};ps.addSingletonGetter=function(a){a.getInstance=function(){return a.instance_||a.setInstance.apply(this,arguments)};a.hasInstance=function(){return !!a.instance_};a.setInstance=function(){return a.instance_=new a(arguments[0],arguments[1],arguments[2],arguments[3],arguments[4],arguments[5],arguments[6],arguments[7])};a.deleteInstance=function(){a.instance_=null}};ps.addCloning=function(a){a.prototype.clone=function(){var c=$.extend(true,new a() [...] \ No newline at end of file +var ps=Object.create?Object.create(null):{};ps.addSingletonGetter=function(a){a.getInstance=function(){return a.instance_||a.setInstance.apply(this,arguments)};a.hasInstance=function(){return !!a.instance_};a.setInstance=function(){return a.instance_=new a(arguments[0],arguments[1],arguments[2],arguments[3],arguments[4],arguments[5],arguments[6],arguments[7])};a.deleteInstance=function(){a.instance_=null}};ps.addCloning=function(a){a.prototype.clone=function(){var c=$.extend(true,new a() [...] diff --git a/chorem-webmotion/src/main/webapp/js/less-1.3.3.js b/chorem-webmotion/src/main/webapp/js/less-1.3.3.js index 2a39e8a..cfcd7e4 100644 --- a/chorem-webmotion/src/main/webapp/js/less-1.3.3.js +++ b/chorem-webmotion/src/main/webapp/js/less-1.3.3.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js b/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js index 4aa30b4..5ed40bb 100644 --- a/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js +++ b/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -3607,4 +3605,4 @@ angular.module("ngGrid").run(["$templateCache", function($templateCache) { }]); -}(window, jQuery)); \ No newline at end of file +}(window, jQuery)); diff --git a/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js b/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js index b7a3592..f280f30 100644 --- a/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js +++ b/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -21,4 +19,4 @@ * #L% */ (function(e,t){"use strict";var n=6,o=4,i="asc",r="desc",l="_ng_field_",a="_ng_depth_",s="_ng_hidden_",c="_ng_column_",g=/CUSTOM_FILTERS/g,d=/COL_FIELD/g,u=/DISPLAY_CELL_TEMPLATE/g,f=/EDITABLE_CELL_TEMPLATE/g,h=/<.+>/;e.ngGrid={},e.ngGrid.i18n={},angular.module("ngGrid.services",[]);var p=angular.module("ngGrid.directives",[]),m=angular.module("ngGrid.filters",[]);angular.module("ngGrid",["ngGrid.services","ngGrid.directives","ngGrid.filters"]);var v=function(e,t,o,i){if(void 0===e.selec [...] -var r,l=Math.floor(e/w.config.rowHeight);if(w.filteredRows.length>w.config.virtualizationThreshold){if(e>w.prevScrollTop&&w.prevScrollIndex+o>l)return;if(w.prevScrollTop>e&&l>w.prevScrollIndex-o)return;r=new P(Math.max(0,l-n),l+w.minRowsToRender()+n)}else{var a=i.configGroups.length>0?w.rowFactory.parsedData.length:w.data.length;r=new P(0,Math.max(a,w.minRowsToRender()+n))}w.prevScrollTop=e,w.rowFactory.UpdateViewableRange(r),w.prevScrollIndex=l}},i.toggleShowMenu=function(){i.showMenu=! [...] \ No newline at end of file +var r,l=Math.floor(e/w.config.rowHeight);if(w.filteredRows.length>w.config.virtualizationThreshold){if(e>w.prevScrollTop&&w.prevScrollIndex+o>l)return;if(w.prevScrollTop>e&&l>w.prevScrollIndex-o)return;r=new P(Math.max(0,l-n),l+w.minRowsToRender()+n)}else{var a=i.configGroups.length>0?w.rowFactory.parsedData.length:w.data.length;r=new P(0,Math.max(a,w.minRowsToRender()+n))}w.prevScrollTop=e,w.rowFactory.UpdateViewableRange(r),w.prevScrollIndex=l}},i.toggleShowMenu=function(){i.showMenu=! [...] diff --git a/chorem-webmotion/src/main/webapp/js/ng-select2.js b/chorem-webmotion/src/main/webapp/js/ng-select2.js index 49671d0..e15ef67 100644 --- a/chorem-webmotion/src/main/webapp/js/ng-select2.js +++ b/chorem-webmotion/src/main/webapp/js/ng-select2.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/js/ng-wikitty.js b/chorem-webmotion/src/main/webapp/js/ng-wikitty.js index 86661f1..525f984 100644 --- a/chorem-webmotion/src/main/webapp/js/ng-wikitty.js +++ b/chorem-webmotion/src/main/webapp/js/ng-wikitty.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% diff --git a/chorem-webmotion/src/main/webapp/js/paginationTable.js b/chorem-webmotion/src/main/webapp/js/paginationTable.js index 9849ce9..c4d30c8 100644 --- a/chorem-webmotion/src/main/webapp/js/paginationTable.js +++ b/chorem-webmotion/src/main/webapp/js/paginationTable.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -61,4 +59,4 @@ angular.module('Pagination').directive('loadingContainer', function () { }); } }; -}); \ No newline at end of file +}); diff --git a/chorem-webmotion/src/main/webapp/js/projectPagination.js b/chorem-webmotion/src/main/webapp/js/projectPagination.js index 43f1f70..1b8a0ed 100644 --- a/chorem-webmotion/src/main/webapp/js/projectPagination.js +++ b/chorem-webmotion/src/main/webapp/js/projectPagination.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -84,4 +82,4 @@ angular.module('Pagination').directive('loadingContainer', function () { }); } }; -}); \ No newline at end of file +}); diff --git a/chorem-webmotion/src/main/webapp/js/salesFunnel.js b/chorem-webmotion/src/main/webapp/js/salesFunnel.js index ab9afc9..fbd848e 100644 --- a/chorem-webmotion/src/main/webapp/js/salesFunnel.js +++ b/chorem-webmotion/src/main/webapp/js/salesFunnel.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -263,4 +261,4 @@ var CancelDialogController = ['$scope', '$http', '$modalInstance', 'dialogModel' } ); } -}]; \ No newline at end of file +}]; diff --git a/chorem-webmotion/src/main/webapp/js/select2.min.js b/chorem-webmotion/src/main/webapp/js/select2.min.js index 250febd..69eca62 100644 --- a/chorem-webmotion/src/main/webapp/js/select2.min.js +++ b/chorem-webmotion/src/main/webapp/js/select2.min.js @@ -1,8 +1,6 @@ /* * #%L * Chorem :: webmotion - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2014 CodeLutin * %% @@ -41,4 +39,4 @@ either express or implied. See the Apache License and the GPL License for the sp permissions and limitations under the Apache License and the GPL License. */ (function(a){a.fn.each2===void 0&&a.fn.extend({each2:function(b){for(var c=a([0]),d=-1,e=this.length;e>++d&&(c.context=c[0]=this[d])&&b.call(c[0],d,c)!==!1;);return this}})})(jQuery),function(a,b){"use strict";function m(a,b){for(var c=0,d=b.length;d>c;c+=1)if(o(a,b[c]))return c;return-1}function n(){var b=a(l);b.appendTo("body");var c={width:b.width()-b[0].clientWidth,height:b.height()-b[0].clientHeight};return b.remove(),c}function o(a,c){return a===c?!0:a===b||c===b?!1:null===a||null= [...] -},val:function(){var a,c=!1,d=null,e=this,f=this.data();if(0===arguments.length)return this.opts.element.val();if(a=arguments[0],arguments.length>1&&(c=arguments[1]),this.select)this.select.val(a).find(":selected").each2(function(a,b){return d=e.optionToData(b),!1}),this.updateSelection(d),this.setPlaceholder(),c&&this.triggerChange({added:d,removed:f});else{if(!a&&0!==a)return this.clear(c),b;if(this.opts.initSelection===b)throw Error("cannot call val() if initSelection() is not defined [...] \ No newline at end of file +},val:function(){var a,c=!1,d=null,e=this,f=this.data();if(0===arguments.length)return this.opts.element.val();if(a=arguments[0],arguments.length>1&&(c=arguments[1]),this.select)this.select.val(a).find(":selected").each2(function(a,b){return d=e.optionToData(b),!1}),this.updateSelection(d),this.setPlaceholder(),c&&this.triggerChange({added:d,removed:f});else{if(!a&&0!==a)return this.clear(c),b;if(this.opts.initSelection===b)throw Error("cannot call val() if initSelection() is not defined [...] diff --git a/chorem-webmotion/src/jetty/jetty-context.xml b/chorem-webmotion/src/site/site.xml similarity index 54% copy from chorem-webmotion/src/jetty/jetty-context.xml copy to chorem-webmotion/src/site/site.xml index 0296a60..3b1a430 100644 --- a/chorem-webmotion/src/jetty/jetty-context.xml +++ b/chorem-webmotion/src/site/site.xml @@ -1,9 +1,6 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> <!-- #%L - Chorem webmotion - $Id$ - $HeadURL$ + Chorem :: webmotion %% Copyright (C) 2011 - 2012 CodeLutin %% @@ -11,23 +8,35 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + <bannerLeft> + <src>logo.jpg</src> + <name>${project.name}</name> + <href>index.html</href> + <alt>Chorem</alt> + </bannerLeft> -<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> + <body> -<Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Call name="setAttribute"> - <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> - <Arg>.*/.*webmotion-[^/]\.jar$|.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> - </Call> -</Configure> \ No newline at end of file + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + <menu ref="reports"/> + + </body> + +</project> diff --git a/chorem-webmotion/src/test/resources/log4j.properties b/chorem-webmotion/src/test/resources/log4j.properties index 008751a..701d8ad 100644 --- a/chorem-webmotion/src/test/resources/log4j.properties +++ b/chorem-webmotion/src/test/resources/log4j.properties @@ -1,8 +1,6 @@ ### # #%L -# Chorem webmotion -# $Id: log4j.properties 410 2014-04-09 14:29:44Z ymartel $ -# $HeadURL: https://svn.chorem.org/chorem/trunk/chorem-webmotion/src/main/resources/log4... $ +# Chorem :: webmotion # %% # Copyright (C) 2011 - 2012 CodeLutin # %% diff --git a/pom.xml b/pom.xml index ef712db..b16d0f4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>5.1</version> + <artifactId>chorempom</artifactId> + <version>1.5</version> </parent> <groupId>org.chorem</groupId> @@ -15,7 +16,7 @@ <name>Chorem</name> <description>Project management</description> - <url>http://chorem.chorem.org/chorem</url> + <url>http://chorem.chorem.org</url> <inceptionYear>2011</inceptionYear> <licenses> <license> @@ -74,26 +75,26 @@ </developers> <modules> - <module>chorem-entities</module> - <module>chorem-webmotion</module> + <module>chorem-entities</module> + <module>chorem-webmotion</module> </modules> <scm> - <connection>scm:svn:http://svn.chorem.org/chorem/tags/chorem-0.3</connection> + <connection>scm:git:http://git.chorem.org/chorem.git</connection> <developerConnection> - scm:svn:http://svn.chorem.org/chorem/tags/chorem-0.3 + scm:git:https://git.chorem.org/chorem.git </developerConnection> - <url>http://www.chorem.org/repositories/browse/chorem/tags/chorem-0.3</url> + <url>https://gitweb.chorem.org/chorem.git</url> </scm> <distributionManagement> <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> <properties> - <platform>chorem.org</platform> + <projectId>chorem</projectId> <guavaVersion>18.0</guavaVersion> @@ -109,8 +110,6 @@ <processPluginVersion>1.1</processPluginVersion> <eugenePluginVersion>2.7.4</eugenePluginVersion> - <sitePluginVersion>3.3</sitePluginVersion> <!-- must override lower version to avoid a NoClassDefFoundError from jrst --> - <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> @@ -125,6 +124,9 @@ <nuitonjsJqplot.version>1.0.8r1250-1</nuitonjsJqplot.version> <nuitonjsBootstrap.version>3.2.0-1</nuitonjsBootstrap.version> + <!--Documentation locale --> + <locales>fr</locales> + <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> @@ -149,9 +151,9 @@ </releases> <snapshots> <enabled>true</enabled> - </snapshots> + </snapshots> </repository> - + </repositories> <pluginRepositories> @@ -170,163 +172,224 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>${jstlVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>${opencsvVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - <version>${nuitonConfigVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-csv</artifactId> - <version>${nuitonCsvVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - <version>${nuitonWebVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${wikittyVersion}</version> - </dependency> - - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>${javaxMailVersion}</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servletApiVersion}</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>${jspApiVersion}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${wikittyVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${wikittyVersion}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-wro</artifactId> - <version>${nuitonjsWro.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angularjs</artifactId> - <version>${nuitonjsAngularjs.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - <version>${nuitonjsJquery.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-ui</artifactId> - <version>${nuitonjsJqueryui.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jqplot</artifactId> - <version>${nuitonjsJqplot.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-bootstrap</artifactId> - <version>${nuitonjsBootstrap.version}</version> - <scope>runtime</scope> - </dependency> - <!-- <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-tokeninput</artifactId> - <version>1.6.0.0-1-SNAPSHOT</version> - </dependency> --> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gsonVersion}</version> - </dependency> - - <dependency> - <groupId>org.debux.webmotion</groupId> - <artifactId>webmotion</artifactId> - <version>${webmotionVersion}</version> - </dependency> - - <dependency> - <groupId>org.debux.webmotion</groupId> - <artifactId>webmotion-extra-sitemesh</artifactId> - <version>${webmotionVersion}</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>${jstlVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${opencsvVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonConfigVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + <version>${nuitonCsvVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${javaxMailVersion}</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletApiVersion}</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspApiVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${wikittyVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${wikittyVersion}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-wro</artifactId> + <version>${nuitonjsWro.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-angularjs</artifactId> + <version>${nuitonjsAngularjs.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery</artifactId> + <version>${nuitonjsJquery.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery-ui</artifactId> + <version>${nuitonjsJqueryui.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jqplot</artifactId> + <version>${nuitonjsJqplot.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-bootstrap</artifactId> + <version>${nuitonjsBootstrap.version}</version> + <scope>runtime</scope> + </dependency> + <!-- <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery-tokeninput</artifactId> + <version>1.6.0.0-1-SNAPSHOT</version> + </dependency> --> + + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gsonVersion}</version> + </dependency> + + <dependency> + <groupId>org.debux.webmotion</groupId> + <artifactId>webmotion</artifactId> + <version>${webmotionVersion}</version> + </dependency> + + <dependency> + <groupId>org.debux.webmotion</groupId> + <artifactId>webmotion-extra-sitemesh</artifactId> + <version>${webmotionVersion}</version> + </dependency> + + <dependency> + <groupId>org.parboiled</groupId> + <artifactId>parboiled-core</artifactId> + <version>1.1.6</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.3</version> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>18.0</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> </dependencies> @@ -379,47 +442,4 @@ </pluginManagement> </build> - <profiles> - - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - - <!-- - The Project Info Reports Plugin has twelve goals: - see http://maven.apache.org/plugins/maven-project-info-reports-plugin - --> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - </plugins> - </reporting> - - </profile> - - </profiles> </project> diff --git a/src/site/rst/calculations.rst b/src/site/rst/calculations.rst index 25066f7..312b29f 100644 --- a/src/site/rst/calculations.rst +++ b/src/site/rst/calculations.rst @@ -1,8 +1,6 @@ .. - .. * #%L .. * Chorem -.. * $Id$ -.. * $HeadURL$ .. * %% .. * Copyright (C) 2011 - 2014 CodeLutin .. * %% diff --git a/src/site/rst/chorem-cdc.rst b/src/site/rst/chorem-cdc.rst index 5899829..a81b3f3 100644 --- a/src/site/rst/chorem-cdc.rst +++ b/src/site/rst/chorem-cdc.rst @@ -1,8 +1,6 @@ .. - .. * #%L -.. * chorem -.. * $Id$ -.. * $HeadURL$ +.. * Chorem .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% diff --git a/src/site/rst/doc-devel.rst b/src/site/rst/doc-devel.rst index 3007a16..3cb1c9a 100644 --- a/src/site/rst/doc-devel.rst +++ b/src/site/rst/doc-devel.rst @@ -1,8 +1,6 @@ .. - .. * #%L -.. * chorem -.. * $Id$ -.. * $HeadURL$ +.. * Chorem .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 0645106..c74c160 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -1,8 +1,6 @@ .. - .. * #%L -.. * chorem -.. * $Id$ -.. * $HeadURL$ +.. * Chorem .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% @@ -23,4 +21,4 @@ ====== Chorem ====== -TODO en exercice \ No newline at end of file +TODO en exercice diff --git a/src/site/rst/requisite.rst b/src/site/rst/requisite.rst index 2c42332..44a55a4 100644 --- a/src/site/rst/requisite.rst +++ b/src/site/rst/requisite.rst @@ -1,8 +1,6 @@ .. - .. * #%L -.. * chorem -.. * $Id$ -.. * $HeadURL$ +.. * Chorem .. * %% .. * Copyright (C) 2011 - 2012 CodeLutin .. * %% diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..078c8c9 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,69 @@ +<!-- + #%L + Chorem + %% + Copyright (C) 2011 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <src>logo.jpg</src> + <name>${project.name}</name> + <href>index.html</href> + <alt>Chorem</alt> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> + </poweredBy> + + <body> + + <links> + <item name="Français" href="index.html"/> + <item name="English" href="en/index.html"/> + <item name="nuiton.org" href="https://forge.nuiton.org"/> + <item name="chorem.org" href="https://forge.chorem.org"/> + <item name="CodeLutin" href="https://codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/s/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + + <menu ref="modules"/> + <menu ref="reports"/> + + </body> + +</project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml deleted file mode 100644 index 5d3a204..0000000 --- a/src/site/site_fr.xml +++ /dev/null @@ -1,113 +0,0 @@ -<!-- - #%L - chorem - $Id$ - $HeadURL$ - %% - Copyright (C) 2011 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<project name="${project.name}"> - - <bannerLeft> - <src alt="Chorem">logo.jpg</src> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> - - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="images/logos/restructuredtext-logo.png"/> - - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/logos/jrst-logo.png"/> - - <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/logos/argouml-logo.png"/> - </poweredBy> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> - </breadcrumbs> - - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="chorem.org" href="http://www.chorem.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - - <menu name="Utilisateurs"> - <item name="Accueil" href="index.html"/> - <item name="CDC" href="chorem-cdc.html"/> - <item name="requisite" href="requisite.html"/> - <item name="calculs" href="calculations.html"/> - </menu> - - <menu ref="reports"/> - - <footer> - - <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - - </body> - -</project> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm