Franck Allimant
|
5873b29fc1
|
Changed "return_to" into "previous"
|
2014-06-11 09:43:14 +02:00 |
|
Franck Allimant
|
15da99446c
|
Added "js" parameter to intl function for a safe usage in JS string,
|
2014-06-11 09:43:14 +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
|
de5a2025cd
|
Fixed coupon input field name
|
2014-06-11 09:43:10 +02:00 |
|
Franck Allimant
|
d9164495d3
|
Removed no longer useful tests
|
2014-06-11 09:43:10 +02:00 |
|
Franck Allimant
|
0683d20d2c
|
Improved and simplified coupon form management
|
2014-06-11 09:43:09 +02:00 |
|
Manuel Raynaud
|
a018102572
|
Merge pull request #457 from bilhackmac/RefreshCommand
Refresh command
|
2014-06-10 12:26:17 +02:00 |
|
Jérôme Billiras
|
5c8584c398
|
Code review following pull request comments
|
2014-06-10 11:43:06 +02:00 |
|
Jérôme Billiras
|
bead28f5d2
|
Update test to consider only standards modules
|
2014-06-10 11:13:06 +02:00 |
|
Jérôme Billiras
|
0381239881
|
Add refresh command tests
|
2014-06-10 10:37:48 +02:00 |
|
Jérôme Billiras
|
76b08ddca9
|
Register refresh command to Thelia core
|
2014-06-10 10:34:19 +02:00 |
|
Jérôme Billiras
|
f6aa0ed7da
|
Add refresh command
|
2014-06-10 10:33:47 +02:00 |
|
Manuel Raynaud
|
c8d5bdb1e7
|
Merge pull request #455 from lovenunu/master
Fix typo order_tab instead of oder_tab smarty variable
|
2014-06-06 12:34:52 +02:00 |
|
Benjamin Perche
|
da959c3732
|
Fix typo order_tab instead of oder_tab smarty variable
modifié: templates/backOffice/default/order-edit.html
|
2014-06-06 10:47:22 +02:00 |
|
Julien
|
415b444e6b
|
Merge pull request #454 from lunika/2.0.2
Fixes version 2.0.2
|
2014-06-06 09:12:33 +02:00 |
|
Manuel Raynaud
|
c552f8485a
|
fiw wrong description in search page
|
2014-06-06 09:06:42 +02:00 |
|
Manuel Raynaud
|
980cd08704
|
fix cs
|
2014-06-05 17:39:15 +02:00 |
|
Manuel Raynaud
|
83ed4aa833
|
fix copy/past issue
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
a4e28e5561
|
implement search on content loop.
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
57cf2d1a10
|
implement seach on content loop.
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
ac028a70b5
|
implement seach on category loop.
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
86c34f589c
|
fix payment and delivery form. Fix #434
|
2014-06-05 17:21:37 +02:00 |
|
Manuel Raynaud
|
84c97e80ea
|
write in uppercase the resource value used in admin_position_block function. Fix #444
|
2014-06-05 17:21:37 +02:00 |
|
Julien
|
3419aaaaa1
|
Merge pull request #453 from bibich/issue-452
Fixed issue when installing Thelia on database with special characters
fixes the issue #452
|
2014-06-05 14:46:43 +02:00 |
|
Julien Chanséaume
|
fc15d466b4
|
Fixed issue when installing Thelia on database with special characters
|
2014-06-05 14:01:47 +02:00 |
|
Julien
|
17f22d920c
|
Merge pull request #451 from lovenunu/master
Fix cs
|
2014-06-04 14:19:46 +02:00 |
|
Benjamin Perche
|
946a671c4d
|
Fix cs
modifié: core/lib/Thelia/Core/Event/SessionEvent.php
modifié: core/lib/Thelia/Core/EventListener/SessionListener.php
modifié: core/lib/Thelia/Core/TheliaKernelEvents.php
modifié: core/lib/Thelia/Model/CartItem.php
|
2014-06-04 13:43:03 +02:00 |
|
Julien
|
4baeb5156d
|
Merge pull request #449 from Yochima/yochima-branch
Add pagination to the product list (backOffice)
|
2014-06-04 10:33:08 +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 |
|
Manuel Raynaud
|
3df31f1ecb
|
Merge pull request #450 from driou/master
Update fr_FR.php
|
2014-06-03 15:47:46 +02:00 |
|
driou
|
78b0be3126
|
Update fr_FR.php
|
2014-06-03 15:25:12 +02:00 |
|
Guillaume Barral
|
eb895bc544
|
Add pagination to the product list (backOffice)
|
2014-06-03 12:35:52 +02:00 |
|
Manuel Raynaud
|
6137fb8893
|
Merge pull request #446 from lunika/issues
Issues
|
2014-05-30 17:33:07 +02:00 |
|
Manuel Raynaud
|
d439197133
|
translate product in car. Fix #416
|
2014-05-30 17:07:55 +02:00 |
|
Manuel Raynaud
|
fe620a5a3b
|
force default locale when uploading new document. Fix #403
|
2014-05-30 16:43:26 +02:00 |
|
Manuel Raynaud
|
eb13849b79
|
fix parameter in document loop. Fix #405
|
2014-05-30 12:22:22 +02:00 |
|
Manuel Raynaud
|
8370158f9d
|
fix saves & close action on document and images. Fix #402
|
2014-05-30 11:49:03 +02:00 |
|
Manuel Raynaud
|
08ec1140aa
|
show active menu tab. Fix #262
|
2014-05-30 11:26:32 +02:00 |
|
Manuel Raynaud
|
c738361221
|
Merge pull request #445 from zzuutt/master
Correction issue #425
|
2014-05-28 23:42:21 +02:00 |
|
Manuel Raynaud
|
ee6bb052ad
|
Merge pull request #439 from roadster31/coupon-types
Coupon types
|
2014-05-28 15:58:01 +02:00 |
|
Manuel Raynaud
|
70ecac55cc
|
Merge pull request #436 from etienneroudeix/master
add Hong Kong to country list
|
2014-05-28 15:45:15 +02:00 |
|
etienne roudeix
|
507a52a20f
|
Update 2.0.2.sql
|
2014-05-28 14:56:46 +02:00 |
|
etienne roudeix
|
5395c76bf3
|
Update insert.sql
|
2014-05-28 14:56:04 +02:00 |
|
Franck Allimant
|
567fee839c
|
Added RemoveAmountOnCategories coupon type
|
2014-05-28 12:02:56 +02:00 |
|
Franck Allimant
|
23ebb88719
|
Fix #438
|
2014-05-28 12:01:46 +02:00 |
|
Manuel Raynaud
|
6567e19164
|
Merge pull request #437 from lunika/admin
reset modified column after admin connection
|
2014-05-27 17:12:13 +02:00 |
|
Manuel Raynaud
|
087fc6e9bf
|
reset modified column after admin connection
|
2014-05-27 17:09:53 +02:00 |
|
etienne
|
88a7164e96
|
add Hong Kong to country list
|
2014-05-27 15:38:11 +02:00 |
|