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 |
|
Manuel Raynaud
|
99fb562660
|
Merge pull request #435 from Yochima/yochima-branch
add argument id to the order_product loop
|
2014-05-27 08:53:19 +02:00 |
|
Guillaume Barral
|
2587f208c6
|
add argument id to the order_product loop
|
2014-05-27 08:44:49 +02:00 |
|
Manuel Raynaud
|
30f7eec494
|
Merge pull request #433 from lunika/asset
don't catch exception when javscript assets are processed
|
2014-05-26 17:01:43 +02:00 |
|
Manuel Raynaud
|
6eaea72043
|
don't catch exception when javscript assets are processed
|
2014-05-26 11:07:02 +02:00 |
|
Manuel Raynaud
|
f9ec2b39b0
|
Merge pull request #431 from knjeurope/master
Add code source insert
|
2014-05-26 09:16:36 +02:00 |
|
knjeurope
|
58b33a8e05
|
Add code source insert
Add cose source insert with TinyMce
|
2014-05-26 08:36:42 +02:00 |
|
Manuel Raynaud
|
ad469298bc
|
Merge pull request #428 from roadster31/coupon-types
Temporary fix for #427
|
2014-05-23 00:32:26 +02:00 |
|
Franck Allimant
|
e4029c9fdd
|
Temporary fix for #427
|
2014-05-22 23:39:34 +02:00 |
|
zzuutt
|
f8cf0b5692
|
Correction issue #425
le test du status n'etait pas correct
ajout des logs
|
2014-05-22 11:06:43 +02:00 |
|
Manuel Raynaud
|
8464a8e861
|
Merge pull request #420 from lunika/session
Session
|
2014-05-20 11:36:55 +02:00 |
|
Manuel Raynaud
|
84e28f1ff2
|
update changelog with new session process
|
2014-05-20 11:33:00 +02:00 |
|
Manuel Raynaud
|
2ace0796e8
|
session is now initialize using dispatcher
|
2014-05-20 09:44:04 +02:00 |
|