From e73dfcfea2c19c7c125f9df28fc8269f5f055bb8 Mon Sep 17 00:00:00 2001 From: Samuel Laulhau Date: Mon, 13 Jun 2016 23:16:26 +0200 Subject: [PATCH 1/9] add text wrap to radio option Let natural white space wrap for long option --- public/modules/forms/base/views/directiveViews/field/radio.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/forms/base/views/directiveViews/field/radio.html b/public/modules/forms/base/views/directiveViews/field/radio.html index 92c50a7e..a7ce6a86 100755 --- a/public/modules/forms/base/views/directiveViews/field/radio.html +++ b/public/modules/forms/base/views/directiveViews/field/radio.html @@ -34,7 +34,7 @@ ng-disabled="field.disabled" ng-change="$root.nextField()"/> - + From a88390a7d1908a9469741e3714b3794443c9051c Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 11 Jun 2016 09:47:35 +0200 Subject: [PATCH 2/9] add redis to docker-compose.yml --- config/socket.io.js | 2 +- docker-compose.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/socket.io.js b/config/socket.io.js index 4f4b7ffe..fe44f355 100644 --- a/config/socket.io.js +++ b/config/socket.io.js @@ -12,7 +12,7 @@ module.exports = function (app, db) { var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] }); var redis = require('socket.io-redis'); - io.adapter(redis({ host: '127.0.0.1', port: 6379 })); + io.adapter(redis(process.env.REDIS_HOST || { host: '127.0.0.1', port: 6379 })); // Add an event listener to the 'connection' event io.on('connection', function (socket) { diff --git a/docker-compose.yml b/docker-compose.yml index 5b1e6340..dae327c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,9 @@ services: - "27017:27017" volumes: - mongo-data-wt:/data/db + redis: + image: redis + web: build: . volumes: @@ -17,8 +20,10 @@ services: - "35729:35729" links: - db + - redis environment: DB_HOST: db + REDIS_HOST: redis volumes: mongo-data-wt: driver: local From 59bb78ace8e05af633979b072fcf1eb38335a996 Mon Sep 17 00:00:00 2001 From: Samuel Laulhau Date: Thu, 16 Jun 2016 08:41:31 +0200 Subject: [PATCH 3/9] add bcrypt to package.json attempt to fix travis build --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index a987a018..070be133 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "dependencies": { "async": "^1.4.2", "aws-sdk": "^2.3.9", + "bcrypt": "^0.8.7", "body-parser": "~1.14.1", "bower": "~1.6.5", "chalk": "^1.1.3", From 660c32a114cd78b95102a6418229e46ec9439a6f Mon Sep 17 00:00:00 2001 From: Samuel Laulhau Date: Thu, 16 Jun 2016 12:10:21 +0200 Subject: [PATCH 4/9] add right compiler to travis conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit attempt n°2 to fix travis build --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8a7b6feb..52f47f7b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,17 @@ node_js: - "4.0.0" env: - NODE_ENV=travis + - TRAVIS=travis CXX=g++-4.8 services: - mongodb addons: code_climate: repo_token: 6c3a1b81a09b2338d6f30913c1bcad115026689752cbb499a0a25061cda6fbcf + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - gcc-4.8 + - g++-4.8 after_script: - grunt coverage From 694e75d40acd285543997681beca3f3fb76a68a9 Mon Sep 17 00:00:00 2001 From: Samuel Laulhau Date: Fri, 17 Jun 2016 08:37:29 +0200 Subject: [PATCH 5/9] fix travis env --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52f47f7b..f18bad3a 100755 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,7 @@ node_js: - "5.0.0" - "4.0.0" env: - - NODE_ENV=travis - - TRAVIS=travis CXX=g++-4.8 + - NODE_ENV=travis TRAVIS=travis CXX=g++-4.8 services: - mongodb addons: From 35fb170abbb11429ee73302a66c2593688e6301e Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 17 Jun 2016 12:14:34 -0700 Subject: [PATCH 6/9] removed setup.js from postinstall in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 070be133..69a28c93 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "scripts": { "start": "grunt", "test": "grunt test && grunt coveralls", - "setup": "node scripts/setup.js;", "postinstall": "bower install --config.interactive=false; grunt build;" + "init": "node scripts/setup.js" }, "dependencies": { "async": "^1.4.2", From 74a9b26ec5f4f803d098f93e713be79fa0592409 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 18 Jun 2016 08:47:18 +0200 Subject: [PATCH 7/9] fix package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 69a28c93..4bc0b9f7 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "scripts": { "start": "grunt", "test": "grunt test && grunt coveralls", - "postinstall": "bower install --config.interactive=false; grunt build;" + "postinstall": "bower install --config.interactive=false; grunt build;", "init": "node scripts/setup.js" }, "dependencies": { From 03aaf1eb543610f2c406c527c4c43a662c7281fe Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 18 Jun 2016 08:54:10 +0200 Subject: [PATCH 8/9] add redis to travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f18bad3a..a106aa64 100755 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ env: - NODE_ENV=travis TRAVIS=travis CXX=g++-4.8 services: - mongodb + - redis addons: code_climate: repo_token: 6c3a1b81a09b2338d6f30913c1bcad115026689752cbb499a0a25061cda6fbcf From 6aadf00125659d656398631f117dbf515fd6c94d Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 18 Jun 2016 09:34:10 +0200 Subject: [PATCH 9/9] add french lang #103 --- public/modules/users/config/i18n/english.js | 4 +- public/modules/users/config/i18n/french.js | 58 ++++++++++----------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/public/modules/users/config/i18n/english.js b/public/modules/users/config/i18n/english.js index 88ea903e..8c83a044 100644 --- a/public/modules/users/config/i18n/english.js +++ b/public/modules/users/config/i18n/english.js @@ -27,10 +27,10 @@ angular.module('users').config(['$translateProvider', function ($translateProvid SAVE_PASSWORD_BTN: 'Save Password', SUCCESS_HEADER: 'Signup Successful', - SUCCESS_TEXT: 'You\'ve successfully registered an account at TellForm.', + SUCCESS_TEXT: 'You’ve successfully registered an account at TellForm.', VERIFICATION_EMAIL_SENT: 'A verification email has been sent to', NOT_ACTIVATED_YET: 'But your account is not activated yet', - BEFORE_YOU_CONTINUE: 'Before you continue, make sure to check your email for our verification. If you don\'t receive it within 24h drop us a line at ', + BEFORE_YOU_CONTINUE: 'Before you continue, make sure to check your email for our verification. If you don’t receive it within 24h drop us a line at ', CHECK_YOUR_EMAIL: 'Check your email and click on the activation link to activate your account. If you have any questions drop us a line at', PASSWORD_RESTORE_HEADER: 'Restore your password', diff --git a/public/modules/users/config/i18n/french.js b/public/modules/users/config/i18n/french.js index f092b100..2a73f983 100644 --- a/public/modules/users/config/i18n/french.js +++ b/public/modules/users/config/i18n/french.js @@ -3,49 +3,49 @@ angular.module('users').config(['$translateProvider', function ($translateProvider) { $translateProvider.translations('en', { - ACCESS_DENIED_TEXT: 'Vouz est pas autorisé pour accese cete page.', - USERNAME_LABEL: 'Nom de Compte', - PASSWORD_LABEL: 'Mot de Pass', - CURRENT_PASSWORD_LABEL: 'Current Password', - NEW_PASSWORD_LABEL: 'Nouveau Mot de Pass Password', - VERIFY_PASSWORD_LABEL: 'Verify Password', - UPDATE_PASSWORD_LABEL: 'Update Password', - FIRST_NAME_LABEL: 'Premiere Nom Name', - LAST_NAME_LABEL: 'Surnom', - LANGUAGE_LABEL: 'Language', + ACCESS_DENIED_TEXT: 'Vouz n’êtes pas autorisé à accéder à cette page.', + USERNAME_LABEL: 'Nom d’utilisateur', + PASSWORD_LABEL: 'Mot de Passe', + CURRENT_PASSWORD_LABEL: 'Mot de passe actuel', + NEW_PASSWORD_LABEL: 'Nouveau Mot de Passe', + VERIFY_PASSWORD_LABEL: 'Vérifier le mot de passe', + UPDATE_PASSWORD_LABEL: 'Mettre à jour le mot de passe', + FIRST_NAME_LABEL: 'Prénom', + LAST_NAME_LABEL: 'Nom', + LANGUAGE_LABEL: 'Langue', EMAIL_LABEL: 'Email', - UPDATE_PROFILE_BTN: 'Modifier Profile', - PROFILE_SAVE_SUCCESS: 'Profile saved successfully', - PROFILE_SAVE_ERROR: 'Erreur: On peux pas enregistré votre Profile.', + UPDATE_PROFILE_BTN: 'Modifier le Profil', + PROFILE_SAVE_SUCCESS: 'Profil enregistré avec succès', + PROFILE_SAVE_ERROR: 'Erreur: impossible d’enregistrer votre Profile.', - FORGOT_PASSWORD_LINK: 'Oublier votre mot de pass?', - REVERIFY_ACCOUNT_LINK: 'Re-envoyez ton email de verification', + FORGOT_PASSWORD_LINK: 'Mot de passe oublié ?', + REVERIFY_ACCOUNT_LINK: 'Re-envoyez un email de vérification', SIGNIN_BTN: 'Connexion', SIGNUP_BTN: 'Créer un compte', - SAVE_PASSWORD_BTN: 'Enregistreé ton nouveau Mot de Pass', + SAVE_PASSWORD_BTN: 'Enregistrer votre nouveau Mot de Passe', - SUCCESS_HEADER: 'Votre Compte a été enregistré!', - SUCCESS_TEXT: 'Vouz a enregistré un compte a TellForm.', - VERIFICATION_EMAIL_SENT: 'Un email de verification a été envoyer a', + SUCCESS_HEADER: 'Votre Compte a été enregistré !', + SUCCESS_TEXT: 'Votre compte Tellform a été crée avec succès.', + VERIFICATION_EMAIL_SENT: 'Un email de verification a été envoyer à', NOT_ACTIVATED_YET: 'Mais votre compte n\'est pas activé', - BEFORE_YOU_CONTINUE: 'Plutôt que vouz continué, vouz devrez voire ton inbox pour notre message de verification. Si tu receivoir-pas un message de verification dan le prochaine 24h, contactez nous a ', - CHECK_YOUR_EMAIL: 'Check your email and click on the activation link to activate your account. If you have any questions drop us a line at', + BEFORE_YOU_CONTINUE: 'Avant de continuer, vous devez valider votre adresse mail. Merci de vérifier votre boite mail. Si vous ne l’avez pas reçu dans les prochaines 24h, contactez-nous a ', + CHECK_YOUR_EMAIL: 'Vérifiez vos emails, et cliquez sur le lien de validation pour activer votre compte. Si vous avez une question contactez-nous à', - PASSWORD_RESTORE_HEADER: 'Restore your password', - ENTER_YOUR_EMAIL: 'Entrer votre email de compte', + PASSWORD_RESTORE_HEADER: 'Mot de passe perdu', + ENTER_YOUR_EMAIL: 'Entrer votre email', SUBMIT_BTN: 'Enregistrer', ASK_FOR_NEW_PASSWORD: 'Demander un nouveau mot de pass ', - PASSWORD_RESET_INVALID: 'Password reset is invalid', - PASSWORD_RESET_SUCCESS: 'Passport successfully reset', - PASSWORD_CHANGE_SUCCESS: 'Passport successfully changed', + PASSWORD_RESET_INVALID: 'Le nouveau mot de passe est invalid', + PASSWORD_RESET_SUCCESS: 'Mot de passe réinitialisé avec succès', + PASSWORD_CHANGE_SUCCESS: 'Mot de passe enregistré avec succès', - CONTINUE_TO_LOGIN: 'Allez au page de connexion', + CONTINUE_TO_LOGIN: 'Allez à la page de connexion', - VERIFY_SUCCESS: 'Compte est activé!', - VERIFY_ERROR: 'Le fléche de verification est invalid ou expireé' + VERIFY_SUCCESS: 'Votre compte est activé !', + VERIFY_ERROR: 'Le lien de vérification est invalide ou à expiré' }); }]);