Jerome Nadaud
3af7a59caa
// Add version number to addsharethis
2013-11-15 15:32:52 +01:00
Jerome Nadaud
b5d84a72e0
// AddShareThis fix
2013-11-15 15:31:01 +01:00
gRoussac
73bf2a7db1
[-] BO : Fix #PSCFV-11016 typo
2013-11-15 15:16:02 +01:00
gRoussac
9aa656c9d7
// typo
2013-11-15 15:10:12 +01:00
gRoussac
1140b5e8b5
[*] FO : Fix #PSCFV-8715 add product.attributes in carrier tpl
2013-11-15 15:06:30 +01:00
Jerome Nadaud
44f89053e4
// Invoice search fix
2013-11-15 15:00:56 +01:00
gRoussac
6a690b255b
[-] BO : Model return html error messagae instead of json while image uploading
2013-11-15 12:20:10 +01:00
Jerome Nadaud
9fa2299c6b
// Open prestashop.com link in new window
2013-11-15 11:56:23 +01:00
Jerome Nadaud
d7de507f42
// Product comments
2013-11-15 11:49:40 +01:00
gRoussac
152960639f
[-] BO : Product final price can not be hidden on loading tab, report of https://github.com/PrestaShop/PrestaShop/commit/6c6c3b240ee2249b7f99be1a112905cd0edbee46
2013-11-15 11:36:07 +01:00
Gregory Roussac
448a4c9994
Merge pull request #980 from djfm/development
...
// no line breaks in $this->l()
2013-11-15 02:23:39 -08:00
gRoussac
7526fe4766
// missing trailing semi-column
2013-11-15 11:16:48 +01:00
Jerome Nadaud
50eee795ed
// Add truncate category description preserving html tags
2013-11-15 11:03:06 +01:00
gRoussac
97be96ede8
[-] MO : Missinag closing href
2013-11-15 10:54:50 +01:00
gRoussac
0b47ef1b3b
[-] BO : test on xml string follow up https://github.com/PrestaShop/PrestaShop/pull/690#issuecomment-28542506
2013-11-15 10:51:46 +01:00
fram
ba15d975bc
// no line breaks in $this->l()
2013-11-15 10:44:01 +01:00
Jerome Nadaud
a66d2e1ab6
// Fix form name
2013-11-15 09:18:41 +01:00
Jerome Nadaud
c2d956ec7d
// Modif after specs change
2013-11-15 08:58:30 +01:00
Jerome Nadaud
29f65da5ca
// Add wish list button to blockwishlist module
2013-11-14 19:54:28 +01:00
Rémi Gaillard
7fcbf8aa7c
Merge pull request #977 from TMMeilleur/bootstrap
...
//updates and fixes 14.11.2013
2013-11-14 10:28:06 -08:00
Jerome Nadaud
80957666cf
// Hide collapse and expand button when not necessary
2013-11-14 19:21:31 +01:00
gRoussac
47d58ff930
[*] FO : set at least a class to body
2013-11-14 19:03:12 +01:00
Stanislav Yordanov
c5b1834870
[*] FO : Removed unused local variable, phpdoc return tag added
2013-11-14 19:22:39 +02:00
TMMeilleur
0d1c113be1
updates and fixes 14.11.2013
2013-11-14 18:08:05 +02:00
gRoussac
d06bf10bbb
[-] FO : Fix bug #PSCFV-10911, doubles in cart rules highlight
2013-11-14 16:35:11 +01:00
Jerome Nadaud
051ed32133
// Add toggle to datepicker button
2013-11-14 16:05:58 +01:00
Jerome Nadaud
4a46960112
// Small bootstrap fix
2013-11-14 16:00:22 +01:00
gRoussac
d0d234f555
// typo, sorry about this
2013-11-14 15:58:42 +01:00
Jerome Nadaud
18a2e026ef
// Adding more buttons to module configuration
2013-11-14 15:49:17 +01:00
Stanislav Yordanov
e7e514dc77
Removed unused local variable, tab added, phpdoc tags fixed
2013-11-14 16:41:08 +02:00
Jerome Nadaud
8f81af0463
// fix on blockcategories
2013-11-14 15:12:08 +01:00
gRoussac
19d975a0b4
// typo
2013-11-14 14:48:14 +01:00
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