 rGaillard
|
ddcdcd571d
|
// Warning is now displayed for shop without url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10512 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 11:11:45 +00:00 |
|
|
rGaillard
|
3790730861
|
// Little fix on carts tab filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10509 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 10:37:33 +00:00 |
|
|
rGaillard
|
fd06e5c1a1
|
// Fix online visitors on carts tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10507 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 10:32:13 +00:00 |
|
|
rGaillard
|
ccaa0542a0
|
// Configuration feedback is now not displayed when changing shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10505 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 10:19:27 +00:00 |
|
|
rGaillard
|
06ab93a8f6
|
// ajax process off adminaccess is now in the controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10503 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 10:01:22 +00:00 |
|
|
rGaillard
|
335d5cf93d
|
// Fix displaying name of shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10500 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 09:35:30 +00:00 |
|
|
rGaillard
|
a02f6983f0
|
// Add multishop association for blocktag module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10482 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 23:02:24 +00:00 |
|
|
rGaillard
|
1278a064b6
|
// blockstores is now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10481 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 22:30:12 +00:00 |
|
|
rGaillard
|
48776271fd
|
// blockstores is now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10480 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 22:21:05 +00:00 |
|
|
rGaillard
|
e02cc320ee
|
// CMS - Add shop filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10476 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 21:18:24 +00:00 |
|
|
rGaillard
|
ad9bf8d324
|
// Fix blockmanufacturers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10475 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 20:51:40 +00:00 |
|
|
rGaillard
|
13f63f53f7
|
// Update blockcontactinfos
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10474 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 20:38:45 +00:00 |
|
|
rGaillard
|
9d6ab8e70b
|
BlockContact update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10473 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 20:35:48 +00:00 |
|
|
rGaillard
|
ef75f20a63
|
// miss file on last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10471 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 20:22:29 +00:00 |
|
|
rGaillard
|
e84dec5c4a
|
// Blocktopmenu is now compliant with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10470 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 20:21:58 +00:00 |
|
|
rGaillard
|
2ad9e4aa20
|
// Fix bugs AdminShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10423 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:22:11 +00:00 |
|
|
rGaillard
|
ed19c60ff8
|
// Fixed redirect link after logout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10385 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 09:17:32 +00:00 |
|
|
rGaillard
|
52d4292f76
|
// File missing in last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10335 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:07:37 +00:00 |
|
|
rGaillard
|
9b6824a825
|
// Replacement of AdminTab by AdminController on modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10334 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 11:06:35 +00:00 |
|
|
rGaillard
|
4abe8efd75
|
// Improve AdminGroupShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10323 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:46:01 +00:00 |
|
|
rGaillard
|
f00892539c
|
// Improve AdminShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10317 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:18:27 +00:00 |
|
|
rGaillard
|
53d85ae134
|
// Shop association improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10298 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 17:13:36 +00:00 |
|
|
rGaillard
|
d57b3cbcd7
|
// Fix multishop association on CMS tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10297 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 16:47:34 +00:00 |
|
|
rGaillard
|
14cb2b1ef0
|
// Miss on last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10293 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 16:10:20 +00:00 |
|
|
rGaillard
|
e4096bf943
|
// Constructor of OrderDetail correctly call parent constructor
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10291 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 15:51:33 +00:00 |
|
|
rGaillard
|
a25cc16f28
|
// Module configuration is now displayed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10289 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-19 15:03:20 +00:00 |
|
|
rGaillard
|
a318ca610f
|
// Add missing }
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10288 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-19 14:10:22 +00:00 |
|
|
rGaillard
|
bc160bb762
|
// Fix many smarty notices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10287 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-19 13:48:31 +00:00 |
|
|
rGaillard
|
96b9355d9d
|
// Add method method getGlobalValue on Configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10282 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:46:56 +00:00 |
|
|
rGaillard
|
c7310f3899
|
//Block advertising multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10280 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 16:38:33 +00:00 |
|
|
rGaillard
|
4cdc2c23db
|
// Fix smarty cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10274 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 15:10:23 +00:00 |
|
|
rGaillard
|
a1fb08f026
|
// Improve Specific prices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10118 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-14 17:40:42 +00:00 |
|
|
rGaillard
|
07ced238d1
|
// Fix order view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10078 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-14 09:16:37 +00:00 |
|
|
rGaillard
|
e2026d1cc3
|
// Replacement of getDiscounts method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9900 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-04 16:52:39 +00:00 |
|
|
rGaillard
|
77a66c64fd
|
[*] Core : Specific prices can now be applied to combinations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9897 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-04 15:53:53 +00:00 |
|
|
rGaillard
|
fe7dfe0460
|
// Some improvements on BackOffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9810 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 19:19:03 +00:00 |
|
|
rGaillard
|
71b77471de
|
// re-commit admin.css
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9796 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 14:02:55 +00:00 |
|
|
rGaillard
|
33ecd84fb1
|
// little fix on backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9792 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 12:32:57 +00:00 |
|
|
rGaillard
|
48b4d96441
|
// Missing smarty functions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9785 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 10:39:59 +00:00 |
|
|
rGaillard
|
93d769f9bc
|
// Fix backslashes on translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9784 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 10:35:09 +00:00 |
|
|
rGaillard
|
ff2b44fc74
|
// Missing file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9782 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 10:21:08 +00:00 |
|
|
rGaillard
|
411f72fba2
|
// Add smarty front configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9781 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 10:20:40 +00:00 |
|
|
rGaillard
|
903d9b783a
|
[+] BO: Add BackOffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9776 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 09:18:45 +00:00 |
|
|
rGaillard
|
4e0a3102a3
|
// Update AdminCartsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9726 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-28 15:31:58 +00:00 |
|
|
rGaillard
|
3e3ff64cc5
|
// Fix merge error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9713 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-28 13:27:20 +00:00 |
|
|
rGaillard
|
a296e0192c
|
// revert AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9712 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-28 13:06:44 +00:00 |
|
|
rGaillard
|
9fb10416f4
|
// Change display_header and display_footer behavior on BackOffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9710 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-28 12:58:13 +00:00 |
|
|
rGaillard
|
9c368349f2
|
// submit form ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9689 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-27 15:44:58 +00:00 |
|
|
rGaillard
|
e36250fbcb
|
// Set default Shop in BackOffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9688 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-27 15:44:09 +00:00 |
|
|
rGaillard
|
d97b2f999c
|
// Fix add to cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9687 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-27 15:37:42 +00:00 |
|
|
rGaillard
|
430d902bfe
|
// Fix JS location
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9684 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-27 15:24:19 +00:00 |
|
|
rGaillard
|
f61f2f0570
|
// Add CartController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9676 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-27 14:04:58 +00:00 |
|
|
rGaillard
|
e39c4c2304
|
// Fix bug on HelperOption
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9496 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-20 12:13:14 +00:00 |
|
|
rGaillard
|
7ff90aec1c
|
// Fix helperform displaying on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9495 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-20 10:21:25 +00:00 |
|
|
rGaillard
|
41a4ccbc4c
|
// Fix smarty BackOffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9473 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-19 15:34:18 +00:00 |
|
|
rGaillard
|
2a22c9a502
|
[*] Core: Upgrade smarty to version 3.1.3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9469 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-19 15:16:52 +00:00 |
|
|
rGaillard
|
b22fe70288
|
// Smarty update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9468 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-19 15:13:01 +00:00 |
|
|
rGaillard
|
a0dc3f8923
|
//Deletion of a useless file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8791 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-27 08:55:01 +00:00 |
|
|
rGaillard
|
d218264667
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7531 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 13:52:30 +00:00 |
|
|
rGaillard
|
3dde6382a5
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7528 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 13:26:34 +00:00 |
|
|
rGaillard
|
cca6578076
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7527 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 13:07:38 +00:00 |
|
|
rGaillard
|
6a9a0f89a3
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7526 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 12:54:42 +00:00 |
|
|
rGaillard
|
0433d8b7f4
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7525 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 12:45:27 +00:00 |
|
|
rGaillard
|
8a59d0dc41
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 10:54:11 +00:00 |
|
|
rGaillard
|
ba9cdcf295
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7523 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 10:11:35 +00:00 |
|
|
rGaillard
|
69f2f09dc5
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 10:10:43 +00:00 |
|
|
rGaillard
|
2430f917d5
|
// display_errors deleting
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6015 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-21 07:45:25 +00:00 |
|
|
rGaillard
|
3d547dcae3
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6009 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-20 15:02:16 +00:00 |
|
|
rGaillard
|
cfdc0ab1d9
|
[-] BO: Fixed module configuration when cache is activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5888 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-13 10:11:09 +00:00 |
|
|
rGaillard
|
ccbf26dd75
|
[-] BO : Fixed #1205 error on updating product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5885 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-13 09:04:32 +00:00 |
|