Commit Graph

102 Commits

Author SHA1 Message Date
vChabot
a88c90fbe1 [*] BO : Product attributes are now sortable.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8639 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-19 13:11:00 +00:00
rMalie
03eaee9bf4 [+] Project: it's possible to create new genders, "Miss" gender is now added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8578 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:15:51 +00:00
tDidierjean
a3245e4093 [*] BO : Removed size limit for image upload (BL006, CC136)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8482 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 09:14:07 +00:00
rMalie
4e0b3ed2f7 // Improve multishop ergonomy (you edit this field for) on languages fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8136 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 09:33:16 +00:00
rMalie
c7d4290206 // Fix admin referrers for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8120 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 13:07:23 +00:00
rMalie
549d5be0c7 // Fix options with bad multishop visibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8091 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 13:12:10 +00:00
rMalie
f6162845ab // Add a message when a shop is created to indicate that the user should create an URL for this shop + fix some bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 15:53:33 +00:00
rMalie
e093ecd554 // Fix on shops + remove id_group_shop from stock + fix stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8015 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 09:38:24 +00:00
rMalie
a86e95fc5a // Fix shop_url when no physical_uri + fix shop association when multistore is disactivated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7958 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-09 13:20:26 +00:00
rMalie
f48792054a // Fix some bugs on multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7942 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-08 15:24:21 +00:00
rMalie
0811404de8 // Refactoring of admin options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7922 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-05 15:52:45 +00:00
rMalie
e4825ac555 // Refactoring of preferences
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7907 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-05 13:21:40 +00:00
rMalie
06cc9cff99 // Improve ergonomy of configuration for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7879 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 18:06:51 +00:00
rMalie
6f08bcb12e [+] Add a route system to personalize rewrited URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7876 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 16:02:49 +00:00
rMalie
fa42cc38ae // Routes for dispatcher (part 5)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7860 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 07:53:59 +00:00
rMalie
6fc10e23f8 // Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7853 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 14:24:28 +00:00
rMalie
c945049ef1 // Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 09:54:23 +00:00
tDidierjean
d3b2ff2664 // Context part 25
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7794 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 14:17:58 +00:00
rMalie
a1a32714ab // Fix #PSFV-30 + context part 24
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7792 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 14:12:17 +00:00
rMalie
a875fecb20 // MERGE with 1.4 r7770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
rMalie
be4811aa6e // REVERT MERGE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 13:35:06 +00:00
rMalie
e159c925d8 // MERGE with trunk revision 7754
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 12:48:42 +00:00
tDidierjean
51b4c8591d // Context part 20
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7740 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-26 15:55:04 +00:00
rMalie
e08b70a242 // Carrier association + discount association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7696 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 15:53:07 +00:00
tDidierjean
462c362191 // removing cookie from product customization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7680 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-21 14:38:04 +00:00
rMalie
4ae81d8acd // Context part 15
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7658 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 16:17:14 +00:00
rMalie
fa2fc8b69d // No more mysql_error() hard coded !
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7651 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 11:35:33 +00:00
rMalie
35e5efb530 // Context part 13
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7650 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:44:10 +00:00
tDidierjean
89213e18e5 // Context part 12
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7649 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:28:11 +00:00
rMalie
8a0a62ae03 // Context in modules + Shop::sql* methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7648 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 09:23:10 +00:00
rMalie
7b8f139103 // Context part 10
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7642 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-18 15:27:32 +00:00
tDidierjean
20276404a8 // Context part 7
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7629 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-15 13:59:26 +00:00
tDidierjean
3a922aabfe // Context part 6
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7625 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-13 16:35:06 +00:00
tDidierjean
e5c68ba9ae // Context part 5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7624 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-13 15:24:38 +00:00
rMalie
67c80b2b42 // Refactoring of shop class with new context Part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7617 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-13 12:52:09 +00:00
rMalie
10dd3db8d4 // Refactoring of shop class with new context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 16:28:20 +00:00
rMalie
50f9794383 // Context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7600 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-12 13:50:15 +00:00
tDidierjean
143022e488 // Context - first commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7586 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 14:32:05 +00:00
rMalie
2ee764963b // Fix shop association on new object + some strict standard for Franck
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7584 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 13:18:17 +00:00
rMalie
4f3aad65e3 // Multishop for referrers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7583 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 13:03:26 +00:00
tDidierjean
8bf1b23239 // revert previous commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7573 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 16:12:27 +00:00
tDidierjean
f085f81d23 // cancel commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7572 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 15:43:24 +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
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
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
fBrignoli
56099fa735 // merge 1.4 => 6117
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 09:09:38 +00:00
gBrunier
ee90038754 [*] BO : Fixed #PSCFI-1667
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6099 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 12:37:23 +00:00
fBrignoli
43b6a41bbc // merge 1.4 (5397)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 16:00:58 +00:00
fBrignoli
ca5e60f0b9 // merge 1.4 (5916) => 1.5.x
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5918 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-15 10:30:56 +00:00