TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,933 Commits 1 Branch 0 Tags
d573ff54c269f34579eaf9bf12d5eedf6977a047
Commit Graph

2933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Raynaud
d573ff54c2 put correct error messages in Document loop 2014-01-21 11:27:15 +01:00
Manuel Raynaud
91cf069313 fix associations tab in product modification page 2014-01-21 11:27:15 +01:00
Manuel Raynaud
87bc1a83aa change content if on product associated content 2014-01-21 11:27:15 +01:00
Manuel Raynaud
502b149d32 change good content id for category associated content 2014-01-21 11:27:15 +01:00
Franck Allimant
8bc1f67a51 Added link to associated content 2014-01-21 02:13:55 +01:00
Franck Allimant
76926dce68 Removed the empty "details" tab 2014-01-21 02:12:43 +01:00
Franck Allimant
6a9900a909 Added CONTENT_ID output variable 2014-01-21 02:00:40 +01:00
Franck Allimant
9fba3e4065 Added some fluidity to Tlog setters 2014-01-21 00:59:03 +01:00
Franck Allimant
70651c2f32 Merge branch 'master' of https://github.com/thelia/thelia 2014-01-20 23:38:33 +01:00
Franck Allimant
66d6d03770 Fixed depracation of rewritten URL 2014-01-20 23:38:14 +01:00
Manuel Raynaud
7d6e889865 Merge pull request #189 from lunika/185-back-office-save-and-close-doesn-t-work-in-some-screen 
'Save and close' button had now effects:wq
 2014-01-20 05:54:40 -08:00
Manuel Raynaud
2bd23777ca "save and close" button had now effect. Fix #185 2014-01-20 14:52:44 +01:00
Manuel Raynaud
a548e1c5b0 Merge pull request #184 from Boyquotes/master 
Implementation of the translation system for installation process
 2014-01-20 05:20:06 -08:00
Manuel Raynaud
eb550e69fc Merge branch 'master' of github.com:thelia/thelia 2014-01-20 14:05:34 +01:00
Manuel Raynaud
2218b79e8d company field is not required 2014-01-20 14:04:52 +01:00
Manuel Raynaud
180068d252 Merge pull request #187 from enurit/master 
[front office] default template unescape title
 2014-01-20 05:01:37 -08:00
Manuel Raynaud
93e5c42b53 complete changelog 2014-01-20 12:17:55 +01:00
Emmanuel Nurit
83dd514114 [front office] default template unescape tile 2014-01-20 12:07:58 +01:00
Manuel Raynaud
3e4eff172f fix getExistingObject method for several controller. 2014-01-20 12:01:25 +01:00
Etienne Roudeix
809d2631c0 remove old functions 2014-01-20 11:11:44 +01:00
Manuel Raynaud
a176711d5c add license badge in readme file 2014-01-20 09:44:09 +01:00
Manuel Raynaud
e68769efa6 add alias branch in composer.json file 2014-01-20 09:41:09 +01:00
Nicolas Villa
9056c725c7 Implementation of the translation system for installation process 2014-01-20 07:55:24 +01:00
Franck Allimant
e05f836cbf Merge branch 'master' of https://github.com/thelia/thelia 2014-01-17 23:54:56 +01:00
Franck Allimant
f5cc6869cd Type on template not found exception 2014-01-17 19:06:24 +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
-------

992b5be95c fix routing name in Coupon module. Fix #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
-------

9b81e88946 fix pdf generation. Fix #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 alloow possibility to specify a ref for a customer lunika
 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