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
20989 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud 67eeae0fa2 // Set visibility on help button 2013-11-14 14:42:35 +01:00
Jerome Nadaud 299a8e9e9f // Update attributes group title 2013-11-14 14:13:28 +01:00
Jerome Nadaud 09b908204b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-14 11:52:34 +01:00
Jerome Nadaud 87faae9717 // Add top menu to blockcategories 2013-11-14 11:52:24 +01:00
gRoussac 6393746f04 [-] BO : 406 when mod_security follow up https://github.com/PrestaShop/PrestaShop/commit/034e6a7e7f391e3a8861248db45a4a376b19633c 2013-11-14 11:43:05 +01:00
Vincent Augagneur 9a0b308846 //remove preactivationLink ajax and move in gamification module 2013-11-14 10:54:29 +01:00
Jerome Nadaud 63ef0b82e6 // Categories thumbnail images for blocktopmenu 2013-11-14 10:37:07 +01:00
Jerome Nadaud 232309996b // Fix blocklayered bootstrap 2013-11-14 10:35:02 +01:00
Jerome Nadaud 27731f3bb2 // Bootstraping blocklayered backoffice and ajax fix 2013-11-13 20:13:42 +01:00
Kevin Granger a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +01:00
Jerome Nadaud afaeb15b7d // Define default template dir on tree class 2013-11-13 20:10:13 +01:00
gRoussac db99f188a2 [-] BO : AdminImport, execption when creating groups 2013-11-13 18:23:41 +01:00
Gregory Roussac fe8e349931 Merge pull request #975 from ldecoker/patch-10 
[-] FO : _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined
 2013-11-13 09:14:49 -08:00
ldecoker 3f8b76f78c [-][FO] _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined 
When there is no mobile theme provided with the current theme, the variable _PS_THEME_MOBILE_OVERRIDE_DIR_ is not defined. We so get the following error in apache logs:

"PHP Notice:  Use of undefined constant _PS_THEME_MOBILE_OVERRIDE_DIR_ - assumed '_PS_THEME_MOBILE_OVERRIDE_DIR_' in FrontController.php"
 2013-11-13 18:12:59 +01:00
Francois Gaillard c9a2410c57 [-] Classes : AdminController - Changed admin-theme.css position 2013-11-13 17:48:21 +01:00
Rémi Gaillard 3b1168a032 Merge pull request #974 from TMMeilleur/bootstrap 
// added transforming for mobile view and other small fixes
 2013-11-13 08:43:43 -08:00
Alexander Grosul ae596ebcd4 added transforming for mobile view and other small fixes 2013-11-13 18:34:34 +02:00
gRoussac 947f9bb21c // small isset in productcomments 2013-11-13 16:39:33 +01:00
Rémi Gaillard fa3aa8c9d7 // strict standard 2013-11-13 15:46:06 +01:00
Rémi Gaillard 83400c691c Merge pull request #973 from djfm/development 
//translations
 2013-11-13 06:34:38 -08:00
Rémi Gaillard f4601d9680 // default form language 2013-11-13 15:37:58 +01:00
Jerome Nadaud aa81e2607f // First boostraping pass on blocklayered module 2013-11-13 15:31:30 +01:00
Rémi Gaillard 899dea47a1 // oups 2013-11-13 15:32:56 +01:00
Rémi Gaillard 2fe12b965b [-] Core: add possibility to choose the position of your css files 2013-11-13 15:31:29 +01:00
fram 28e1a94bb6 // instead instead of insted 2013-11-13 15:10:06 +01:00
fram ad6367f2bf // updated native translations 2013-11-13 15:06:47 +01:00
gRoussac 5a8c335d78 [-] FO : Bad value for back when controller name is sent 2013-11-13 12:30:39 +01:00
Rémi Gaillard f7e1229e16 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-13 11:58:24 +01:00
Rémi Gaillard 24a4694000 // small clean 2013-11-13 11:58:11 +01:00
gRoussac 4479db88a0 [-) PDF : nowrap on several product prices 2013-11-13 11:52:10 +01:00
Vincent Augagneur 5963871a01 //small fix 2013-11-13 11:40:13 +01:00
Francois Gaillard 339c954cb3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 11:24:51 +01:00
Jerome NadaudandFrancois Gaillard c4837e65ec [-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination 2013-11-13 11:24:25 +01:00
Rémi Gaillard 4a9383bbcf // small fix 2013-11-13 11:15:48 +01:00
Jerome Nadaud 2117c89352 [-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination 2013-11-13 11:04:13 +01:00
Jerome Nadaud 9f10a851e5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 10:58:01 +01:00
Gregory Roussac 66a9ee03fc Merge pull request #971 from studiokiwik/sk-ps15x-008 
[-] FO : fix contact-form id_order input when customer is not logged
 2013-11-13 01:42:00 -08:00
Rémi Gaillard 115c368a89 Merge pull request #970 from alexey-svistunov/bootstrap 
//Frontend updates.
 2013-11-13 01:29:22 -08:00
gRoussac c69688cc11 [-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy 2013-11-13 10:14:21 +01:00
Mikael Blotin 26d1ad0668 [-] FO : fix contact-form id_order input when customer is not logged 2013-11-13 10:12:31 +01:00
Vincent Augagneur 746d8de9c7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-13 10:09:07 +01:00
Vincent Augagneur 5d0117c5ed //added configuration in sql request in dashactivity 2013-11-13 10:08:57 +01:00
Jerome Nadaud 6a99b84452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-13 10:02:28 +01:00
Jerome Nadaud 2cbf8af2b2 // Cms title 2013-11-13 09:36:58 +01:00
Vincent Augagneur 582ad68875 added default configuration value for dashproducts 2013-11-13 09:27:48 +01:00
Vincent Augagneur 55fa826525 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-13 09:07:54 +01:00
Vincent Augagneur e7869f6b19 //added default configuration value for dashactivity 2013-11-13 09:07:44 +01:00
alexey-svistunov a7aea1d018 Updating styles 2013-11-13 10:01:04 +02:00
alexey-svistunov e7abdee44a Merge remote-tracking branch 'upstream/bootstrap' into bootstrap 2013-11-13 09:59:11 +02:00
gRoussac 6ddf220aee [-] Fo : Call Gmaps on https if required 2013-11-12 21:16:09 +01:00