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 Nadaud and Francois 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
gRoussac
9328a3c473
// forgot to commit https://github.com/PrestaShop/PrestaShop/commit/036e2362c97ca00e9066076af1c45fc8f9946d56
2013-11-12 19:17:54 +01:00
gRoussac
c8dfe1c174
[-] FO : Wordwrap on prices in history
2013-11-12 19:17:12 +01:00
Rémi Gaillard
75df12dd94
[-] Core: Group::getCurrent() return the default customer group of the shop if default customer group is not associated to shop
2013-11-12 18:49:52 +01:00
Gregory Roussac
6d7e2055ce
Merge pull request #968 from ccauw/patch-12
...
[*] BO : add class on TD in standard List
2013-11-12 09:38:03 -08:00
gRoussac
4d327a537f
[*] FO : addTextFieldToProduct without Line feed, follow up https://github.com/PrestaShop/PrestaShop/pull/962#issuecomment-28294571
2013-11-12 18:28:42 +01:00
Kevin Granger
4fbc8deaa8
// fix products
2013-11-12 18:21:36 +01:00
ccauw
747926039a
[*] BO : add class on TD in standard List
...
Back office :
Add a class on TD in list created by getList()
In fields_list array of AdminController, we can add a new parameter('class')
example :
'name' => array(
'title' => $this->l('Name'),
'width' => 150,
'class' => 'ma_classe',
'filter_key' => 'b!name'
),
This parameter can be used for javascript effect, ...
Thanks.
2013-11-12 18:01:27 +01:00
gRoussac
5e4382eb08
[-] BO : Fix bug #PSCFV-10982 reduction group truncated
2013-11-12 17:55:07 +01:00
Vincent Augagneur
52abf62ae1
//dashactivity config
2013-11-12 17:33:54 +01:00
gRoussac
036e2362c9
[+] CORE : Fixed cache_id
2013-11-12 17:09:38 +01:00
Fabio Chelly
fc193d5c8b
Merge remote-tracking branch 'origin/development' into development
2013-11-12 16:36:19 +01:00
Rémi Gaillard
75e6a03591
// small fix
2013-11-12 16:38:34 +01:00
Fabio Chelly
dd05692400
[-] FO : Fixed errors when calculating most selled products from footer link
2013-11-12 16:36:07 +01:00
ldecoker