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

50 Commits

Author SHA1 Message Date
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
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
40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
ed836e081c //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
vAugagneur
42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
vAugagneur
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre
f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre
0d4ff05960 [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 2012-05-15 10:04:43 +00:00
lLefevre
0129e7314a [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 2012-05-15 10:04:43 +00:00
bMancone
c420980356 // Fixed #PSFV-631 2012-04-05 15:23:34 +00:00
bMancone
0df4b21135 // Fixed #PSFV-631 2012-04-05 15:23:34 +00:00
bMancone
764a56a2ec // Bad default ident options: normalize revision 14492 2012-04-05 13:58:58 +00:00
bMancone
e1dd510ef2 // Bad default ident options: normalize revision 14492 2012-04-05 13:58:58 +00:00
bMancone
2235fdb440 // Display memcached server status : #PSFV-631 2012-04-05 13:44:18 +00:00
bMancone
256450c120 // Display memcached server status : #PSFV-631 2012-04-05 13:44:18 +00:00
lLefevre
1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
tDidierjean
0f468ac091 // Rename tpl blocks 2012-03-12 16:33:59 +00:00
tDidierjean
f44d00edde // Rename tpl blocks 2012-03-12 16:33:59 +00:00
tDidierjean
39b83a9318 // More helper forms refactoring 2012-03-07 17:55:53 +00:00
tDidierjean
59b5ff43b5 // More helper forms refactoring 2012-03-07 17:55:53 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
tDidierjean
3a30f788ac // Move all helper override templates for controllers to subfolders 2012-02-06 18:12:15 +00:00
tDidierjean
597e921d96 // Move all helper override templates for controllers to subfolders 2012-02-06 18:12:15 +00:00
tDidierjean
a94c3b98d8 // Rename template/helper to template/helpers 2012-02-06 16:35:49 +00:00
tDidierjean
e73990a61c // Rename template/helper to template/helpers 2012-02-06 16:35:49 +00:00
vChabot
42e7187a26 [-] BO : BugFix : #PSTEST-355 : replacing "Groups Attributes and Attributes" by "Attributes and Values" 2012-01-11 15:49:35 +00:00
vChabot
f864d8ed4f [-] BO : BugFix : #PSTEST-355 : replacing "Groups Attributes and Attributes" by "Attributes and Values" 2012-01-11 15:49:35 +00:00
tDidierjean
e2dbac517f // Move controller templates to subfolder controllers/ 2012-01-09 17:23:42 +00:00
tDidierjean
b1e9cedf42 // Move controller templates to subfolder controllers/ 2012-01-09 17:23:42 +00:00