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

2983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Raynaud
d3c276041f add new translations 2014-01-27 16:56:05 +01:00
Franck Allimant
c5cc6aae76 Added administrator preferred locale (see issue #183) 2014-01-27 14:29:37 +01:00
Franck Allimant
a27c913f70 Fixed LONG VARCHAR problem in coupon table 2014-01-27 14:29:06 +01:00
Franck Allimant
ebdb6731ae Merge branch 'master' of https://github.com/thelia/thelia 2014-01-27 14:26:22 +01:00
Manuel Raynaud
d082e239ca Merge branch 'optim' 2014-01-27 14:25:21 +01:00
Franck Allimant
09e6985eb4 Added locale attribute to administrator 2014-01-27 13:12:16 +01:00
Franck Allimant
d52d49ae05 Fixed wrong values displayed for empty text feature values 2014-01-27 12:50:18 +01:00
Manuel Raynaud
54b95fccd5 create cache for BaseLoop::count method 2014-01-27 11:34:54 +01:00
Manuel Raynaud
5b9b03970e count parameter is not needed anymore in BaseLoop::exec 2014-01-27 11:34:54 +01:00
Manuel Raynaud
2411f5ffa3 cache ParseResult for not calculating twice the same loop 2014-01-27 11:34:54 +01:00
Franck Allimant
3c36a3e1b2 Language menu in the B.O to switch UI language on the fly. (see issue #183) 2014-01-26 22:03:11 +01:00
Franck Allimant
6b78a33f97 Improved order management in back-office 2014-01-25 19:14:57 +01:00
Franck Allimant
5f883a41a4 Introduced money_format smarty plugin, and the related formatting class. 
TODO: define the currency symbol location (left or right) in i18n params !
 2014-01-25 19:00:29 +01:00
Franck Allimant
099e5d68e5 Restored propel debug (was commented out) 2014-01-25 02:39:53 +01:00
Franck Allimant
c2b310fd73 Created TlogDestinationRotatingFile and set it the default destination 2014-01-25 00:30:09 +01:00
Franck Allimant
3e3ecc8edf Fixed undefined $search 2014-01-24 23:07:37 +01:00
Franck Allimant
24ffc81b36 Fixed typo 2014-01-24 15:27:56 +01:00
Franck Allimant
af47399f09 Minor cosmetic changes 2014-01-24 15:19:16 +01:00
Franck Allimant
edbc63bb53 Fixed Customer namespace problem 2014-01-24 15:18:50 +01:00
Manuel Raynaud
014b1670be fix smarty code style 2014-01-24 11:06:14 +01:00
Manuel Raynaud
aad23ab85e apply nofilter modifier on capture.additional in product page 2014-01-24 10:32:18 +01:00
Manuel Raynaud
13f59cda0a remove unused include 2014-01-24 09:34:04 +01:00
Manuel Raynaud
e7ac9adba4 [Front]remove toolbar inclusion in category page 2014-01-24 09:34:04 +01:00
Manuel Raynaud
b5bd437d91 use count smarty function instead of loop for retrieving number of 
results
 2014-01-24 09:34:04 +01:00
Manuel Raynaud
ffe0a209fd create a dedicated method for count loop function 2014-01-24 09:34:04 +01:00
Franck Allimant
3c16cac486 Implemented order creation outside front-offcie context 2014-01-23 19:54:16 +01:00
Franck Allimant
e5fea4bdd2 Merge branch 'master' of https://github.com/thelia/thelia 2014-01-23 16:42:12 +01:00
Franck Allimant
bb452c2efc Changed "Details" by "Price" 2014-01-23 15:35:52 +01:00
Manuel Raynaud
2cee70a2b7 refactor count loop for having better performance has mentionned in #193 2014-01-23 14:43:05 +01:00
Manuel Raynaud
7f7e8cb2e2 Merge branch 'master' of github.com:thelia/thelia 2014-01-23 12:07:19 +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
a1e137128a remove Iterator for deleting folders 2014-01-23 11:52:33 +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