dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,019 Commits 9 Branches 19 Tags
ed0037c435b8309c2e00a1ef84bd037f150f85d7
Commit Graph

1452 Commits

Author SHA1 Message Date
Jerome Nadaud 946840ae45 // Small id fix 2013-08-26 18:39:38 +02:00
Kevin Granger a972de046e // fix Modules page 2013-08-26 12:26:41 +02:00
Kevin Granger f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger 3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Kevin Granger 17be1e7528 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-20 16:40:14 +02:00
Kevin Granger 44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud 41190a66d4 [+] BO : Product tab fieldset and accordion fix 2013-08-19 18:45:57 +02:00
Jerome Nadaud 5336467e04 [-] BO : FixBug Friendly URL by language 2013-08-19 17:51:53 +02:00
Jerome Nadaud 68d7a320cd [-] BO : FixBug Friendly URL change 2013-08-19 17:48:58 +02:00
Jerome Nadaud 4a2e545bc4 [+] BO : Products tab fieldset 2013-08-19 13:30:18 +02:00
Jerome Nadaud 0aa908bd25 [+] BO : Products add fileset for informations and prices tab 2013-08-19 11:59:27 +02:00
Jerome Nadaud 1138e8d01a [-] BO : FixBug Friendly URL change 2013-08-19 10:17:42 +02:00
Jerome Nadaud f73f84dbf2 [+] BO : Product information tab 2013-08-13 17:23:38 +02:00
Jerome Nadaud 1d6f3382f5 [-] BO : FIxBug Correct image path in product 2013-08-13 16:01:42 +02:00
Jerome Nadaud 5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
Jerome Nadaud e33cd2d13b [+] BO : Add active class to list view button 2013-08-13 13:55:41 +02:00
Jerome Nadaud 1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
Jerome Nadaud 5f6c1ac1ce // HTML Syntax error 2013-08-12 16:44:15 +02:00
Kevin Granger 6ae222e720 // some sass/compass magic for color schemes… and few new bugs to fix with layout 2013-08-08 16:59:39 +02:00
Jerome Nadaud cd1ed74d8e [-] BO : FixBug #PSCFV-10038 escaped quote in address fields 2013-08-07 11:53:12 +02:00
Kevin Granger ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Vincent Augagneur 67b44b5f17 //fixed carrier bug and added typewatch plugin on range validation 2013-08-06 18:04:12 +02:00
Vincent Augagneur 478e338df0 //added active field on carrier wizard 2013-08-06 11:40:03 +02:00
gRoussac a69d1c6d05 Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug 
Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml
 2013-08-06 10:42:44 +02:00
Kevin Granger 58cba9f894 // [+] Module - Login Addons 2013-08-06 10:19:43 +02:00
Kevin Granger bdc9d77c09 // Module List + some design WIP 2013-08-05 20:42:14 +02:00
Vincent Augagneur 3a75a783f6 //added label on carrier zones && improve range validation 2013-08-05 16:54:36 +02:00
Vincent Augagneur 5a88dc0f8b //fixed bug on carrier wizard when edit carrier 2013-08-05 14:06:50 +02:00
Sarah Lorenzini 6533ee4bec // update stock tab 2013-08-05 12:13:43 +02:00
Rémi Gaillard 003c05a729 [-] BO: Fix #PSCFV-9885 catalog price rules edition 2013-08-05 09:55:29 +02:00
Kevin Granger 9f11ecfd78 // Add label attributes for, refacto browse file 2013-08-02 18:46:37 +02:00
Gregory Roussac 47b7e6aab5 Merge pull request #392 from ldecoker/patch-4 
[-] [BO] : The div for colorAttributeProperties is not closed
 2013-08-02 09:15:51 -07:00
Sarah Lorenzini 94a43f2991 // update advanced parameters and administration tabs 2013-08-02 17:44:26 +02:00
Vincent Augagneur be93a00277 //new place for validate and add new range && global range validation part 1 on carrier wizard 2013-08-02 17:29:15 +02:00
Sarah Lorenzini 60f567d2ff // update modules tab 2013-08-02 15:20:12 +02:00
Sarah Lorenzini 142006e69a // update advanced parameters 2013-08-02 15:10:58 +02:00
Vincent Augagneur f2146ac2ae //fixed somes bug on carriers wizard 2013-08-02 10:54:07 +02:00
Vincent Augagneur 9e720da3d6 //carrier wizard free shipping fix & added currency sign on new range 2013-08-02 10:22:06 +02:00
Vincent Augagneur ac48c1b786 //remove inline css 2013-08-01 18:26:39 +02:00
Sarah Lorenzini e2abf3ecb7 // update preferences tab -> images controller 2013-08-01 17:26:53 +02:00
Vincent Augagneur 1447be6f3c //fixed bug when changing range type 2013-08-01 17:16:52 +02:00
Vincent Augagneur fa958c9a5e //carrier wizard currency sign bug 2013-08-01 17:13:08 +02:00
Sarah Lorenzini 047ab9d681 // update images controller 2013-08-01 16:45:46 +02:00
Sarah Lorenzini 50a54240b9 // update images controller 2013-08-01 16:43:58 +02:00
Sarah Lorenzini 680497f1e3 // update preferences tab 2013-08-01 16:40:48 +02:00
Vincent Augagneur adede4f7ea //small fix 2013-08-01 16:11:50 +02:00
Vincent Augagneur c0db0bfca9 //Added currency sign and weigh unit on carrier wizard 2013-08-01 16:03:14 +02:00
Kevin Granger 5defc39def [+] BO Images / Marketing / Spe. Prices Rules 2013-08-01 14:42:43 +02:00
Vincent Augagneur dfb1924884 //carrier wizard fix when edit a carrier 2013-08-01 11:47:39 +02:00
Kevin Granger e4878ba393 // I'm not sure as I've never had a look at how that works before ;) 2013-07-31 21:17:03 +02:00