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

542 Commits

Author SHA1 Message Date
Manuel Raynaud
8944446776 display admin hook if in debug mode and specific parameter in url 2013-12-09 12:12:20 +01:00
gmorel
67a38bca20 Merge branch 'master' of git://github.com/thelia/thelia 
* 'master' of git://github.com/thelia/thelia:
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
 2013-11-25 22:43:04 +01:00
touffies
fd0301022d Merge branch 'backoffice' into frontend 2013-11-25 10:24:29 +01:00
gmorel
90b5fbde05 Refactor removing Manager notion 2013-11-23 20:18:04 +01:00
gmorel
95c4113ca8 Merge branch 'master' of git://github.com/thelia/thelia 
* 'master' of git://github.com/thelia/thelia:
  undo removing Response::prepare call
  HttpCache can not be activated as default
  remove specific code testing esi integration
  create smarty tag for smarty renderer
  remove Thelia ResponseListener
  add new route for testing esi tag
  tweak httpFoundation cache part for compatibility with Thelia\HttpFoundation part
  add httpcache into index_dev.php file
  start using symfony 2 reverse proxy
  update wiki url in composer file
  create smarty tag for smarty renderer
  remove Thelia ResponseListener
  add new route for testing esi tag
  Added some translations in the Customer Creation Form
  tweak httpFoundation cache part for compatibility with Thelia\HttpFoundation part
  add httpcache into index_dev.php file
  start using symfony 2 reverse proxy
 2013-11-23 01:36:12 +01:00
touffies
29ae2d26fe Add a new admin page to manage the basic store configurations 2013-11-22 17:38:21 +01:00
touffies
530188fbe7 Add routing for Store Configuration 2013-11-22 17:35:06 +01:00
Manuel Raynaud
4109de0d9c create smarty tag for smarty renderer 2013-11-20 14:45:40 +01:00
Manuel Raynaud
b9f7837686 remove Thelia ResponseListener 2013-11-20 14:45:40 +01:00
Manuel Raynaud
64c5991838 tweak httpFoundation cache part for compatibility with 
Thelia\HttpFoundation part
 2013-11-20 14:45:40 +01:00
gmorel
1b108b7953 Merge branch 'master' of git://github.com/thelia/thelia 
* 'master' of git://github.com/thelia/thelia:
  change max weight in faker
  complete readme
  create changelog file
  Front module is activated by default
  remove unused config
  remove unused form
  load custom router from Front module
  move front controller classes to Front module
  start Front module
  Corrected the French translation of "Miss" in the Register form dropdown
  remove unused config
  remove unused form
  load custom router from Front module
  move front controller classes to Front module
  start Front module
 2013-11-18 22:12:56 +01:00
Manuel Raynaud
8b8e4f7b14 remove unused config 2013-11-18 10:51:46 +01:00
Manuel Raynaud
12ac005674 remove unused form 2013-11-18 10:51:46 +01:00
Manuel Raynaud
597da57252 start Front module 2013-11-18 10:51:46 +01:00
gmorel
5679f54ec0 Adding/Refactoring unit test for ConditionFactory/ConditionManagerAbstract 2013-11-16 23:58:49 +01:00
Etienne Roudeix
299b192018 Colissimo module + countires areas 2013-11-14 09:13:28 +01:00
Etienne Roudeix
8719c05acc Merge branch 'master' of github.com:thelia/thelia 2013-11-12 16:01:08 +01:00
Etienne Roudeix
3b1d318d12 module edition 2013-11-12 16:00:52 +01:00
Manuel Raynaud
cbe5ba27cf change developmentMode by debugMode in assetManager 2013-11-12 12:41:01 +01:00
touffies
297d906027 Merge branch 'master' into frontend 
Conflicts:
	core/lib/Thelia/Controller/Admin/OrderController.php
 2013-11-12 11:09:55 +01:00
Franck Allimant
3ca3b4521b The asset manager is now a service in the container. 2013-11-12 02:12:56 +01:00
Franck Allimant
f6fc886d06 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
 2013-11-09 18:31:52 +01:00
Franck Allimant
ac74c1d61d Refactored back-office customer management 2013-11-09 18:28:01 +01:00
touffies
10632f990b Merge branch 'master' into frontend 2013-11-08 14:34:12 +01:00
Etienne Roudeix
422a80fcce module modification 2013-11-08 11:26:06 +01:00
Manuel Raynaud
41d8fce23b remove test route 2013-11-08 10:04:53 +01:00
touffies
555040fcab Add PDF for Order Details on the account page 2013-11-07 17:15:47 +01:00
Franck Allimant
f8f68eb59b Fixed minor internationalizable string error in admin templates. 2013-11-06 20:01:26 +01:00
Manuel Raynaud
b1517945f4 Merge branch 'modules' 
Conflicts:
	core/lib/Thelia/Controller/Admin/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Thelia.php
 2013-11-06 14:37:31 +01:00
Franck Allimant
ead038723f Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Template.php
 2013-11-06 11:16:27 +01:00
Manuel Raynaud
2d291cf5a0 refactor how to assign template to parser 2013-11-06 11:12:39 +01:00
Franck Allimant
361e4a9d74 Implementing translations (still in progress) 2013-11-06 10:49:03 +01:00
touffies
5bf9050a12 Delete address with ajax callback function address.delete() 2013-11-05 17:33:55 +01:00
touffies
65a8953143 Profile and Useful was misspelled 
Add missing language key into the dictionary
 2013-11-04 16:35:01 +01:00
Manuel Raynaud
b65044c1be Merge branch 'master' of github.com:thelia/thelia 2013-11-04 09:28:36 +01:00
Manuel Raynaud
d7012af3e2 add translation files for thelia core system 2013-11-04 09:28:12 +01:00
Franck Allimant
f3cba323c6 Changed 'template' loop into 'product-template' loop 2013-11-02 19:18:19 +01:00
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Franck Allimant
3368590a86 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-31 16:46:20 +01:00
Franck Allimant
a0855cda4c Added System Log configuration routes 2013-10-31 16:46:04 +01:00
Etienne Roudeix
bc454124f3 admin home stats 2013-10-31 16:09:31 +01:00
Etienne Roudeix
899a154350 Merge branch 'master' of github.com:thelia/thelia 2013-10-31 15:33:30 +01:00
Manuel Raynaud
453575eeae create compiler for loading translation.loader tag 2013-10-31 11:48:18 +01:00
Manuel Raynaud
1ce6dfe04d explode master config file. Now each xml file file presents in master 
config is parse
 2013-10-31 11:21:26 +01:00
Etienne Roudeix
e5f5570d2b Merge branch 'master' of github.com:thelia/thelia 2013-10-31 11:20:42 +01:00
Manuel Raynaud
8abe56458f retrieve local from session in translator 2013-10-31 10:02:13 +01:00
Manuel Raynaud
5be233c079 set default locale to null in translator 2013-10-31 09:52:06 +01:00
Manuel Raynaud
1e549c2b8f change default locale in config.xml for translator 2013-10-31 09:39:22 +01:00
Etienne Roudeix
083dde5e93 admin home stats 2013-10-30 16:32:24 +01:00
Franck Allimant
a11a013eb0 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-30 15:44:57 +01:00