Franck Allimant
df9b19cb91
Typo
2014-05-10 02:57:02 +02:00
Franck Allimant
de9547fc8e
Updated translations
2014-05-10 02:55:17 +02:00
Franck Allimant
a581a6ca0f
Fixed criteria lablels
2014-05-10 02:47:23 +02:00
Franck Allimant
6632eba9f4
Added countries and start date conditions
2014-05-10 02:39:24 +02:00
Franck Allimant
f76e5d7aaa
Added start date condition
2014-05-10 02:38:03 +02:00
Franck Allimant
c39de8bf87
Improved condition code structure (still backward compatible)
2014-05-10 01:37:09 +02:00
Franck Allimant
38e16f0502
Changed name
2014-05-10 01:36:49 +02:00
Franck Allimant
2aa8d804b0
Changed condition parameter name
2014-05-10 01:36:11 +02:00
Franck Allimant
861e6b0513
Changed condition parameter name
2014-05-10 01:35:28 +02:00
Franck Allimant
5bcb08846f
Changed condition parameter name
2014-05-10 01:32:46 +02:00
Franck Allimant
612613fd71
Changed condition parameter names
2014-05-10 01:32:14 +02:00
Franck Allimant
d14321ffd8
Improved error message
2014-05-10 01:31:32 +02:00
Franck Allimant
c671a1ff5e
Changed coupon condition parameter variables name
2014-05-10 01:30:22 +02:00
Franck Allimant
06d7eb4fc1
Implemented getDeliveryAddress()
2014-05-10 01:29:54 +02:00
Franck Allimant
f83c9f05fd
Fixed Equals and No Equals labels
2014-05-10 01:29:12 +02:00
Franck Allimant
45c32271b7
Removed duplicate condition
2014-05-10 01:28:42 +02:00
Franck Allimant
7bb0368d7f
Very minor improvement on conditions evaluation
2014-05-10 01:28:03 +02:00
Franck Allimant
8054149dbd
Added country condition
2014-05-10 01:12:06 +02:00
Franck Allimant
a536eb5de7
Fix: save condition button should be hidden after adding condition
2014-05-10 01:09:43 +02:00
Franck Allimant
073905200e
Added delivery country condition
2014-05-10 00:10:32 +02:00
Manuel Raynaud
1287823d3b
Merge pull request #393 from lunika/minorFix
...
fix minor bug
2014-05-09 11:03:44 +02:00
Manuel Raynaud
85d80d1d77
fix minor bug
2014-05-09 10:55:50 +02:00
Manuel Raynaud
d9d350ea24
Merge pull request #381 from moustikAir/doc-mysql56
...
MySQL 5.6 default config creates bug
2014-05-06 21:03:00 +02:00
David Rimbault
a559efc299
Merge branch 'master' into doc-mysql56
...
Conflicts:
Readme.md
2014-05-06 19:19:52 +02:00
Manuel Raynaud
4d724aa8d6
Merge pull request #387 from lunika/2.0.1
...
increment thelia version
2014-05-06 15:36:27 +02:00
Manuel Raynaud
36e4f25c6d
change downlod link on admin homepage
2014-05-06 15:28:53 +02:00
Manuel Raynaud
c2da25d40e
Merge pull request #388 from roadster31/coupons
...
Removed header titles from the pges that have one
2014-05-06 15:24:19 +02:00
Franck Allimant
2ca655dc8b
Removed header titles from the pges that have one
2014-05-06 15:21:08 +02:00
Manuel Raynaud
772aba093b
increment thelia version
2014-05-06 15:04:05 +02:00
Manuel Raynaud
a854d848ae
Merge pull request #386 from lunika/changelog
...
update changelog
2014-05-06 14:55:15 +02:00
Manuel Raynaud
994c5281b4
update changelog
2014-05-06 14:54:21 +02:00
Manuel Raynaud
5de9244672
Merge pull request #385 from lunika/uploadFile
...
add method post on upload form
2014-05-06 14:07:22 +02:00
Manuel Raynaud
364ff7486d
add method post on upload form
2014-05-06 14:06:58 +02:00
Manuel Raynaud
a0f3a913cb
Merge pull request #384 from Yochima/new-branch
...
Allow to use configDir in module
2014-05-06 14:05:35 +02:00
Guillaume Barral
e568ed67ce
Allow to use configDir in module
2014-05-06 11:50:05 +02:00
Manuel Raynaud
41612cbf1c
Merge pull request #383 from lunika/translation
...
Translation
2014-05-06 11:21:25 +02:00
Manuel Raynaud
5231a76f51
add new languages in dsl scripts
2014-05-06 11:13:29 +02:00
Manuel Raynaud
d4ade9afc0
integration of Czech translation
2014-05-06 11:07:09 +02:00
Manuel Raynaud
fa71c8c4d5
integration of russian translation
2014-05-06 11:01:32 +02:00
Manuel Raynaud
4cd2ea6316
complete lang form including money format
2014-05-06 10:53:16 +02:00
Manuel Raynaud
ca1cb6e4d1
Merge pull request #382 from bibich/improvements
...
Improvements
2014-05-06 09:40:37 +02:00
Julien Chanséaume
dad74ba290
added missing dependency
2014-05-06 09:32:59 +02:00
Julien Chanséaume
bb43a12fba
Some tweaks added. We can now override module assets by redefining them in the template.
...
if they are not in the template, it takes them from the module.
if an asset does not exist, exception is catched and it no longer breaks the response.
2014-05-06 09:23:38 +02:00
David Rimbault
4d177d70f4
One little modification on formatting
2014-05-05 23:56:44 +02:00
David Rimbault
d49f764bbc
Updated README
...
With MySQL 5.6 default configuration is more strict and adds STRICT_TRANS_TABLES.
Added some info to configure MySQL properly. Better solution would be to make the schema correctly, defining optional columns as nullable.
2014-05-05 23:45:02 +02:00
Manuel Raynaud
4985834cb9
Merge pull request #380 from lunika/module
...
change status of the toggle button when module activation fails. Fix #28...
2014-05-05 16:05:24 +02:00
Manuel Raynaud
c39d587c25
change status of the toggle button when module activation fails. Fix #287
2014-05-05 16:05:03 +02:00
Manuel Raynaud
5b968dbaa7
Merge pull request #379 from lunika/delivery
...
check shipping configuration in delivery loop. Fix #311
2014-05-05 14:47:31 +02:00
Manuel Raynaud
d5c5e167a6
check shipping configuration in delivery loop. Fix #311
2014-05-05 14:37:44 +02:00
Manuel Raynaud
b09a73af1c
Merge pull request #378 from lunika/translation
...
add missing english translations
2014-05-05 12:43:42 +02:00
