This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit e5a11797f0a3cf7d981ce071b09d293b89dbfd76 Merge: 99645a0 ca8ad65 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 27 11:05:33 2014 +0200 Merge branch 'release/2.0-alpha-1' .gitignore | 10 + README.txt | 3 + changelog.txt | 6 + pollen-persistence/pom.xml | 11 +- ...Dao.java => PollenTopiaApplicationContext.java} | 23 +- .../persistence/PollenTopiaPersistenceContext.java | 4 +- .../pollen/persistence/entity/ChoiceTopiaDao.java | 27 +- .../{ChoiceTopiaDao.java => CommentTopiaDao.java} | 15 +- ...oiceTopiaDao.java => FavoriteListTopiaDao.java} | 19 +- .../pollen/persistence/entity/PollTopiaDao.java | 71 +- .../persistence/entity/PollenResourceTopiaDao.java | 62 + .../persistence/entity/PollenUserTopiaDao.java | 23 +- .../persistence/entity/SessionTokenTopiaDao.java | 17 + .../pollen/persistence/entity/VoteToChoices.java | 21 + ...SessionTokenTopiaDao.java => VoteTopiaDao.java} | 13 +- ...{ChoiceTopiaDao.java => VoterListTopiaDao.java} | 19 +- pollen-persistence/src/main/xmi/pollen.properties | 34 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 18495 -> 20954 bytes README.txt => pollen-rest-api/INSTALL.txt | 15 +- pollen-rest-api/pom.xml | 69 +- .../org/chorem/pollen/rest/api/JsonHelper.java | 276 +++ .../org/chorem/pollen/rest/api/PollenRender.java | 56 +- .../rest/api/PollenRestApiApplicationContext.java | 19 +- .../rest/api/PollenRestApiApplicationListener.java | 79 +- .../rest/api/PollenRestApiRequestFilter.java | 40 +- .../chorem/pollen/rest/api/PollenRestApiUtil.java | 71 +- .../pollen/rest/api/converter/DateConverter.java | 34 +- .../rest/api/converter/JsonArrayConverter.java | 59 +- .../pollen/rest/api/converter/JsonConverter.java | 62 +- .../rest/api/injector/PollenBeanIdInjector.java | 70 + .../PollenRestApiRequestContextInjector.java | 53 + .../rest/api/injector/PollenServiceInjector.java | 55 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 17 +- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 25 +- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 28 +- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 10 + .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 56 +- .../org/chorem/pollen/rest/api/v1/PollApi.java | 52 +- .../pollen/rest/api/v1/PollenResourceApi.java | 136 ++ .../chorem/pollen/rest/api/v1/PollenUserApi.java | 48 +- .../org/chorem/pollen/rest/api/v1/VoteApi.java | 32 +- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 16 +- ...teCountingApi.java => VoteCountingTypeApi.java} | 26 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 63 +- pollen-rest-api/src/main/resources/default.jpg | Bin 0 -> 8374 bytes pollen-rest-api/src/main/resources/mapping | 145 +- .../src/main/resources/pollen-rest-api.properties | 2 + .../pollen/rest/api/AbstractPollenRestApiTest.java | 27 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 111 ++ .../org/chorem/pollen/rest/api/PollApiTest.java | 63 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 42 +- .../rest/api/converter/JsonArrayConverterTest.java | 34 +- .../rest/api/converter/JsonConverterTest.java | 17 +- pollen-services/pom.xml | 23 +- pollen-services/src/license/THIRD-PARTY.properties | 12 +- .../services/DefaultPollenServiceContext.java | 12 + .../pollen/services/PollenApplicationContext.java | 3 + .../pollen/services/PollenServiceContext.java | 3 + .../pollen/services/TopiaEntityCopyVisitor.java | 2 +- .../chorem/pollen/services/bean/ChoiceBean.java | 97 +- .../pollen/services/bean/ChoiceScoreBean.java | 94 + .../chorem/pollen/services/bean/CommentBean.java | 31 +- .../chorem/pollen/services/bean/CreateBeanRef.java | 96 - .../pollen/services/bean/FavoriteListBean.java | 67 +- .../services/bean/FavoriteListMemberBean.java | 29 +- .../services/bean/GroupVoteCountingResultBean.java | 69 + .../services/bean/PaginationParameterBean.java | 107 ++ .../pollen/services/bean/PaginationResultBean.java | 83 + .../org/chorem/pollen/services/bean/PollBean.java | 80 +- .../chorem/pollen/services/bean/PollenBean.java | 58 +- .../chorem/pollen/services/bean/PollenBeans.java | 120 ++ .../pollen/services/bean/PollenEntityId.java | 137 ++ .../pollen/services/bean/PollenEntityRef.java | 129 ++ .../pollen/services/bean/PollenUserBean.java | 53 +- .../pollen/services/bean/ResourceFileBean.java | 129 ++ .../pollen/services/bean/ResourceMetaBean.java | 89 + .../pollen/services/bean/ResourceStreamBean.java | 123 ++ .../org/chorem/pollen/services/bean/VoteBean.java | 94 +- .../services/bean/VoteCountingGroupResultBean.java | 96 + .../services/bean/VoteCountingResultBean.java | 82 + .../pollen/services/bean/VoteCountingTypeBean.java | 96 + .../pollen/services/bean/VoteToChoiceBean.java | 47 +- .../chorem/pollen/services/bean/VoterListBean.java | 58 +- .../pollen/services/bean/VoterListMemberBean.java | 46 +- .../chorem/pollen/services/bean/package-info.java | 4 +- .../services/config/PollenServiceConfig.java | 68 + .../services/config/PollenServiceConfigOption.java | 101 + .../pollen/services/service/AuthService.java | 93 - .../pollen/services/service/ChoiceService.java | 174 +- .../pollen/services/service/CommentService.java | 84 +- .../FavoriteListImport.java} | 24 +- .../service/FavoriteListImportFromFile.java | 173 ++ .../service/FavoriteListImportFromLdap.java | 155 ++ .../services/service/FavoriteListService.java | 413 ++--- .../pollen/services/service/FixturesService.java | 6 +- .../services/service/NotificationService.java | 40 +- .../pollen/services/service/PollService.java | 302 +-- .../services/service/PollenResourceService.java | 144 ++ .../services/service/PollenServiceSupport.java | 128 +- .../services/service/PollenUIUrlRenderService.java | 98 + .../pollen/services/service/PollenUserService.java | 234 ++- .../services/service/VoteCountingService.java | 253 ++- .../services/service/VoteCountingTypeService.java | 88 + .../pollen/services/service/VoteService.java | 238 ++- .../pollen/services/service/VoterListService.java | 293 ++- .../services/service/mail/ChoiceAddedEmail.java | 2 +- .../services/service/mail/ChoiceDeletedEmail.java | 2 +- .../services/service/mail/ChoiceEditedEmail.java | 2 +- .../services/service/mail/CommentAddedEmail.java | 2 +- .../services/service/mail/CommentDeletedEmail.java | 2 +- .../services/service/mail/CommentEditedEmail.java | 2 +- .../pollen/services/service/mail/EmailService.java | 26 +- .../services/service/mail/LostPasswordEmail.java | 17 +- .../service/mail/PollChoicePeriodEndedEmail.java | 2 +- .../service/mail/PollChoicePeriodStartedEmail.java | 2 +- .../services/service/mail/PollClosedEmail.java | 2 +- .../services/service/mail/PollCreatedEmail.java | 22 +- .../service/mail/PollVotePeriodEndedEmail.java | 2 +- .../service/mail/PollVotePeriodStartedEmail.java | 2 +- .../service/mail/PollVoteReminderEmail.java | 2 +- .../mail/RestrictedPollInvitationEmail.java | 2 +- .../service/mail/UserAccountCreatedEmail.java | 33 +- .../services/service/mail/VoteAddedEmail.java | 2 +- .../services/service/mail/VoteDeletedEmail.java | 2 +- .../services/service/mail/VoteEditedEmail.java | 2 +- .../services/service/security/PermissionVerb.java | 2 + .../service/security/PollenSecurityRealm.java | 15 +- .../services/service/security/SecurityService.java | 296 ++- .../test/FakePollenApplicationContext.java | 25 +- .../services/test/FakePollenSecurityContext.java | 16 +- .../services/test/FakePollenServiceContext.java | 10 +- .../resources/email/LostPasswordEmail.mustache | 8 + .../resources/email/LostPasswordEmail_fr.mustache | 8 + ...wordEmail.mustache => PollClosedEmail.mustache} | 0 ...dEmail.mustache => PollClosedEmail_fr.mustache} | 0 .../main/resources/email/PollCreatedEmail.mustache | 15 + .../resources/email/PollCreatedEmail_fr.mustache | 15 + .../email/UserAccountCreatedEmail.mustache | 10 + .../email/UserAccountCreatedEmail_fr.mustache | 10 + pollen-services/src/main/resources/fixtures.yaml | 7 +- .../i18n/pollen-services_en_GB.properties | 55 +- .../i18n/pollen-services_fr_FR.properties | 55 +- .../pollen/services/AbstractPollenServiceTest.java | 30 + .../services/service/FavoriteListServiceTest.java | 361 ++++ .../pollen/services/service/PollServiceTest.java | 661 ++++--- .../service/PollenUIUrlRenderServiceTest.java | 100 + .../services/service/PollenUserServiceTest.java | 91 +- .../services/service/VoteCountingServiceTest.java | 146 ++ .../pollen/services/service/VoteServiceTest.java | 25 +- .../services/service/VoterListServiceTest.java | 210 +++ .../src/test/resources/pollen-services.properties | 2 + pollen-ui-angular/.bowerrc | 5 + pollen-ui-angular/.gitignore | 8 + pollen-ui-angular/INSTALL.txt | 17 + pollen-ui-angular/README.txt | 46 +- pollen-ui-angular/bower.json | 30 + pollen-ui-angular/package.json | 22 + pollen-ui-angular/pollen-ui-angular.iml | 16 - pollen-ui-angular/pom.xml | 222 ++- .../src/main/resources/nuiton-js/wro.properties | 26 - pollen-ui-angular/src/main/version.txt | 1 + pollen-ui-angular/src/main/webapp/WEB-INF/web.xml | 21 + .../src/main/webapp/bundle/Messages.properties | 196 -- pollen-ui-angular/src/main/webapp/css/style.css | 198 -- pollen-ui-angular/src/main/webapp/i18n/en.js | 315 ++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 316 ++++ .../src/main/webapp/img/chart-icon.png | Bin 0 -> 610 bytes pollen-ui-angular/src/main/webapp/img/en.png | Bin 0 -> 599 bytes pollen-ui-angular/src/main/webapp/img/fr.png | Bin 0 -> 545 bytes .../src/main/webapp/img/glyphicons_050_link.png | Bin 1410 -> 0 bytes pollen-ui-angular/src/main/webapp/img/pie-icon.png | Bin 0 -> 1292 bytes pollen-ui-angular/src/main/webapp/index.html | 195 +- pollen-ui-angular/src/main/webapp/js/app.js | 218 ++- .../src/main/webapp/js/conf.js.example | 48 + .../src/main/webapp/js/conf.js.exemple | 4 - .../src/main/webapp/js/controllers/alertCtrl.js | 148 ++ .../main/webapp/js/controllers/favoriteListCtrl.js | 241 +++ .../src/main/webapp/js/controllers/localeCtrl.js | 70 + .../src/main/webapp/js/controllers/mainCtrl.js | 21 +- .../src/main/webapp/js/controllers/pollCtrl.js | 1943 ++++++++++++++++++-- .../src/main/webapp/js/controllers/userCtrl.js | 259 +++ pollen-ui-angular/src/main/webapp/js/directives.js | 721 ++++++++ .../src/main/webapp/js/libs/ckeditor/CHANGES.md | 457 ----- .../src/main/webapp/js/libs/ckeditor/LICENSE.md | 1264 ------------- .../src/main/webapp/js/libs/ckeditor/README.md | 39 - .../webapp/js/libs/ckeditor/adapters/jquery.js | 10 - .../main/webapp/js/libs/ckeditor/build-config.js | 141 -- .../src/main/webapp/js/libs/ckeditor/ckeditor.js | 904 --------- .../src/main/webapp/js/libs/ckeditor/config.js | 20 + .../src/main/webapp/js/libs/ckeditor/contents.css | 123 -- .../src/main/webapp/js/libs/ckeditor/lang/af.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ar.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/bg.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/bn.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/bs.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ca.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/cs.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/cy.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/da.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/de.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/el.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/en-au.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/en-ca.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/en-gb.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/en.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/eo.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/es.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/et.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/eu.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/fa.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/fi.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/fo.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/fr-ca.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/fr.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/gl.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/gu.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/he.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/hi.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/hr.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/hu.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/id.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/is.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/it.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ja.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ka.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/km.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ko.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ku.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/lt.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/lv.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/mk.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/mn.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ms.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/nb.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/nl.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/no.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/pl.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/pt-br.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/pt.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ro.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ru.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/si.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/sk.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/sl.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/sq.js | 5 - .../main/webapp/js/libs/ckeditor/lang/sr-latn.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/sr.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/sv.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/th.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/tr.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/ug.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/uk.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/vi.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/zh-cn.js | 5 - .../src/main/webapp/js/libs/ckeditor/lang/zh.js | 5 - .../ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js | 10 - .../a11yhelp/dialogs/lang/_translationstatus.txt | 25 - .../ckeditor/plugins/a11yhelp/dialogs/lang/ar.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/bg.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/ca.js | 13 - .../ckeditor/plugins/a11yhelp/dialogs/lang/cs.js | 13 - .../ckeditor/plugins/a11yhelp/dialogs/lang/cy.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/da.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/de.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/el.js | 13 - .../plugins/a11yhelp/dialogs/lang/en-gb.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/en.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/eo.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/es.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/et.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/fa.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/fi.js | 12 - .../plugins/a11yhelp/dialogs/lang/fr-ca.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/fr.js | 13 - .../ckeditor/plugins/a11yhelp/dialogs/lang/gl.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/gu.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/he.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/hi.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/hr.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/hu.js | 13 - .../ckeditor/plugins/a11yhelp/dialogs/lang/id.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/it.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/ja.js | 9 - .../ckeditor/plugins/a11yhelp/dialogs/lang/km.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/ko.js | 10 - .../ckeditor/plugins/a11yhelp/dialogs/lang/ku.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/lt.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/lv.js | 13 - .../ckeditor/plugins/a11yhelp/dialogs/lang/mk.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/mn.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/nb.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/nl.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/no.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/pl.js | 13 - .../plugins/a11yhelp/dialogs/lang/pt-br.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/pt.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/ro.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/ru.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/si.js | 10 - .../ckeditor/plugins/a11yhelp/dialogs/lang/sk.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/sl.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/sq.js | 11 - .../plugins/a11yhelp/dialogs/lang/sr-latn.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/sr.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/sv.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/th.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/tr.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/ug.js | 11 - .../ckeditor/plugins/a11yhelp/dialogs/lang/uk.js | 12 - .../ckeditor/plugins/a11yhelp/dialogs/lang/vi.js | 11 - .../plugins/a11yhelp/dialogs/lang/zh-cn.js | 9 - .../ckeditor/plugins/a11yhelp/dialogs/lang/zh.js | 10 - .../libs/ckeditor/plugins/about/dialogs/about.js | 7 - .../plugins/about/dialogs/hidpi/logo_ckeditor.png | Bin 13339 -> 0 bytes .../plugins/about/dialogs/logo_ckeditor.png | Bin 6757 -> 0 bytes .../ckeditor/plugins/clipboard/dialogs/paste.js | 11 - .../ckeditor/plugins/dialog/dialogDefinition.js | 4 - .../ckeditor/plugins/fakeobjects/images/spacer.gif | Bin 43 -> 0 bytes .../main/webapp/js/libs/ckeditor/plugins/icons.png | Bin 10030 -> 0 bytes .../js/libs/ckeditor/plugins/icons_hidpi.png | Bin 34465 -> 0 bytes .../libs/ckeditor/plugins/image/dialogs/image.js | 43 - .../libs/ckeditor/plugins/image/images/noimage.png | Bin 2115 -> 0 bytes .../libs/ckeditor/plugins/link/dialogs/anchor.js | 8 - .../js/libs/ckeditor/plugins/link/dialogs/link.js | 35 - .../libs/ckeditor/plugins/link/images/anchor.png | Bin 763 -> 0 bytes .../ckeditor/plugins/link/images/hidpi/anchor.png | Bin 1597 -> 0 bytes .../plugins/magicline/images/hidpi/icon.png | Bin 260 -> 0 bytes .../ckeditor/plugins/magicline/images/icon.png | Bin 172 -> 0 bytes .../plugins/pastefromword/filter/default.js | 31 - .../js/libs/ckeditor/plugins/scayt/LICENSE.md | 28 - .../js/libs/ckeditor/plugins/scayt/README.md | 25 - .../libs/ckeditor/plugins/scayt/dialogs/options.js | 20 - .../ckeditor/plugins/scayt/dialogs/toolbar.css | 71 - .../dialogs/lang/_translationstatus.txt | 20 - .../plugins/specialchar/dialogs/lang/ar.js | 13 - .../plugins/specialchar/dialogs/lang/bg.js | 13 - .../plugins/specialchar/dialogs/lang/ca.js | 14 - .../plugins/specialchar/dialogs/lang/cs.js | 13 - .../plugins/specialchar/dialogs/lang/cy.js | 14 - .../plugins/specialchar/dialogs/lang/de.js | 13 - .../plugins/specialchar/dialogs/lang/el.js | 13 - .../plugins/specialchar/dialogs/lang/en-gb.js | 13 - .../plugins/specialchar/dialogs/lang/en.js | 13 - .../plugins/specialchar/dialogs/lang/eo.js | 12 - .../plugins/specialchar/dialogs/lang/es.js | 13 - .../plugins/specialchar/dialogs/lang/et.js | 13 - .../plugins/specialchar/dialogs/lang/fa.js | 12 - .../plugins/specialchar/dialogs/lang/fi.js | 13 - .../plugins/specialchar/dialogs/lang/fr-ca.js | 10 - .../plugins/specialchar/dialogs/lang/fr.js | 11 - .../plugins/specialchar/dialogs/lang/gl.js | 13 - .../plugins/specialchar/dialogs/lang/he.js | 12 - .../plugins/specialchar/dialogs/lang/hr.js | 13 - .../plugins/specialchar/dialogs/lang/hu.js | 12 - .../plugins/specialchar/dialogs/lang/id.js | 13 - .../plugins/specialchar/dialogs/lang/it.js | 14 - .../plugins/specialchar/dialogs/lang/ja.js | 9 - .../plugins/specialchar/dialogs/lang/km.js | 13 - .../plugins/specialchar/dialogs/lang/ku.js | 13 - .../plugins/specialchar/dialogs/lang/lv.js | 13 - .../plugins/specialchar/dialogs/lang/nb.js | 11 - .../plugins/specialchar/dialogs/lang/nl.js | 13 - .../plugins/specialchar/dialogs/lang/no.js | 11 - .../plugins/specialchar/dialogs/lang/pl.js | 12 - .../plugins/specialchar/dialogs/lang/pt-br.js | 11 - .../plugins/specialchar/dialogs/lang/pt.js | 13 - .../plugins/specialchar/dialogs/lang/ru.js | 13 - .../plugins/specialchar/dialogs/lang/si.js | 13 - .../plugins/specialchar/dialogs/lang/sk.js | 13 - .../plugins/specialchar/dialogs/lang/sl.js | 12 - .../plugins/specialchar/dialogs/lang/sq.js | 13 - .../plugins/specialchar/dialogs/lang/sv.js | 11 - .../plugins/specialchar/dialogs/lang/th.js | 13 - .../plugins/specialchar/dialogs/lang/tr.js | 12 - .../plugins/specialchar/dialogs/lang/ug.js | 13 - .../plugins/specialchar/dialogs/lang/uk.js | 12 - .../plugins/specialchar/dialogs/lang/vi.js | 14 - .../plugins/specialchar/dialogs/lang/zh-cn.js | 9 - .../plugins/specialchar/dialogs/lang/zh.js | 12 - .../plugins/specialchar/dialogs/specialchar.js | 14 - .../libs/ckeditor/plugins/table/dialogs/table.js | 21 - .../plugins/tabletools/dialogs/tableCell.js | 17 - .../webapp/js/libs/ckeditor/plugins/wsc/LICENSE.md | 28 - .../webapp/js/libs/ckeditor/plugins/wsc/README.md | 25 - .../libs/ckeditor/plugins/wsc/dialogs/ciframe.html | 66 - .../js/libs/ckeditor/plugins/wsc/dialogs/tmp.html | 118 -- .../ckeditor/plugins/wsc/dialogs/tmpFrameset.html | 52 - .../js/libs/ckeditor/plugins/wsc/dialogs/wsc.css | 82 - .../js/libs/ckeditor/plugins/wsc/dialogs/wsc.js | 67 - .../js/libs/ckeditor/plugins/wsc/dialogs/wsc_ie.js | 11 - .../main/webapp/js/libs/ckeditor/samples/ajax.html | 82 - .../main/webapp/js/libs/ckeditor/samples/api.html | 207 --- .../webapp/js/libs/ckeditor/samples/appendto.html | 57 - .../ckeditor/samples/assets/inlineall/logo.png | Bin 4411 -> 0 bytes .../samples/assets/outputxhtml/outputxhtml.css | 204 -- .../js/libs/ckeditor/samples/assets/posteddata.php | 59 - .../js/libs/ckeditor/samples/assets/sample.css | 3 - .../js/libs/ckeditor/samples/assets/sample.jpg | Bin 17932 -> 0 bytes .../samples/assets/uilanguages/languages.js | 7 - .../js/libs/ckeditor/samples/datafiltering.html | 401 ---- .../js/libs/ckeditor/samples/divreplace.html | 141 -- .../webapp/js/libs/ckeditor/samples/index.html | 128 -- .../webapp/js/libs/ckeditor/samples/inlineall.html | 311 ---- .../js/libs/ckeditor/samples/inlinebycode.html | 121 -- .../js/libs/ckeditor/samples/inlinetextarea.html | 110 -- .../webapp/js/libs/ckeditor/samples/jquery.html | 100 - .../samples/plugins/dialog/assets/my_dialog.js | 48 - .../ckeditor/samples/plugins/dialog/dialog.html | 187 -- .../samples/plugins/enterkey/enterkey.html | 103 -- .../assets/outputforflash/outputforflash.fla | Bin 85504 -> 0 bytes .../assets/outputforflash/outputforflash.swf | Bin 15571 -> 0 bytes .../htmlwriter/assets/outputforflash/swfobject.js | 18 - .../samples/plugins/htmlwriter/outputforflash.html | 280 --- .../samples/plugins/htmlwriter/outputhtml.html | 221 --- .../samples/plugins/magicline/magicline.html | 206 --- .../ckeditor/samples/plugins/toolbar/toolbar.html | 232 --- .../samples/plugins/wysiwygarea/fullpage.html | 77 - .../webapp/js/libs/ckeditor/samples/readonly.html | 73 - .../js/libs/ckeditor/samples/replacebyclass.html | 57 - .../js/libs/ckeditor/samples/replacebycode.html | 56 - .../webapp/js/libs/ckeditor/samples/sample.css | 356 ---- .../main/webapp/js/libs/ckeditor/samples/sample.js | 50 - .../js/libs/ckeditor/samples/sample_posteddata.php | 16 - .../webapp/js/libs/ckeditor/samples/tabindex.html | 75 - .../webapp/js/libs/ckeditor/samples/uicolor.html | 69 - .../js/libs/ckeditor/samples/uilanguages.html | 119 -- .../js/libs/ckeditor/samples/xhtmlstyle.html | 231 --- .../webapp/js/libs/ckeditor/skins/moono/dialog.css | 5 - .../js/libs/ckeditor/skins/moono/dialog_ie.css | 5 - .../js/libs/ckeditor/skins/moono/dialog_ie7.css | 5 - .../js/libs/ckeditor/skins/moono/dialog_ie8.css | 5 - .../libs/ckeditor/skins/moono/dialog_iequirks.css | 5 - .../js/libs/ckeditor/skins/moono/dialog_opera.css | 5 - .../webapp/js/libs/ckeditor/skins/moono/editor.css | 5 - .../js/libs/ckeditor/skins/moono/editor_gecko.css | 5 - .../js/libs/ckeditor/skins/moono/editor_ie.css | 5 - .../js/libs/ckeditor/skins/moono/editor_ie7.css | 5 - .../js/libs/ckeditor/skins/moono/editor_ie8.css | 5 - .../libs/ckeditor/skins/moono/editor_iequirks.css | 5 - .../webapp/js/libs/ckeditor/skins/moono/icons.png | Bin 10030 -> 0 bytes .../js/libs/ckeditor/skins/moono/icons_hidpi.png | Bin 34465 -> 0 bytes .../js/libs/ckeditor/skins/moono/images/arrow.png | Bin 261 -> 0 bytes .../js/libs/ckeditor/skins/moono/images/close.png | Bin 824 -> 0 bytes .../ckeditor/skins/moono/images/hidpi/close.png | Bin 1792 -> 0 bytes .../skins/moono/images/hidpi/lock-open.png | Bin 1503 -> 0 bytes .../ckeditor/skins/moono/images/hidpi/lock.png | Bin 1616 -> 0 bytes .../ckeditor/skins/moono/images/hidpi/refresh.png | Bin 2320 -> 0 bytes .../libs/ckeditor/skins/moono/images/lock-open.png | Bin 736 -> 0 bytes .../js/libs/ckeditor/skins/moono/images/lock.png | Bin 728 -> 0 bytes .../libs/ckeditor/skins/moono/images/refresh.png | Bin 953 -> 0 bytes .../webapp/js/libs/ckeditor/skins/moono/readme.md | 51 - .../src/main/webapp/js/libs/ckeditor/styles.js | 111 -- .../main/webapp/js/scripts/sticky-inline-poll.js | 23 +- pollen-ui-angular/src/main/webapp/js/services.js | 416 ++++- pollen-ui-angular/src/main/webapp/less/style.less | 639 +++++++ .../src/main/webapp/less/variables.less | 122 ++ .../webapp/partials/{home.html => alerts.html} | 20 +- .../src/main/webapp/partials/big-poll.html | 66 +- .../partials/dateTimePicker.html} | 28 +- .../main/webapp/partials/favoriteList-edit.html | 84 + .../partials/{home.html => favoriteList-list.html} | 19 +- .../src/main/webapp/partials/home.html | 19 +- .../src/main/webapp/partials/inline-poll.html | 163 +- .../webapp/partials/{home.html => pagination.html} | 16 +- .../src/main/webapp/partials/poll-comment.html | 79 + .../src/main/webapp/partials/poll-info.html | 70 + .../src/main/webapp/partials/poll-link.html | 84 + .../src/main/webapp/partials/poll-list.html | 52 +- .../main/webapp/partials/poll-listParticipant.html | 119 ++ .../src/main/webapp/partials/poll-poll.html | 54 + .../src/main/webapp/partials/poll-popupChoice.html | 29 +- .../src/main/webapp/partials/poll-result.html | 91 + .../src/main/webapp/partials/poll-settings.html | 351 +++- .../src/main/webapp/partials/poll.html | 74 +- .../partials/{home.html => printResource.html} | 21 +- .../src/main/webapp/partials/user-admin-list.html | 60 + .../src/main/webapp/partials/user-edit.html | 108 ++ .../src/main/webapp/partials/user-login.html | 52 + .../main/webapp/partials/user-lostPassword.html | 45 + .../src/main/webapp/partials/user-register.html | 87 + .../src/test/karma.conf.ci.js | 32 +- pollen-ui-angular/src/test/karma.conf.js | 112 ++ .../src/test/unit/alertControllersTest.js | 141 ++ .../src/test/unit/pollControllersTest.js | 518 ++++++ pollen-ui-js/.gitignore | 2 + pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-aggregator/pom.xml | 7 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-api/pom.xml | 3 +- .../chorem/pollen/votecounting/VoteCounting.java | 10 +- .../pollen/votecounting/model/GroupOfVoter.java | 1 + .../votecounting/model/VoteCountingResult.java | 10 + pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-borda/pom.xml | 4 +- .../pollen/votecounting/BordaVoteCounting.java | 10 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-condorcet/pom.xml | 4 +- .../pollen/votecounting/CondorcetVoteCounting.java | 14 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-coombs/pom.xml | 4 +- .../pollen/votecounting/CoombsVoteCounting.java | 10 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/pom.xml | 4 +- .../votecounting/InstantRunoffVoteCounting.java | 10 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-normal/pom.xml | 4 +- .../pollen/votecounting/NormalVoteCounting.java | 10 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-number/pom.xml | 4 +- .../pollen/votecounting/NumberVoteCounting.java | 10 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- pollen-votecounting-percentage/pom.xml | 4 +- .../votecounting/PercentageVoteCounting.java | 15 +- pom.xml | 216 ++- src/site/rst/restApi.rst | 21 + 515 files changed, 15810 insertions(+), 13489 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.