This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 28bc3c4 delete old resource when editing choice adds 7cbcdac wait send resource before save choice and add icon loader adds 9e27696 show error when no resource has send new 73e7c45 Merge branch 'feature/waitResourceBeforeSave' 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 73e7c4565b009d520773af129d690f69da729eaa Merge: 28bc3c4 9e27696 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 21 16:20:53 2014 +0200 Merge branch 'feature/waitResourceBeforeSave' into develop Summary of changes: pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 5 +- pollen-ui-angular/src/main/webapp/index.html | 3 + .../src/main/webapp/js/controllers/pollCtrl.js | 68 ++++++++++++++++------ pollen-ui-angular/src/main/webapp/js/directives.js | 14 ++++- pollen-ui-angular/src/main/webapp/less/style.less | 13 ++++- .../src/main/webapp/less/variables.less | 4 +- .../src/main/webapp/partials/printResource.html | 2 +- 9 files changed, 86 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.