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

2953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Franck Allimant
bb452c2efc Changed "Details" by "Price" 2014-01-23 15:35:52 +01:00
Franck Allimant
c55ddfabdf Merge branch 'master' of https://github.com/thelia/thelia 2014-01-23 12:06:27 +01:00
Franck Allimant
73680d3d01 Fixed TaxEngine usage. 2014-01-23 12:06:14 +01:00
Manuel Raynaud
dbf0c78fa5 remove hardcoded annotation 2014-01-23 11:43:06 +01:00
Manuel Raynaud
1023790822 remove myserious annotation... 2014-01-23 11:41:15 +01:00
Franck Allimant
c8620ea63b Merge branch 'master' of https://github.com/thelia/thelia 2014-01-23 09:34:25 +01:00
Franck Allimant
54db55467b Fixed injection of TaxManager in TaxCreationForm instance 2014-01-23 09:33:09 +01:00
Manuel Raynaud
49ad3a27da update composer dependencies 2014-01-23 09:31:39 +01:00
Emmanuel Nurit
da905bcbb1 [front office] modification template default 
Displaying fields with nofilter.
Adding some missing translation strings
 2014-01-23 09:10:27 +01:00
Manuel Raynaud
1b2c1d53ac remove some unused variables 2014-01-22 15:50:40 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Franck Allimant
9d1c1e3979 Fixed buggy test 2014-01-22 01:48:35 +01:00
Franck Allimant
5d92ea0bab TaxManager is now a service in the container. 2014-01-22 01:18:28 +01:00
Franck Allimant
c9c489a76b Added a quick and dirty way to guess in an inactive module has a config 
route
 2014-01-21 23:56:47 +01:00
Manuel Raynaud
3b3e993514 unescape variable in form 2014-01-21 14:56:51 +01:00
Franck Allimant
9ca9739ad0 Merge branch 'master' of https://github.com/thelia/thelia 2014-01-21 14:51:43 +01:00
Franck Allimant
ef5f20ff09 Added fluidity to setters ;-) 2014-01-21 14:40:22 +01:00
Manuel Raynaud
c41e161736 Merge pull request #191 from lunika/186-back-office-impossible-to-delete-related-content 
This PR was merged into thelia:master branch.

Discussion
----------

Fix associations with category, product and content

+---------------+------+
| Q             | A    |
| ---           | ---  |
| Bug fix?      | y    |
| New feature?  | n    |
| BC breaks?    | n    |
| Deprecations? | n    |
| Tests pass?   | y    |
| Fixed tickets | #186 |
| License       | GPL  |
| Doc PR        |      |
+---------------+------+


Commits
-------

502b149d32 change good content id for category associated content lunika
87bc1a83aa change content if on product associated content lunika
91cf069313 fix associations tab in product modification page lunika
d573ff54c2 put correct error messages in Document loop lunika
ce0fbb11a1 add missing close block lunika
 2014-01-21 05:15:10 -08:00
Franck Allimant
2effb52f2b Removed useless 'parent' attribute. 2014-01-21 12:31:20 +01:00
Manuel Raynaud
ce0fbb11a1 add missing close block 2014-01-21 12:25:57 +01:00
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