TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,188 Commits 1 Branch 0 Tags
a80a35b5de7c1ee901434c015b96b088fae2993a
Commit Graph

720 Commits

Author SHA1 Message Date
Benjamin Perche
cc4a22b1ed Change error message 
modifié:         core/lib/Thelia/Controller/BaseController.php
	modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-07-16 11:04:20 +02:00
lovenunu
978f15357c Apply firewall security on BaseForm::validateForm 
modified:   core/lib/Thelia/Controller/BaseController.php
	modified:   core/lib/Thelia/Form/AddressCreateForm.php
	new file:   core/lib/Thelia/Form/FirewallForm.php
	modified:   core/lib/Thelia/Model/FormFirewall.php
	modified:   setup/insert.sql
 2014-07-16 08:28:53 +02:00
Julien
f7c5e96e2e Merge pull request #503 from mespeche/mespeche 
Added store_description
 2014-07-08 15:21:33 +02:00
Franck Allimant
6ebf2c7e42 Fixed "with the close or save and close button you get an exception" 2014-07-07 22:44:39 +02:00
Franck Allimant
811e89f740 PHP-CS fixer pass 2014-07-01 01:07:56 +02:00
Franck Allimant
c1e3694ab8 Typo 2014-06-30 23:02:03 +02:00
Franck Allimant
4f7f26380a Fixed some more method comments 2014-06-30 19:30:00 +02:00
Franck Allimant
e972a4be60 Fixed renderRaw method comment 2014-06-30 19:24:47 +02:00
Franck Allimant
a0aa0bd1c2 Added brand logo image selection 2014-06-27 21:07:51 +02:00
Franck Allimant
f279131fe6 Added brand storage in product table 2014-06-27 20:12:55 +02:00
Franck Allimant
d969f84ae0 Restoired file events compatibility, factorised code 2014-06-26 20:18:06 +02:00
Franck Allimant
ca862b07e4 Merge branch 'master' into brands 
Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql
 2014-06-26 16:35:08 +02:00
Michaël Espeche
202969fde9 Add store_description field for SEO 2014-06-26 14:25:04 +02:00
Franck Allimant
0dde8b888a Added brands management 2014-06-26 10:52:13 +02:00
Franck Allimant
114a55c1e8 Refactoring of images and documents management 2014-06-26 10:36:12 +02:00
Manuel Raynaud
84c2432507 remove unused variable 2014-06-24 10:38:43 +02:00
Manuel Raynaud
77a4c45aa4 remove commented code 2014-06-24 10:30:46 +02:00
Manuel Raynaud
a00a23e495 remove unused use statement 2014-06-24 10:29:17 +02:00
Manuel Raynaud
d14a2d24f2 fix cs 2014-06-18 10:06:10 +02:00
Manuel Raynaud
101197c0de various fixes from insight 2014-06-18 09:33:32 +02:00
Manuel Raynaud
476bda3d4a implement new breadcrumb on image and document edition in the catalog 2014-06-11 14:50:19 +02:00
Franck Allimant
a1eeddc51b The coupon type is now passed to te template 2014-06-11 09:43:22 +02:00
Franck Allimant
87837224f7 PHP-CS fixer 2014-06-11 09:43:13 +02:00
Franck Allimant
919e0ac09b Checked coupon type before trying to get the service. 2014-06-11 09:43:11 +02:00
Franck Allimant
0683d20d2c Improved and simplified coupon form management 2014-06-11 09:43:09 +02:00
Guillaume Barral
2a7ea88d13 As the customerController, the method performAdditionalUpdateAction is useless as long as we have an <input type="hidden" name="page" /> AND a well configured successUrl :) 2014-06-04 09:02:55 +02:00
Guillaume Barral
a0eb7603ce correction of the method performAdditionalUpdateAction 2014-06-04 08:40:17 +02:00
Guillaume Barral
eb895bc544 Add pagination to the product list (backOffice) 2014-06-03 12:35:52 +02:00
Manuel Raynaud
fe620a5a3b force default locale when uploading new document. Fix #403 2014-05-30 16:43:26 +02:00
Manuel Raynaud
8370158f9d fix saves & close action on document and images. Fix #402 2014-05-30 11:49:03 +02:00
Franck Allimant
ab060486d0 Fixed Thelia\Model\Base uses. 2014-05-18 20:19:48 +02:00
Franck Allimant
ef142ca077 Applied php-cs-fixer 2014-05-17 10:56:28 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Manuel Raynaud
85d80d1d77 fix minor bug 2014-05-09 10:55:50 +02:00
Manuel Raynaud
4cd2ea6316 complete lang form including money format 2014-05-06 10:53:16 +02:00
Franck Allimant
621c17c97d Fixed form error management 2014-05-02 20:08:38 +02:00
Franck Allimant
23a74999e8 Fixed date manipulation² 2014-05-02 18:24:15 +02:00
Franck Allimant
7996c866d3 Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons 
Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	templates/backOffice/default/coupon/form.html
 2014-05-02 17:16:39 +02:00
Franck Allimant
8ce6cdbae0 Fixed date input format and conversion 2014-05-02 17:10:27 +02:00
Franck Allimant
aa48a73343 Removed the useless coupon read function 2014-05-02 17:10:25 +02:00
Franck Allimant
6b020fda13 Fixed labels, using templates for HTML fragments 2014-05-02 17:10:22 +02:00
Franck Allimant
70671c6949 Normalized coupon list appearance, added sorting 2014-05-02 17:10:19 +02:00
Franck Allimant
7c1c3541b0 Removed the useless coupon read function 2014-05-02 12:24:11 +02:00
Franck Allimant
b776a36bbd Fixed labels, using templates for HTML fragments 2014-05-02 12:07:17 +02:00
Franck Allimant
8496685814 Normalized coupon list appearance, added sorting 2014-05-01 19:20:32 +02:00
Manuel Raynaud
2ce1c79653 change image translation domain 2014-04-30 14:25:17 +02:00
Manuel Raynaud
171d388c41 change error message on image upload 2014-04-30 14:14:26 +02:00
Manuel Raynaud
d0edbdfd5b change price if needed when customer log in or log out 2014-04-29 11:35:10 +02:00
Manuel Raynaud
c4320f0ada add discount input on customer form 2014-04-29 10:56:07 +02:00