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

4254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Chanséaume
0310dce719 Revert "Fixed wrong calculated price when comma is used instead of dot." 
This reverts commit 1a3542ada2dd63f59adeafc0d1f434057d5da927.
 2014-07-16 18:39:10 +02:00
Julien Chanséaume
97559fe8c2 Fixed wrong calculated price when comma is used instead of dot. 2014-07-16 18:39:10 +02:00
Julien Chanséaume
a72b6e5ca7 Added direct link to the customer page on order detail. 2014-07-16 18:39:09 +02:00
Julien Chanséaume
43517c629a Fixed order edit. When a product was deleted, the title was blank. Now we use the order_product title. 2014-07-16 18:39:09 +02:00
Julien Chanséaume
4aec6f4b3d Fixed method to display options in the current local and not en_US. 2014-07-16 18:39:09 +02:00
Julien
1e0bb03804 Merge pull request #531 from lovenunu/firewall 
Add firewall security on forms
 2014-07-16 18:33:56 +02:00
Benjamin Perche
a5a8f1993a Add changelog 
modifié:         CHANGELOG.md
 2014-07-16 15:47:55 +02:00
Benjamin Perche
47e2198936 Remove useless variable 
modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-07-16 15:41:28 +02:00
Benjamin Perche
59bab34513 Add auto delete to keep the table small 
modifié:         core/lib/Thelia/Form/FirewallForm.php
	modifié:         core/lib/Thelia/Tests/Form/FirewallTest.php
 2014-07-16 15:28:10 +02:00
Benjamin Perche
dd00af72cb Fix cs 
modifié:         core/lib/Thelia/Form/BruteforceForm.php
	modifié:         core/lib/Thelia/Tests/Form/FirewallTest.php
 2014-07-16 14:59:38 +02:00
Benjamin Perche
660624f609 Add tests 
nouveau fichier: core/lib/Thelia/Tests/Form/FirewallTest.php
 2014-07-16 14:58:18 +02:00
Benjamin Perche
6208b12942 Fix waiting time text 
modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-07-16 14:57:46 +02:00
Benjamin Perche
28e027bca4 Change firewall time from hours to minutes 
nouveau fichier: core/lib/Thelia/Form/BruteforceForm.php
	modifié:         core/lib/Thelia/Form/FirewallForm.php
	modifié:         setup/insert.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-16 14:22:32 +02:00
Benjamin Perche
b424fb2750 Add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
 2014-07-16 11:09:35 +02:00
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
Benjamin Perche
081a70ef9d Complete sql files and apply special rule from login forms 
modifié:         core/lib/Thelia/Form/AdminLogin.php
	modifié:         core/lib/Thelia/Form/CustomerLogin.php
	modifié:         setup/insert.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-16 09:14:31 +02:00
Benjamin Perche
3469a56c17 Add new sql table in update file 
modifié:         core/lib/Thelia/Form/FirewallForm.php
	modifié:         setup/insert.sql
	modifié:         setup/update/2.0.3.sql
 2014-07-16 08:50:50 +02:00
lovenunu
ee11915feb Add french and english translation 
modified:   core/lib/Thelia/Config/I18n/en_US.php
	modified:   core/lib/Thelia/Config/I18n/fr_FR.php
 2014-07-16 08:28:53 +02:00
lovenunu
c3ef1ab6b7 Fix logicial error on counting attempts 
modified:   core/lib/Thelia/Form/FirewallForm.php
	modified:   core/lib/Thelia/Model/FormFirewall.php
 2014-07-16 08:28:53 +02:00
lovenunu
b926f27711 Add firewall on login forms 
modified:   core/lib/Thelia/Form/AdminLogin.php
	modified:   core/lib/Thelia/Form/CustomerLogin.php
 2014-07-16 08:28:53 +02:00
lovenunu
13cb3dbbdc Fix cs and refactor FormFirewall raw values usage 
modified:   core/lib/Thelia/Form/FirewallForm.php
	modified:   core/lib/Thelia/Model/FormFirewallQuery.php
	modified:   core/lib/Thelia/Model/Tax.php
 2014-07-16 08:28:53 +02:00
lovenunu
5f6871154c Apply firewall on sensitive forms 
modified:   core/lib/Thelia/Form/ContactForm.php
	modified:   core/lib/Thelia/Form/CustomerLostPasswordForm.php
	modified:   core/lib/Thelia/Form/OrderPayment.php
 2014-07-16 08:28:53 +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
lovenunu
b42ff568e0 Define firewall model 
new file:   core/lib/Thelia/Model/Base/FormFirewall.php
	new file:   core/lib/Thelia/Model/Base/FormFirewallQuery.php
	new file:   core/lib/Thelia/Model/FormFirewall.php
	new file:   core/lib/Thelia/Model/FormFirewallQuery.php
	new file:   core/lib/Thelia/Model/Map/FormFirewallTableMap.php
	modified:   local/config/schema.xml
	modified:   setup/thelia.sql
 2014-07-16 08:28:53 +02:00
Julien
da5e43c8a7 Merge pull request #525 from zzuutt/patch-5 
Added sort order on quantity in ProductSaleElements's loop
 2014-07-15 16:01:03 +02:00
zzuutt
2e9b42053b change min_quantity & max_quantity 
change :

min_quantity by quantity
max_quantity by quantity_reverse
 2014-07-15 13:09:13 +02:00
zzuutt
a6a6269742 Add in loop ProductSaleElements the order argument 
add order arguments 'min_quantity' and 'max_quantity'
 2014-07-10 17:21:01 +02:00
Julien
f8ad3e34ae Merge pull request #522 from lovenunu/patch-1 
Fix brand auth loop name
Fixes issue [#520](https://github.com/thelia/thelia/issues/520)
 2014-07-10 14:46:06 +02:00
Benjamin Perche
98ed617aab Fix brand auth loop name 2014-07-10 14:26:28 +02:00
Julien
87d80cc5a1 Merge pull request #519 from lovenunu/patch-2 
Update CHANGELOG.md
 2014-07-09 18:39:26 +02:00
Benjamin Perche
70a5d46641 Update CHANGELOG.md 2014-07-09 15:39:55 +02:00
Julien
d44233bd05 Merge pull request #518 from bibich/improvements 
updated changelog
 2014-07-08 15:35:26 +02:00
Julien Chanséaume
46c124b519 sanitized store description 2014-07-08 15:33:42 +02:00
Julien Chanséaume
e0732573a4 updated changelog 2014-07-08 15:33:07 +02:00
Julien
f7c5e96e2e Merge pull request #503 from mespeche/mespeche 
Added store_description
 2014-07-08 15:21:33 +02:00
Julien
f06854ce48 Merge pull request #505 from roadster31/brands 
- Brands implementation
- image + documents refactoring
- new smarty functions for form generation.
- lots of code enhancements
 2014-07-08 11:45:44 +02:00
Franck Allimant
6c1e45276b PHP-CS fixer passed 2014-07-08 10:33:47 +02:00
Franck Allimant
ab484973e1 Fixed "success_url" appearing twice in forms 2014-07-07 23:24:39 +02:00
Franck Allimant
c520f1e581 Fixed wrong "alt" attribute 2014-07-07 23:24:03 +02:00
Franck Allimant
f651a267c5 Fixed wrong escapin of "required" attribute 2014-07-07 23:23:16 +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
77a94d06a0 Fixed "you can not delete an image or a document" 2014-07-07 22:43:37 +02:00
Franck Allimant
082a1905f6 Fixed "it doesn't save anything when you want to edit textarea" 2014-07-07 22:42:44 +02:00
Julien
5784e251f4 Merge pull request #513 from lovenunu/fix 
End fix #511
 2014-07-07 15:35:06 +02:00
Benjamin Perche
7a0399b303 End fix #511 
modifié:         core/lib/Thelia/Action/Customer.php
 2014-07-07 14:41:38 +02:00
Julien
c07ea4e324 Merge pull request #512 from lovenunu/fix 
Fix issue #511
 2014-07-07 14:24:08 +02:00
Benjamin Perche
6da2e2a183 Fix issue #511 
When the user is registred in the session, the method "eraseCredentials" is cal$
( Thelia\Core\Security\SecurityContext::setCustomerUser ).
The form checks if the customer user of the session has the password given,
or, in the session, the password is null, so it doesn't work.

        modifié:         core/lib/Thelia/Form/CustomerPasswordUpdateForm.php
 2014-07-07 14:05:27 +02:00
Franck Allimant
b7d98d8648 Fixed typos 2014-07-04 16:10:39 +02:00
Benjamin Perche
5412f9891d Merge branch 'master' of https://github.com/thelia/thelia 2014-07-04 15:45:01 +02:00
Julien
924fef8047 Merge pull request #510 from bibich/improvements 
fixed new issue on rewriting test due to blank titles on some locale
 2014-07-04 15:39:16 +02:00