TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
805 Commits 1 Branch 0 Tags
dc271db577d3f19cca9c104b4d913a6d10ff1226
Commit Graph

25 Commits

Author SHA1 Message Date
gmorel
dc271db577 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh
 2013-09-04 12:01:12 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-02 09:19:24 +02:00
franck
e1cc7162ae Added get/setLangId() method in session 2013-09-02 02:04:36 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
franck
a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/default/login.html
 2013-08-30 19:48:26 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
gmorel
180302e7cc Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Factorized ModelCriterialTools calls in loops

Conflicts:
	templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
	templates/admin/default/assets/css/admin.less
 2013-08-30 15:43:43 +02:00
Etienne Roudeix
c0a4b8b987 Merge branch 'master' into rewrite 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Attribute.php
	core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
	core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/Content.php
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Loop/Currency.php
	core/lib/Thelia/Core/Template/Loop/Feature.php
	core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Image.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Loop/Title.php
	core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
 2013-08-30 15:02:48 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
franck
cce270fdcc Factorized ModelCriterialTools calls in loops 2013-08-28 19:47:31 +02:00
gmorel
84a2314108 WIP 
- Add Coupon BackOffice controller
- Add Coupon BackOffice template skeleton
- Add Coupon BackOffice routes
 2013-08-28 18:06:22 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
 2013-08-21 09:19:56 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +02:00
franck
efa3eb2767 Category visibility toggle implementation 2013-08-08 10:12:14 +02:00
franck
64031a1883 Added category creation and deletion 2013-08-08 02:39:42 +02:00
franck
90f5bdd453 Added first catalog page 2013-08-07 10:17:22 +02:00
franck
4ad94059e7 Product loop adjustements 2013-08-01 10:53:35 +02:00
franck
f7a635dbf7 Added DataAccess plugin, admin header completed 2013-07-25 22:59:46 +02:00
franck
385a83f896 Finalized admin security 2013-07-12 14:22:08 +02:00
franck
6e5b259d44 Added Feed loop to retreive feeds using SimplePie 2013-07-06 10:18:19 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles 
change composer required PHP version from 5.4 to 5.3
 2013-06-20 15:21:16 +02:00
franck
8244efdb1d Cleanup 2013-06-19 10:33:29 +02:00
franck
89abfaad48 Integration of Assetic in SmartyParser, extended it to Admin (we can now 
use loops !), added the Thelia ControllerResolver and fixed config and
routing accordingly.²:wq
 2013-06-19 02:07:43 +02:00
franck
7351edeb46 Test du sparty parser 2013-06-18 15:36:22 +02:00