4a013cf537
[-] BO : FixBug #PSCSX-100 wrong checkbox integration
2013-12-10 09:43:03 +01:00
5429fd67ff
// Fix small warning in dashgoals
2013-12-10 09:32:13 +01:00
808347cb2f
[-] MO : Newsletter - FixBug #PSCSX-113 - Missing id in field desc
2013-12-10 09:17:27 +01:00
6d669cb5f1
// global rewrited in sass - WIP 50% (won’t compile yet)
2013-12-09 19:16:27 +01:00
d4de6342b4
[-] MO : BlockLayered - Fix missing attribute anchor separator
2013-12-09 18:37:55 +01:00
fcf568b9ea
// BlockLayered 1.5 backward compatibility
2013-12-09 18:21:31 +01:00
cf77deeba2
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-09 17:26:05 +01:00
ed92603472
// Small Fix in modules upload
2013-12-09 17:25:41 +01:00
dc7bf76b24
Merge pull request #1114 from glafarge/patch-1
...
[-] FO : Fix versatile jQuery selector
2013-12-09 08:24:02 -08:00
e7ef71f32e
[-] FO : Fix versatile jQuery selector
...
`:hidden` selects form elements with `type="hidden"` but also : elements with `display:none`, elements with their width/height equal to zero and which the ancestor element is hidden.
`input[type=hidden]` is more appropriate for those reasons.
2013-12-09 17:17:48 +01:00
24cd0bbdb0
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-09 16:48:55 +01:00
79652b1704
// removed « add to compare» from the homepage
2013-12-09 16:48:37 +01:00
ee9239b404
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-09 16:40:00 +01:00
0e3545186d
// change behavior of displaywarning on backoffice
2013-12-09 16:39:43 +01:00
8700f15c61
// closed an attribute left behind
2013-12-09 16:39:33 +01:00
91c3bf48b1
// w3C product
2013-12-09 14:26:17 +01:00
27e8beb6a9
Merge pull request #1111 from Gamesh/patch-1
...
[*] FO: now you can download files >1G without running into max executio...
2013-12-09 05:17:14 -08:00
5c496f45a1
[*] FO: now you can download files >1G without running into max execution limitation
...
Added @ to suppress warning i safe mode.
2013-12-09 15:04:16 +02:00
b0c9e73e30
[+] BO : Add error control to modules uploading
2013-12-09 11:30:42 +01:00
ea450edc4c
// more W3C
2013-12-09 10:15:53 +01:00
b2199a2f12
Merge pull request #1112 from djfm/1.6
...
// take force_compile setting into account in Back-Office
2013-12-09 01:04:20 -08:00
40edeff122
// take force_compile setting into account in Back-Office
2013-12-09 08:59:49 +00:00
e448ac8de5
// Blocklayered message small fix
2013-12-09 09:09:38 +01:00
9713d38078
[*] FO: now you can download files >1G without running into max execution limitation
...
when reading large files ( >1G ), you often get max execution timeout error, this fix will prevent this.
2013-12-09 08:53:11 +02:00
1876d4834c
Merge pull request #1109 from jeanbe/patch-1
...
[*] FO : Set zoom on stores
2013-12-08 08:52:30 -08:00
d4b39184a0
// AdminCarts order way DESC
2013-12-08 16:39:41 +01:00
f055e86cc7
Met automatiquement la carte sur l'ensemble des magasins
...
Met automatiquement la carte a l'ouverture sur l'ensemble des magasins plutot que sur un point fixe au US.
2013-12-07 17:47:45 +01:00
c46159ccce
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 19:09:48 +01:00
5fb2081054
// order-carrier preparation to be W3C validated!
2013-12-06 19:09:36 +01:00
ae98bcd86b
// php warning
2013-12-06 18:40:44 +01:00
746c74dfac
// id of root category could be different of 1
2013-12-06 18:34:50 +01:00
c5ff838fca
// Blocklayered starting code refacto
2013-12-06 18:12:04 +01:00
a569ab7e33
// Fix tree shop missing attributes
2013-12-06 18:11:06 +01:00
adf158a0c3
// small fix
2013-12-06 17:31:09 +01:00
95d5e9d819
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 17:25:23 +01:00
71ac20c819
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
...
Conflicts:
themes/default-bootstrap/js/products-comparison.js
2013-12-06 17:24:00 +01:00
cfee36f609
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 17:19:59 +01:00
31c5f204b1
// update pages for w3c
2013-12-06 17:19:49 +01:00
db37e42b21
// checkout W3C valid - wip
2013-12-06 17:19:47 +01:00
ed5496479d
// removed console.log()
2013-12-06 17:18:20 +01:00
03e0cb7515
// break line
2013-12-06 17:09:14 +01:00
b2204aac6e
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 17:06:46 +01:00
99fe216413
[*] FO : Move both sliders module on new hook
2013-12-06 17:05:39 +01:00
aecbc18779
Merge pull request #1107 from djfm/import
...
// fixed bug with ordering of JS files in AdminImport
2013-12-06 07:54:27 -08:00
6419f6a7ad
// fixed bug with ordering of JS files in AdminImport
2013-12-06 15:47:29 +00:00
97937a8aa1
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 15:57:50 +01:00
ff08c1311b
// update my account page for w3c
2013-12-06 15:57:38 +01:00
74b16defa8
// themeconfigurator install failed
2013-12-06 15:53:33 +01:00
9f106d06ef
// valid W3C checkout - WIP
2013-12-06 15:43:12 +01:00
0d374e5501
// new hook
2013-12-06 14:54:45 +01:00
Jerome Nadaud