Manuel Raynaud
e68769efa6
add alias branch in composer.json file
2014-01-20 09:41:09 +01:00
Manuel Raynaud
b7fc2fc0e5
Merge branch 'master' of github.com:thelia/thelia
2014-01-17 16:34:08 +01:00
Manuel Raynaud
d345069707
fix directory separator in tinymce module. Fix #172
2014-01-17 16:33:26 +01:00
Franck Allimant
c41c957529
Aligned windows version to un*x one.
2014-01-17 15:26:38 +01:00
Franck Allimant
a9ed53d6bd
Merge branch 'master' of https://github.com/thelia/thelia
2014-01-17 14:43:27 +01:00
Franck Allimant
c60bb02da7
Fixed imporper use of Thelia\Model\Base\LangQuery
2014-01-17 14:42:41 +01:00
Manuel Raynaud
55741ae433
Merge branch 'master' of github.com:thelia/thelia
2014-01-17 14:35:06 +01:00
Manuel Raynaud
a99a0095b5
Merge pull request #181 from lunika/171-route-coupon-creation
...
This PR was merged into thelia:master branch.
Discussion
----------
Fix routing name in Coupon creation module
| Q | A |
| --- | --- |
| Bug fix? | y |
| New feature? | n |
| BC breaks? | n |
| Deprecations? | n |
| Tests pass? | y |
| Fixed tickets | #171 |
| License | GPL |
| Doc PR | |
Commits
-------
992b5be95cFix #171 lunika
2014-01-17 05:34:37 -08:00
Manuel Raynaud
992b5be95c
fix routing name in Coupon module. Fix #171
2014-01-17 14:33:09 +01:00
Manuel Raynaud
a7c9087721
update changelog
2014-01-17 14:21:24 +01:00
Manuel Raynaud
5b52540a84
Merge pull request #180 from lunika/170-pdf-template-definition
...
This PR was merged into thelia:master branch.
Discussion
----------
Fix pdf generation
| Q | A |
| --- | --- |
| Bug fix? | y |
| New feature? | n |
| BC breaks? | n |
| Deprecations? | n |
| Tests pass? | y |
| Fixed tickets | #170 |
| License | GPL |
| Doc PR | |
Commits
-------
9b81e88946Fix #170 lunika
2014-01-17 03:26:48 -08:00
Manuel Raynaud
9b81e88946
fix pdf generation. Fix #170
2014-01-17 12:23:08 +01:00
Manuel Raynaud
417088dd00
Merge pull request #179 from lunika/178-customer-ref-is-missing
...
This PR was merged into thelia:master branch.
Discussion
----------
Allow possiblity to specify a ref for a customer
| Q | A |
| --- | --- |
| Bug fix? | y |
| New feature? | y |
| BC breaks? | n |
| Deprecations? | n |
| Tests pass? | y |
| Fixed tickets | #178 |
| License | GPL |
| Doc PR | |
Commits
-------
4e1521775f
2014-01-17 02:19:00 -08:00
Manuel Raynaud
4e1521775f
alloow possibility to specify a ref for a customer
2014-01-17 11:15:55 +01:00
Manuel Raynaud
c25fdd7e42
fix exception not thrown correctly
2014-01-17 10:37:52 +01:00
Franck Allimant
42737940a9
The router id is now configurable via setters and getters to allow
...
modules to use their own router.
2014-01-16 19:35:12 +01:00
Franck Allimant
4d933b8a46
Fixed module position change
2014-01-16 12:24:50 +01:00
Franck Allimant
30b8277975
Fixed internationalisation of exceptions
2014-01-16 12:20:17 +01:00
Franck Allimant
435e195a53
Delete a module when module directory is missing is now possible.
2014-01-16 12:13:29 +01:00
Franck Allimant
e0ef07bb1e
Delete module request contains now "data data" flag
2014-01-16 12:02:08 +01:00
Franck Allimant
9335a41447
Delete module request contains now "data data" flag
2014-01-16 12:01:54 +01:00
Franck Allimant
77837b74da
Fixed delete module route
2014-01-16 12:01:42 +01:00
Franck Allimant
8f06c8050b
Delete module request contains now "data data" flag
2014-01-16 12:01:05 +01:00
Franck Allimant
66683a9169
Delete module request contains now "data data" flag
2014-01-16 12:00:51 +01:00
Franck Allimant
6fb448a461
Form content is now integrated in the modal body
2014-01-16 11:59:42 +01:00
Franck Allimant
0df111d070
Merge branch 'master' of https://github.com/thelia/thelia
2014-01-16 11:31:30 +01:00
Franck Allimant
842299bee8
Fixed typo
2014-01-16 11:31:18 +01:00
Franck Allimant
b27fbd776f
A generated module works now out of the box (no need to update
...
module.xml)
2014-01-16 11:25:09 +01:00
etienne roudeix
a6026d39a7
Merge pull request #176 from mespeche/master
...
Filter management optimization for ajax use
2014-01-16 02:17:53 -08:00
Michaël Espeche
6401266226
Filter management optimization for ajax use
2014-01-16 11:13:52 +01:00
Franck Allimant
380e856df8
Fixed obsolete comment
2014-01-16 10:54:03 +01:00
Etienne Roudeix
98a21c72c5
fix empty argument in loop issue
2014-01-15 12:26:46 +01:00
Manuel Raynaud
0c564be4c5
Merge branch 'master' of https://github.com/enurit/thelia into enurit-master
...
Conflicts:
templates/frontOffice/default/I18n/fr_FR.php
2014-01-14 19:21:01 +01:00
Emmanuel Nurit
3b756574c2
[back office] add pdf french translation
2014-01-14 15:55:56 +01:00
Emmanuel Nurit
1f1fd3e90f
[front office] translation fixes
2014-01-14 15:52:12 +01:00
Emmanuel Nurit
b6a4ae7749
[Back-office] Add core translation
2014-01-14 15:18:03 +01:00
Manuel Raynaud
eb5056f089
AbstractController::getExistingObject return object with hte needed
...
locale inside
2014-01-14 14:39:08 +01:00
Manuel Raynaud
34da3937dc
fix typo in insert.sql file
2014-01-14 11:30:59 +01:00
Manuel Raynaud
f267d62714
Merge pull request #167 from thelia/tinymce
...
Tinymce
2014-01-14 02:24:42 -08:00
Manuel Raynaud
55d0fd2ae2
configure upload dir for tonymce module
2014-01-14 11:20:12 +01:00
Manuel Raynaud
d73eaad981
move tinymce to resources folder
2014-01-14 10:36:37 +01:00
Manuel Raynaud
79dafd109e
create tinymce module
2014-01-13 18:07:23 +01:00
Manuel Raynaud
2f91816c2a
prepare tinymce module
2014-01-13 17:54:22 +01:00
Etienne Roudeix
0f6ecbb732
Merge branch 'master' of github.com:thelia/thelia
2014-01-13 11:31:16 +01:00
Etienne Roudeix
ebd4e76e0a
type
2014-01-13 11:30:49 +01:00
Manuel Raynaud
6f972d8cf8
create update file
2014-01-13 10:42:52 +01:00
Manuel Raynaud
882bfeb80c
import missing namespaces in Proruct controller
2014-01-13 10:12:08 +01:00
Manuel Raynaud
7aad8b23f0
hide passord on admin creation using CLI
2014-01-13 10:00:20 +01:00
Manuel Raynaud
a1636e1f50
Merge branch 'master' of github.com:thelia/thelia
2014-01-10 16:47:17 +01:00
Manuel Raynaud
46b9919ab5
update thelia version for next beta version
2014-01-10 16:46:57 +01:00
