May 2014 - Pollen-commits - mailman.cloud.codelutin.com

01/03: Unified Session Data on one factory
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit ac19052e347992a3e03407507f6fb1229961e618 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 12:15:40 2014 +0200 Unified Session Data on one factory --- pollen-ui-angular/src/main/webapp/js/app.js | 18 +++++----- .../src/main/webapp/js/controllers/userCtrl.js | 11 ++++--- pollen-ui-angular/src/main/webapp/js/services.js | 38 ++++++++++------------ 3 files changed, 31 insertions(+), 36 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 73cdd56..210685e 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -19,31 +19,29 @@ * #L% */ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'ui.bootstrap', 'ngCookies']) -.config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { +.config(['$httpProvider', function($httpProvider) { // edit header for locale and sessionToken $httpProvider.interceptors.push('httpRequestInterceptor'); // edit content-type for send data to the server $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; - //$httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; }]) -.factory('httpRequestInterceptor', ['SessionToken', 'SessionLocale', function (SessionToken, SessionLocale) { +.factory('httpRequestInterceptor', ['SessionStorage', function (SessionStorage) { // set locale with browser preference // default : en - if (SessionLocale.get() == '') { + var session = SessionStorage.get(); + + if (angular.isUndefined(session.locale)) { var locale = navigator.language || navigator.userLanguage || 'en'; - SessionLocale.save(locale.substring(0,2)); + SessionStorage.save({locale:locale.substring(0,2)}); } return { request: function($config) { - var token = SessionToken.get(); - $config.headers['Accept-Language'] = SessionLocale.get(); - if (token != '') { - $config.headers['X-Pollen-Session-Token'] = token; - } + $config.headers['Accept-Language'] = session.locale; + $config.headers['X-Pollen-Session-Token'] = session.token; return $config; } }; diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 328a94a..c05cb4e 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,23 +36,24 @@ } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionToken', function ($scope, UserLogin, UserLogout, User, SessionToken) { - if (!angular.isDefined($scope.data)) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionStorage', function ($scope, UserLogin, UserLogout, User, SessionStorage) { + if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; } $scope.login = function () { UserLogin.login({}, $scope.data.user, function (data) { User.get({userId: data.id}, function (user) { $scope.currentUser = user; + SessionStorage.save({'user':user}); }) - SessionToken.save(data.permission); + SessionStorage.save({'token':data.permission}); }); } $scope.logout = function () { UserLogout.logout(function (data) { - SessionToken.remove(); - delete $scope.currentUser; + SessionStorage.remove('token'); + delete $scope.currentUser; }) } }]) \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 0cd8443..1c5fe2d 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -145,31 +145,27 @@ angular.module('pollenServices', ['ngResource']) }]) -.factory('SessionToken', [function () { - var storageId='sessionTokenStorage'; +.factory('SessionStorage', [function () { + var storageId='sessionStorage'; + var session = JSON.parse(localStorage.getItem(storageId) || '{}'); return { get: function () { - return localStorage.getItem(storageId) || ''; + return session; }, - save: function (token) { - localStorage.setItem(storageId, token); + save: function (data) { + angular.forEach(data, function (value,key) { + session[key] = value; + }) + localStorage.setItem(storageId, JSON.stringify(session)); }, - remove: function () { - localStorage.setItem(storageId, ''); - } - } -}]) -.factory('SessionLocale', [function () { - var storageId='sessionLocaleStorage'; - return { - get: function () { - return localStorage.getItem(storageId) || ''; - }, - save: function (token) { - localStorage.setItem(storageId, token); - }, - remove: function () { - localStorage.setItem(storageId, ''); + remove: function (key) { + if (angular.isString(key)) { + delete session[key]; + } + else { + session = {}; + } + localStorage.setItem(storageId, JSON.stringify(session)); } } }]) \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: improve auth service and make logout works
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 19ae4642cd2bfb90f2ad1f7dd589d22786b6dcf5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed May 21 12:03:22 2014 +0200 improve auth service and make logout works --- .../org/chorem/pollen/rest/api/AuthApiTest.java | 31 ++++++++++++++++++++-- .../services/service/security/SecurityService.java | 8 +++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java index cebcedc..94bb6af 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java @@ -2,13 +2,14 @@ package org.chorem.pollen.rest.api; import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Response; +import org.chorem.pollen.rest.api.converter.JsonConverter; +import org.chorem.pollen.services.bean.CreateBeanRef; import org.junit.Assert; import org.junit.Test; import java.io.IOException; import java.net.URISyntaxException; -import static org.junit.Assert.assertNotNull; /** * Created on 5/20/14. @@ -28,7 +29,33 @@ public class AuthApiTest extends AbstractPollenRestApiTest { String content = request.execute().returnContent().asString(); showTestResult(content); - assertNotNull(content); + Assert.assertNotNull(content); + + } + + @Test + public void loginThenLogout() throws URISyntaxException, IOException { + + Request login = createRequest("/v1/login") + .addParameter("login", "admin") + .addParameter("password", "admin") + .Post(); + + String loginContent = login.execute().returnContent().asString(); + showTestResult(loginContent); + Assert.assertNotNull(loginContent); + + JsonConverter<CreateBeanRef> jsonConverter = JsonConverter.newConverter(CreateBeanRef.class); + CreateBeanRef createBeanRef = jsonConverter.convert(CreateBeanRef.class, loginContent); + Assert.assertNotNull(createBeanRef); + + Request logout = createRequest("/v1/logout").Get(); + logout.addHeader(PollenRestApiRequestFilter.REQUEST_HEADER_SESSION_TOKEN, createBeanRef.getPermission()); + + String logoutContent = logout.execute().returnContent().asString(); + showTestResult(logoutContent); + Assert.assertNotNull(logoutContent); + } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index bc1b27c..46799f8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -78,7 +78,7 @@ public class SecurityService extends PollenServiceSupport { } PollenUser user = getPollenUserDao().forLoginEquals(login).findUnique(); - return copy(user); + return user; } @@ -91,7 +91,7 @@ public class SecurityService extends PollenServiceSupport { subject.logout(); } - return copy(sessionToken); + return sessionToken; } @@ -135,7 +135,7 @@ public class SecurityService extends PollenServiceSupport { throw new PollenInvalidSessionTokenException(); } } - return copy(sessionToken); + return sessionToken; } @@ -145,7 +145,7 @@ public class SecurityService extends PollenServiceSupport { if (principalId != null) { principal = getPollenPrincipalDao().findByPermissionToken(principalId); } - return copy(principal); + return principal; } -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: change cookies to localStorage
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 2698fa6235dcc9372e01d44a70e439a82ef15aa8 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 11:36:19 2014 +0200 change cookies to localStorage --- pollen-ui-angular/src/main/webapp/js/app.js | 15 ++++++----- .../src/main/webapp/js/controllers/userCtrl.js | 6 ++--- pollen-ui-angular/src/main/webapp/js/services.js | 30 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index abd0c0a..73cdd56 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -28,20 +28,23 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC //$httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; }]) -.factory('httpRequestInterceptor', ['$cookies', function ($cookies) { +.factory('httpRequestInterceptor', ['SessionToken', 'SessionLocale', function (SessionToken, SessionLocale) { // set locale with browser preference // default : en - if (!angular.isDefined($cookies.locale)) { + if (SessionLocale.get() == '') { var locale = navigator.language || navigator.userLanguage || 'en'; - $cookies.locale = locale.substring(0,2); + SessionLocale.save(locale.substring(0,2)); } return { request: function($config) { - $config.headers['Accept-Language'] = $cookies.locale; - $config.headers['X-Pollen-Session-Token'] = $cookies.sessionToken; - return $config; + var token = SessionToken.get(); + $config.headers['Accept-Language'] = SessionLocale.get(); + if (token != '') { + $config.headers['X-Pollen-Session-Token'] = token; + } + return $config; } }; }]) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index ba64d3f..328a94a 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,7 +36,7 @@ } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User','$cookies', function ($scope, UserLogin, UserLogout, User,$cookies) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User', 'SessionToken', function ($scope, UserLogin, UserLogout, User, SessionToken) { if (!angular.isDefined($scope.data)) { $scope.data = {user:{}}; } @@ -45,13 +45,13 @@ User.get({userId: data.id}, function (user) { $scope.currentUser = user; }) - $cookies.sessionToken = data.permission; + SessionToken.save(data.permission); }); } $scope.logout = function () { UserLogout.logout(function (data) { - delete $cookies.sessionToken; + SessionToken.remove(); delete $scope.currentUser; }) } diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 34abfe5..0cd8443 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -142,4 +142,34 @@ angular.module('pollenServices', ['ngResource']) method: 'GET' } }) +}]) + + +.factory('SessionToken', [function () { + var storageId='sessionTokenStorage'; + return { + get: function () { + return localStorage.getItem(storageId) || ''; + }, + save: function (token) { + localStorage.setItem(storageId, token); + }, + remove: function () { + localStorage.setItem(storageId, ''); + } + } +}]) +.factory('SessionLocale', [function () { + var storageId='sessionLocaleStorage'; + return { + get: function () { + return localStorage.getItem(storageId) || ''; + }, + save: function (token) { + localStorage.setItem(storageId, token); + }, + remove: function () { + localStorage.setItem(storageId, ''); + } + } }]) \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: Add logout
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit e851357e83cd364143f72e182c85691f86bea18e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 11:05:53 2014 +0200 Add logout --- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 9 ++++++++- pollen-ui-angular/src/main/webapp/js/services.js | 9 +++++++++ pollen-ui-angular/src/main/webapp/partials/poll.html | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index f28caca..70f9b0f 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -81,7 +81,7 @@ <li class="divider" role="presentation"></li> <li role="presentation"> - <a id='menuItemLogout'>Deconnexion</a> + <a ng-click="logout()">Deconnexion</a> </li> </ul> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index b99340b..ba64d3f 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -36,7 +36,7 @@ } }]) -.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'User','$cookies', function ($scope, UserLogin, User,$cookies) { +.controller('UserLoginCtrl', ['$scope', 'UserLogin', 'UserLogout', 'User','$cookies', function ($scope, UserLogin, UserLogout, User,$cookies) { if (!angular.isDefined($scope.data)) { $scope.data = {user:{}}; } @@ -48,4 +48,11 @@ $cookies.sessionToken = data.permission; }); } + + $scope.logout = function () { + UserLogout.logout(function (data) { + delete $cookies.sessionToken; + delete $scope.currentUser; + }) + } }]) \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index d280f9e..34abfe5 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -133,4 +133,13 @@ angular.module('pollenServices', ['ngResource']) } } ); +}]) + +.factory('UserLogout', ['$resource', function ($resource) { + return $resource(conf.restURL+'/logout', {}, + { + 'logout' : { + method: 'GET' + } + }) }]) \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 6a676ba..0363f7a 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -43,7 +43,7 @@ </h1> </div> - <div ng-hide="showEditDesc || !globalVariables.editMode && !poll.description " class="pollDesc" edit-me="showEditDesc"> + <div ng-hide="showEditDesc || !globalVariables.editMode && !data.poll.description " class="pollDesc" edit-me="showEditDesc"> <div ng-bind-html="toHTML(data.poll.description || 'Description (Facultatif). Ce cadre disparait si aucune description n\'est mise')"></div> </div> <div ng-show="showEditDesc" class="pollDesc"> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix createDefaultUsers
by Chorem.org scm May 21, 2014

May 21, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 15ab57b73b376c24c895ef520a57c6927bd85e1e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed May 21 10:14:04 2014 +0200 fix createDefaultUsers --- .../java/org/chorem/pollen/services/service/PollenUserService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index f88aa42..ae50d70 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -169,8 +169,10 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer user.setPassword("admin"); createUser(user, false); + user = new PollenUserBean(); + user.setAdministrator(false); - String login = "user"; + login = "user"; user.setLogin(login); user.setEmail("user(a)pollen.org"); user.setPassword("user"); -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add another default user
by Chorem.org scm May 20, 2014

May 20, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 8ca30c0db982dff126fee6ca244f369c193262d3 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 17:40:14 2014 +0200 add another default user --- .../java/org/chorem/pollen/services/service/PollenUserService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index 02c6fbd..f88aa42 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -169,6 +169,13 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer user.setPassword("admin"); createUser(user, false); + user.setAdministrator(false); + String login = "user"; + user.setLogin(login); + user.setEmail("user(a)pollen.org"); + user.setPassword("user"); + createUser(user, false); + } } -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix style dropdown in navbar
by Chorem.org scm May 20, 2014

May 20, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 474507c475695fb9dfac34633b1fa3c76e3fee1d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 17:21:35 2014 +0200 fix style dropdown in navbar --- pollen-ui-angular/src/main/webapp/css/style.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 506c383..597a98b 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -20,12 +20,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -.dropdown-menu.form { +.navbar .dropdown-menu.form { + width:250px; +} + +.navbar .dropdown-menu { padding: 0; padding-top: 15px; + padding-bottom: 5px; left:auto; right:0px; - width:250px; } .dropdown-menu.form > form { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: Print name or login user when connected
by Chorem.org scm May 20, 2014

May 20, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 93e4c78d5496ae02cefd49a827b9a802cbd96000 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 17:18:50 2014 +0200 Print name or login user when connected --- pollen-ui-angular/src/main/webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index b057de3..f28caca 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -71,7 +71,7 @@ <li class="dropdown" ng-show="currentUser.login"> <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> - {{ currentUser.name }} <strong class="caret"></strong> + {{ currentUser.name || currentUser.login }} <strong class="caret"></strong> </a> <ul class="dropdown-menu" role="menu"> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fix create poll
by Chorem.org scm May 20, 2014

May 20, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 13218a9fa329b0dea46929ddb469026fb2bbf7c1 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 17:14:20 2014 +0200 fix create poll --- pollen-ui-angular/src/main/webapp/js/services.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 7c163ea..d280f9e 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -28,7 +28,7 @@ angular.module('pollenServices', ['ngResource']) var poll = angular.copy(data); delete poll.choice; var choices = angular.copy(data.choice); - return 'poll='+encodeURIComponent(JSON.stringify(poll))+'&choices='+encodeURIComponent(JSON.stringify(choices))+RestInfo; + return 'poll='+encodeURIComponent(JSON.stringify(poll))+'&choices='+encodeURIComponent(JSON.stringify(choices)); } }, 'update' : { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/04: update gitignore
by Chorem.org scm May 20, 2014

May 20, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit f298b23bf03e50499ecd699e9f7a27a11ad1dc28 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 17:03:17 2014 +0200 update gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 63b6d4a..48de85c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,9 @@ atlassian-ide-plugin.xml target/* */target/* + pollen-ui-angular/src/main/webapp/js/conf.js +pollen-ui-js/src/main/webapp/pollen-ui-js.css +pollen-ui-js/src/main/webapp/pollen-ui-js.js + -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0