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

365 Commits

Author SHA1 Message Date
gmorel
59932078fc Merge branch 'master' of git://github.com/thelia/thelia into french_translation 
* 'master' of git://github.com/thelia/thelia:
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
  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-27 19:16:17 +01:00
touffies
4ef7bd4c38 Call the wrong AdminResources in saveAction 2013-11-22 17:42:09 +01:00
touffies
29ae2d26fe Add a new admin page to manage the basic store configurations 2013-11-22 17:38:21 +01:00
gmorel
968bddbcf9 Fix Coupon/Condition refactor 2013-11-19 13:15:23 +01:00
Etienne Roudeix
8cd32aa5dd Merge branch 'modules' 2013-11-14 12:04:20 +01:00
Etienne Roudeix
299b192018 Colissimo module + countires areas 2013-11-14 09:13:28 +01:00
Manuel Raynaud
c5d6157cd5 change translation template baseDir 2013-11-13 16:27:36 +01:00
Etienne Roudeix
77760e7d3f module template inclusion 2013-11-13 14:48:35 +01:00
touffies
d1b897a254 Merge branch 'master' into frontend 
Conflicts:
	core/lib/Thelia/Controller/Admin/OrderController.php
 2013-11-12 11:20:46 +01:00
Franck Allimant
d2087b994a Fixed customer edit routes 2013-11-09 19:38:38 +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
Etienne Roudeix
417ed2e324 change signature 2013-11-08 14:35:29 +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
07b88266e9 refactor pdf generator 2013-11-08 09:41:20 +01:00
Franck Allimant
f8f68eb59b Fixed minor internationalizable string error in admin templates. 2013-11-06 20:01:26 +01:00
Franck Allimant
8d40605091 Continued on translations 2013-11-06 14:40:33 +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
Manuel Raynaud
6e5ae0f634 refactor render template process 2013-11-06 13:48:32 +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
Etienne Roudeix
06ee460e8a Merge branch 'master' of github.com:thelia/thelia 2013-11-04 16:16:21 +01:00
Etienne Roudeix
969c077f81 admin home stats and information 2013-11-04 16:15:48 +01:00
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Etienne Roudeix
899a154350 Merge branch 'master' of github.com:thelia/thelia 2013-10-31 15:33:30 +01:00
Franck Allimant
3b9f94cec8 Using now templates instead of hard code in AdminUtilities smarty plugin 2013-10-31 12:16:14 +01:00
Etienne Roudeix
00dab8e7ec review jqplot 2013-10-31 11:20:51 +01:00
Etienne Roudeix
e5f5570d2b Merge branch 'master' of github.com:thelia/thelia 2013-10-31 11:20:42 +01:00
Franck Allimant
d1c54ea62a Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
 2013-10-30 19:55:10 +01:00
Franck Allimant
f5828dc18b added timestamp parameter to format_date sparty plugin 2013-10-30 19:52:47 +01:00
Etienne Roudeix
f90df03f7d admin home stats 2013-10-30 17:00:38 +01:00
Etienne Roudeix
083dde5e93 admin home stats 2013-10-30 16:32:24 +01:00
Manuel Raynaud
86d84462ad clean some code in FileController 2013-10-30 16:13:06 +01:00
Franck Allimant
a11a013eb0 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-30 15:44:57 +01:00
Franck Allimant
0cabe7b9e8 Combination creation management 2013-10-30 15:44:32 +01:00
Etienne Roudeix
52fa6783f3 datepicker in admin logs 2013-10-30 12:00:48 +01:00
Etienne Roudeix
19e373f7fe Merge branch 'master' of github.com:thelia/thelia 2013-10-29 16:10:10 +01:00
Etienne Roudeix
a055f3b3eb admin log 2013-10-29 16:09:50 +01:00
Etienne Roudeix
082f9aff8d admin logs 2013-10-29 12:22:34 +01:00
Manuel Raynaud
7a2469cdc8 allow to create a customer in bakcoffice 2013-10-28 16:55:07 +01:00
Etienne Roudeix
2eb5fc821c mailing sytem admin 2013-10-28 12:24:59 +01:00
Manuel Raynaud
2c030f910b fix cs 2013-10-25 10:07:21 +02:00
Etienne Roudeix
8043b50c75 new permission system in controllers 2013-10-25 08:59:09 +02:00
Franck Allimant
0d50557269 Merge branch 'master' of https://github.com/thelia/thelia 2013-10-25 00:33:52 +02:00
Franck Allimant
06cc8ce1ea Finished product combinations edition 2013-10-25 00:32:56 +02:00
Manuel Raynaud
60683b7a32 Merge pull request #56 from thelia/frontend 
Wrong name form used into updateAction (CustomerController)
 2013-10-24 12:56:37 -07:00
touffies
29c2d543fb Wrong name form used into updateAction (CustomerController) 2013-10-24 21:39:50 +02:00
Manuel Raynaud
97d3be6104 fix AdminResources constant in MessageController 2013-10-24 19:52:09 +02:00
Franck Allimant
87df547668 Removed var_dump(à 2013-10-24 17:01:10 +02:00