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
Manuel Raynaud
fcceef8ab8
add missing english translations
2014-05-05 12:42:50 +02:00
Manuel Raynaud
50696a50c7
Merge pull request #377 from lunika/mail
...
Mail
2014-05-05 12:17:32 +02:00
Manuel Raynaud
827f51a820
display city instead of coutry in pdf. Fix #358
2014-05-05 11:59:51 +02:00
Manuel Raynaud
65be312137
update email translations
2014-05-05 11:46:23 +02:00
Manuel Raynaud
5ffd01e99f
check if a country is available before displaying it. Fix #359
2014-05-05 11:42:12 +02:00
Manuel Raynaud
793e66af74
Merge pull request #371 from roadster31/coupons
...
Coupons
2014-05-05 10:58:59 +02:00
Franck Allimant
4673a14b76
Typo
2014-05-05 10:04:38 +02:00
Manuel Raynaud
51b97c0079
Merge pull request #375 from bibich/feeds
...
Feeds
2014-05-05 09:57:21 +02:00
Manuel Raynaud
9d3bb09671
Merge pull request #376 from lunika/config
...
fix wrong smtp config
2014-05-05 09:57:12 +02:00
Manuel Raynaud
ca9d9c89c5
fix wrong smtp config
2014-05-05 09:56:40 +02:00
Franck Allimant
f9e4c33875
No % or money symbol in HTML generated by CouponAbstract
2014-05-05 09:52:27 +02:00
Julien Chanseaume
3fd87f1fa1
updated sql script
2014-05-05 07:34:09 +02:00
Julien Chanseaume
2dbee098a1
fixed git conflicts
2014-05-05 07:29:18 +02:00
Julien Chanseaume
913ce22724
added french translation
2014-05-05 07:23:48 +02:00
Julien Chanseaume
bddda57601
small fixes
2014-05-05 07:22:52 +02:00
Julien Chanseaume
6e0e6dddd2
updated default front theme to integrate RSS feeds
2014-05-05 07:00:20 +02:00
Julien Chanseaume
92a7404a3b
new template for generating feeds
2014-05-05 07:00:20 +02:00
Julien Chanseaume
7e70ac8ac8
added new route and controller for feeds
2014-05-05 07:00:20 +02:00
Manuel Raynaud
17bc8cff70
Merge pull request #374 from bibich/sitemap
...
Sitemap
2014-05-04 22:54:34 +02:00
Franck Allimant
091e7f9f64
Re-added the html generatrion code in drawBackOfficeInputs()
2014-05-04 19:31:41 +02:00
Julien Chanseaume
fbc4a87d34
updated default front theme to integrate RSS feeds
2014-05-03 16:49:53 +02:00
Julien Chanseaume
d094fd4969
new template for generating feeds
2014-05-03 16:48:42 +02:00
Julien Chanseaume
1749ed7c91
added new route and controller for feeds
2014-05-03 16:48:14 +02:00
