This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 0be181d Merge branch 'feature/26' into 'develop' adds d8c24f0 Pouvoir configurer le temps de connection (closes #27) new bb9e63d Merge branch 'feature/27' into 'develop' 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 bb9e63deaf539d094d7f3aa322868b1263936e41 Merge: 0be181d d8c24f0 Author: Tony Chemit <chemit@codelutin.com> Date: Sun Jan 1 14:24:47 2017 +0100 Merge branch 'feature/27' into 'develop' Pouvoir configurer le temps de connection (closes #27) See merge request !103 Summary of changes: .../src/main/config/ObserveSwingApplication.ini | 6 +++ ...pplication-swing-configuration_en_GB.properties | 1 + ...pplication-swing-configuration_es_ES.properties | 1 + ...pplication-swing-configuration_fr_FR.properties | 1 + .../swing/db/ObserveSwingDataSource.java | 18 ++----- .../src/main/config/ObserveWebApplication.ini | 6 +++ .../application-web-configuration_en_GB.properties | 1 + .../application-web-configuration_es_ES.properties | 1 + .../application-web-configuration_fr_FR.properties | 1 + .../application/web/ObserveWebMotionFilter.java | 4 +- .../web/request/ObserveWebRequestContext.java | 6 +++ .../services/rest/ObserveServiceFactoryRest.java | 22 ++++----- .../observe/services/rest/http/ObserveRequest.java | 10 +++- .../services/rest/http/ObserveRequestBuilder.java | 9 +++- .../services/rest/http/ObserveResponse.java | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 55 ++++++++++------------ .../services/rest/RestTestClassResource.java | 6 ++- .../services/topia/TopiaTestClassResource.java | 2 + .../services/ObserveServiceInitializer.java | 23 +++++++++ 19 files changed, 112 insertions(+), 63 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.