This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 57db2f5e correction des URL de ressource + correction onglet de l'édition d'un sondage + lien de pied de page new 969d1afd ajout du type de resource (choix ou screenshot) 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 969d1afd1648d8af7671ed43e0c54d71b916ef35 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Jul 31 17:37:20 2017 +0200 ajout du type de resource (choix ou screenshot) Summary of changes: .../migration/h2/V3_0_0_5__add_type_in_resource.sql | 4 ++++ .../postgresql/V3_0_0_5__add_type_in_resource.sql | 4 ++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 26297 -> 26867 bytes .../pollen/rest/api/beans/Resource64Bean.java | 12 ++++++++++++ .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 10 ++++++++++ .../pollen/services/bean/ResourceFileBean.java | 13 +++++++++++++ .../pollen/services/bean/ResourceMetaBean.java | 13 +++++++++++++ .../services/service/PollenResourceService.java | 2 ++ .../resources/i18n/pollen-services_en_GB.properties | 1 + .../resources/i18n/pollen-services_fr_FR.properties | 1 + pollen-ui-riot-js/src/main/web/js/Poll.js | 2 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 4 ++-- .../src/main/web/js/ResourceService.js | 4 ++-- .../src/main/web/tag/popup/FeedbackModal.tag.html | 3 ++- 15 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_5__add_type_in_resource.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_5__add_type_in_resource.sql -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.