c12ce3dd29
// Products
2013-07-12 17:27:25 +02:00
160857bdc3
// update css module tab
2013-07-12 14:30:44 +02:00
84c0ccbae6
// products TPL
2013-07-11 18:58:44 +02:00
40967e6525
// update modules list tab
2013-07-11 17:27:11 +02:00
f042d704d2
// field translatable + tpl products + fixs
2013-07-10 19:39:35 +02:00
f847c821ed
// update tab modules bootsrap
2013-07-10 18:19:03 +02:00
8b33ac5aca
// quantities product modified + line bootsrap added in order, categories and attributes group controllers
2013-07-10 12:21:22 +02:00
ec466b8c70
// Porting more product tpl
2013-07-09 19:10:56 +02:00
1f33638f32
[+] BO Wip BS -> Products + fix
2013-07-05 18:36:42 +02:00
0ad4b44866
// Refactor helper list + fixs
2013-07-02 18:55:43 +02:00
85da11181d
//remove warning
2013-06-30 19:42:07 +02:00
d583cf25d2
// Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch
2013-06-28 19:35:32 +02:00
aa8d6d5872
//Porting more components to bootstrap
2013-06-21 17:47:05 +02:00
40f03d0ba1
[+] BO: Form components
2013-06-18 21:03:43 +02:00
3bdf86e634
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-06-17 19:19:28 +02:00
c5069aaa15
[-] WS: Fix accessories duplication on product update
2013-06-17 18:56:09 +02:00
993690801e
// Small changes with layout an css
2013-06-17 18:49:45 +02:00
aea53e034a
[*] BO : Enable current subtab active class
2013-06-17 18:27:07 +02:00
8fabee091b
[-] FO: Fixed bug PrestaShop 1.5.4.1 Catalog Mode Display Incorrect Header (mis-aligned) - #PSCFV-9327
2013-06-17 16:35:16 +02:00
d9245a31c8
// Removed deprecated parameter in AdminCustomerThreads / displaydate
2013-06-17 12:17:09 +02:00
3f0fa3f925
// Fixed warning
2013-06-17 12:15:10 +02:00
aefc22bb10
[-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311
2013-06-17 11:40:35 +02:00
c53d2d04ce
[-] BO : fixed parsing of discount value in AdminOrders #PSCFV-9481
2013-06-17 11:16:16 +02:00
3a5a9dea14
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-15 01:57:46 +02:00
ce9f262feb
[-] BO : Upload image name with trailing slash in name
2013-06-15 01:55:02 +02:00
6648fd3e97
// Reset Bootstrap for backward compatibility
2013-06-14 19:25:18 +02:00
319413ca25
// Added errors to user assistance
2013-06-14 15:08:36 +02:00
148cb6c123
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-14 15:01:27 +02:00
6778b17b23
[-] BO - fixed bug #PSCFV-9347 - Saving the E-Mail preferences loses the smtp server password
2013-06-14 15:01:22 +02:00
eae2a16442
// Removed button hide in contact form (create issues with the back button in the browser for example)
2013-06-14 11:56:47 +02:00
909a459e5d
// miss ;
2013-06-14 11:49:04 +02:00
7a65f478b6
// miss ;
2013-06-14 11:48:27 +02:00
12e13e275f
[-] BO : fixed ajax in permissions tab #PSCFV-7442
2013-06-14 11:20:38 +02:00
2ae0e4f844
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-14 11:17:18 +02:00
ff63e0a28c
[-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel
2013-06-14 11:17:07 +02:00
331dcc4d6e
[-] BO : Fixed permission update #PSCFV-7441
2013-06-14 10:48:24 +02:00
5493010e67
[-] BO : postcode required in manufacturer address
2013-06-14 10:25:37 +02:00
39320ad866
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-14 10:22:51 +02:00
9260a43d7d
[-] INSTALLER : Shown index can return empty array
2013-06-14 10:20:48 +02:00
ff876034b4
// Fixed display of the image option "legacy system"
2013-06-14 09:57:00 +02:00
76f686a95b
Merge pull request #496 from matthieume/master
...
[*] FO : NewProductController: new products page must display latest products first.
2013-06-14 00:28:39 -07:00
7a91d4b4dd
// small fix on toolbar
2013-06-13 19:23:58 +02:00
1a2ee6c8be
Merge pull request #489 from axome/core_cartrule_gift_with_same_category_restriction
...
[-] CORE : CartRule::checkProductRestrictions : A gift product in the same category as its restrictions causes the gift to stay in the cart even if emptied
2013-06-13 10:13:22 -07:00
cd6f415dc1
[-] BO : fixed link in AdminTracking #PSCFV-7409
2013-06-13 18:38:00 +02:00
b0eaf8124c
[*] BO : Init Bootstrap (Sass) BO
2013-06-13 18:19:50 +02:00
4a1de9bf31
Merge pull request #495 from SebSept/development
...
[-] BO : fix require path to config.inc.php
2013-06-13 09:07:26 -07:00
86ef69c9ba
[*] BO : Init Bootstrap (Sass) BO
2013-06-13 18:03:34 +02:00
6a2eddd81f
[-] BO : fix require path to config.inc.php
2013-06-13 17:59:01 +02:00
518998ded2
//added bootstrap in BO
2013-06-13 16:35:14 +02:00
80908e0a6f
[-] MO : do not check the VAT number if the module is disabled #PSCFV-9397
2013-06-13 16:34:34 +02:00
Kevin Granger