tagged as 1.13.3

.gitignore

@@ -28,6 +28,8 @@ www/lang/*.mo
 www/js/app.js
 www/js/libs.js
 
+www/file/*
+
 www/css/.sass-cache
 www/css/*.css
 !www/css/bootstrap.min.css

.semver_git_tag

@@ -1 +1 @@
-1.12.0
+1.13.3

package.json

@@ -1 +1 @@
-{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.12.0"}
+{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.13.3"}

src/App.hx

@@ -203,7 +203,7 @@ class App extends sugoi.BaseApp {
 		out.set("percent", "Pourcentage");
 		out.set("pinned", "Mets en avant les produits");
 
-		out.set("CagetteNetwork", "Me lister dans l'annuaire");
+		out.set("CagetteNetwork", "Me lister dans l'annuaire des groupes");
 		out.set("unitType", "Unité");
 		out.set("qt", "Quantité");
 		out.set("Unit", "Pièce");
@@ -280,7 +280,7 @@ class App extends sugoi.BaseApp {
 		var e = new sugoi.mail.Mail();
 		e.setSubject(subject);
 		e.setRecipient(to);
-		e.setSender(App.config.get("default_email"), t._("Cagette.net"));
+		e.setSender(App.config.get("default_email"), t._("CagettePéi"));
 		var html = App.current.processTemplate("mail/message.mtt", {text: html, group: group});
 		e.setHtmlBody(html);
 		App.sendMail(e);

src/controller/Group.hx

@@ -54,7 +54,7 @@ class Group extends controller.Controller
 			form.addElement(new StringInput("userLastName", t._("Your lastname") ,"",true));
 			form.addElement(new StringInput("userEmail", t._("Your e-mail"), "", true));
 		}
-		form.addElement(new sugoi.form.elements.TextArea("msg", t._("Leave a message")));
+		form.addElement(new sugoi.form.elements.TextArea("msg", t._("Leave a message"),"",false));
 
 		if (form.isValid()){
 			try{

src/controller/Main.hx

@@ -29,7 +29,8 @@ class Main extends Controller {
 		if ( app.user!=null && group == null) {
 			throw Redirect("/user/choose");
 		}else if (app.user == null && (group==null || group.regOption!=db.Amap.RegOption.Open) ) {
-			throw Redirect("/user/login");
+			//throw Redirect("/user/login");
+			throw Redirect("/group/1");
 		}
 
 		view.amap = group;

src/service/WaitingListService.hx

@@ -13,6 +13,8 @@ class WaitingListService{
 		var w = new db.WaitingList();
 		w.user = user;
 		w.group = group;
+		if (message == null ) message = "";
+		//message = "souscription = " + message;
 		w.message = message;
 		w.insert();
 

www/lang/texts_fr.po

@@ -14,6 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Poedit 2.0.6\n"
 
+
 #: src/payment/Cash.hx:294
 msgid "Cash"
 msgstr "Espèces / Carte Bancaire"