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

121 Commits

Author SHA1 Message Date
rGaillard
78a6821b2f // handle img extensions in the end of query string in the dispatcher 2013-12-02 16:14:27 +01:00
Rémi Gaillard
e3cfacb90e // link to employee default tab and not index 2013-11-07 17:00:55 +01:00
Kevin Granger
889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
Rémi Gaillard
1b019dffc5 // Fix lang detection on dispatcher 2013-10-31 15:28:19 +01:00
Rémi Gaillard
8b1f9d0560 // small changes on admincms 2013-10-25 18:42:54 +02:00
Damien Metzger
336e29eb67 // Default tab is the dashboard 2013-09-25 18:08:56 +02:00
gRoussac
e5276ff531 [-] FO : 301 Redirect /iso_lang to /iso_lang/ url 2013-09-12 11:16:12 +02:00
Rémi Gaillard
669c3791b5 [-] BO: Fix preview url with multishop 2013-09-11 15:55:25 +02:00
Jerome Nadaud
6aad506c80 [-] FO : FixBug when route id is empty 2013-08-27 12:01:40 +02:00
Rémi Gaillard
3d591be8c6 [-] Core: Fix language link with multishop from another shop #PSCFV-10063 2013-08-14 11:25:46 +02:00
Rémi Gaillard
20b5449231 [*] Core: that is now easier to get links for another shop 2013-07-11 16:40:40 +02:00
Damien Metzger
00425a4c1a [-] FO : fixed bad condition in the dispatcher rules 2013-07-09 10:52:50 +02:00
gRoussac
e34ef4f7f4 // no controllerUri for front office please 2013-05-15 17:11:32 +02:00
gRoussac
79c1d7d0f0 // refacto for last commit c7aa92f3b3 2013-05-15 11:47:46 +02:00
gRoussac
9b615244b1 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable 2013-05-15 11:31:55 +02:00
Francois Gaillard
8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
Damien Metzger
1d8c2f84c3 [-] FO : do not use dispatcher routes for static files 2013-04-25 11:06:54 +02:00
vAugagneur
3607c2264f [-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back 2013-04-23 17:41:29 +02:00
Damien Metzger
213b232278 // Moved layered rules from top to bottom in order to avoid conflicts 2013-03-12 10:17:10 +01:00
Damien Metzger
cf83821c60 [-] Core : prepend/append are now a little more optionnal in the routes for the dispatcher 2013-01-29 15:59:49 +01:00
vAugagneur
15d5b1ae07 //revert boulette 2013-01-15 15:04:20 +01:00
vAugagneur
34364e0801 //small fix 2013-01-15 14:52:57 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Rémi Gaillard
1d909b1248 [-] FO: The dispatcher now load the custom routes prior the defaults to avoid infinite loops 2012-12-12 11:46:19 +01:00
vAugagneur
ec05f5e384 [-] CORE : fixed bug #PSCFV-6084 2012-12-11 16:59:35 +01:00
Rémi Gaillard
1c1fd827da // small fix for urls 2012-12-07 11:46:50 +01:00
vAugagneur
048f3cce14 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled 2012-12-06 16:53:29 +01:00
vAugagneur
6f4de596c6 [-] CORE : fixed bug #PSCFV-5536 - Layout for index controller is broken 2012-11-23 19:01:26 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
Rémi Gaillard
cba080ccd8 [-] FO: Fix: many fixes - domain for cookies with different url for ssl / add to cart button for minimal quantities with product attributes 2012-11-20 19:05:21 +01:00
vAugagneur
c3bbcda805 [-] BO : fixed bug #PSCFV-4787 - Administration > Quick Access: token issue 2012-10-26 14:31:46 +00:00
rGaillard
4c0a5d1bb2 [-] FO: Fix language switching on modules controllers 2012-10-22 16:24:24 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
vAugagneur
15c7a22302 [-] CORE : fixed bug #PSCFV-4634 - Object::cleanPosition() is no longer call in controller but in Object::delete(); 2012-10-03 09:36:25 +00:00
dMetzger
84894cdbca // Code cleaning 2012-09-20 13:16:01 +00:00
rGaillard
b0c98979c5 // Fix PSCFV-3953 2012-09-07 10:08:32 +00:00
dMetzger
b51a95f9dd // Opti 2012-08-29 14:22:23 +00:00
fBrignoli
ab1fa12f0e [-] FO : Bug Fixed #PSCFV-3407 - Only index page allows an empty url_rewrite 2012-07-31 08:40:16 +00:00
rGaillard
fca78c9695 [-] FO: Fix dispatcher which not allow underscores on rewrited urls 2012-07-11 15:09:51 +00:00
rGaillard
7065763cc7 [-] FO: Fix lang links when url rewrite is not activated 2012-07-10 13:29:02 +00:00
rGaillard
8b8069f024 [-] BO: Fix combinations creation on multistore 2012-07-09 15:41:07 +00:00
dMetzger
c6a1948341 [*] BO : Added an override capability for the admin templates 2012-07-09 14:12:37 +00:00
dMetzger
f3a871ffee [-] BO : you do not need to add the admin controller in the core, the override directory is enough 2012-07-09 12:56:51 +00:00
vAugagneur
f8d28045dd [-] BO : fixed #PSCFV-3043 - can't active language in BO 2012-07-05 07:22:31 +00:00
mDeflotte
3db6a38f1e [-] FO : #PSCFV-2951 - Fix bug with dispatcher and route rule with multilanguage 2012-07-02 14:16:47 +00:00
mDeflotte
06578c6e00 // Fix bug with dispatcher on going from a page in a language to an other one with an other language 2012-06-29 14:53:32 +00:00
rMalie
c735d0ec1a // Fix index.php in dispatcher 2012-06-14 13:04:24 +00:00
rMalie
69492b2b53 // Allow to force routes #PSCFV-2592 2012-05-28 13:41:00 +00:00
rMalie
2313f6b057 // Fix dispatcher when no empty rewrite meta is found with friendly url 2012-05-19 09:25:07 +00:00