TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,020 Commits 1 Branch 0 Tags
53b58515e09b80b8844e9d9af6bacbbb08e67a47
Commit Graph

51 Commits

Author SHA1 Message Date
Franck Allimant
53b58515e0 Added html_output_trim_level variable 2014-07-01 01:08:27 +02:00
Franck Allimant
189ad9f782 Added html_output_trim_level config var, fix for #490 2014-07-01 00:57:41 +02:00
Franck Allimant
ca862b07e4 Merge branch 'master' into brands 
Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql
 2014-06-26 16:35:08 +02:00
Franck Allimant
65dd2fb129 Changed product_brand fk 2014-06-26 15:50:00 +02:00
Franck Allimant
13e57e332a Added brand creation 2014-06-26 15:49:46 +02:00
Franck Allimant
0dde8b888a Added brands management 2014-06-26 10:52:13 +02:00
Guillaume Barral
2a6d99e36b Automatic versionning of all existing orders during the update 2.0.3 2014-06-19 15:24:14 +02:00
Guillaume Barral
15e2ff5fc3 Automatic creation of all orders in order_version during the 2.0.3 update 2014-06-19 15:22:06 +02:00
Guillaume Barral
adcbc13ada Add a default version to all order in Thelia for the 2.0.3 update 2014-06-19 15:13:02 +02:00
Franck Allimant
dc6b231301 Fixed coupon table versionning 2014-06-19 15:10:21 +02:00
Guillaume Barral
270d8da5e3 Merge branch 'master' of https://github.com/lovenunu/thelia into yochima-branch 2014-06-19 09:27:56 +02:00
Benjamin Perche
7d4d1857fc Fix colissimo and cheque id retrieving 
modifié:         setup/faker.php
 2014-06-18 15:00:29 +02:00
Guillaume Barral
243e44f571 Target thelia_release_version changed to 3 2014-06-18 14:34:24 +02:00
Guillaume Barral
6e9412f3ac Add the table order_version to Thelia 2014-06-18 14:22:15 +02:00
Benjamin Perche
b688ee86f0 fix cs 
modifié:         setup/faker.php
 2014-06-18 13:30:45 +02:00
Benjamin Perche
da6244d220 Add clear order table and use propel random selection 
modifié:         setup/faker.php
 2014-06-18 13:29:30 +02:00
Benjamin Perche
c5fa984e6e Fix cs 2014-06-18 12:35:24 +02:00
Benjamin Perche
087f9e46a1 Add line return 
modifié:         setup/faker.php
 2014-06-18 12:33:53 +02:00
Benjamin Perche
2fcec08e50 Insert fake orders with faker 
modifié:         setup/faker.php
 2014-06-18 12:31:36 +02:00
Manuel Raynaud
3434010b54 prepare release 2.0.2 2014-06-11 16:05:08 +02:00
Franck Allimant
de5a2025cd Fixed coupon input field name 2014-06-11 09:43:10 +02:00
etienne roudeix
507a52a20f Update 2.0.2.sql 2014-05-28 14:56:46 +02:00
etienne roudeix
5395c76bf3 Update insert.sql 2014-05-28 14:56:04 +02:00
etienne
88a7164e96 add Hong Kong to country list 2014-05-27 15:38:11 +02:00
Franck Allimant
b3b16e1fb1 Added vendor block to schema 2014-05-18 20:34:58 +02:00
Franck Allimant
612898d3b3 ENGINE=InnoDB; -> ENGINE=InnoDB CHARACTER SET='utf8'; 2014-05-18 20:30:14 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
90947bcda9 Free shipping restricitions based on Countries and Shipping module 2014-05-16 10:30:15 +02:00
Franck Allimant
9c0cc178b4 Added coupon_country and coupon_module tables 2014-05-14 16:35:16 +02:00
Franck Allimant
ae5e88f90c Created file. Removes some ununsed indexes 2014-05-14 15:33:32 +02:00
Franck Allimant
c671a1ff5e Changed coupon condition parameter variables name 2014-05-10 01:30:22 +02:00
Manuel Raynaud
5231a76f51 add new languages in dsl scripts 2014-05-06 11:13:29 +02:00
Manuel Raynaud
793e66af74 Merge pull request #371 from roadster31/coupons 
Coupons
 2014-05-05 10:58:59 +02:00
Julien Chanseaume
3fd87f1fa1 updated sql script 2014-05-05 07:34:09 +02:00
Franck Allimant
e0027c7f6e The stanck trace is displayed if an exception is thrown 2014-05-02 19:58:42 +02:00
Julien Chanséaume
9ee9a88156 Sitemap functionality 2014-04-29 15:45:36 +02:00
Julien Chanséaume
7665f32d0d adding new configuration values in insert.sql 2014-04-28 15:48:30 +02:00
Julien Chanséaume
0b3ad194e0 unnecessary code removed, adding new configuration values in update sql 2014-04-28 15:28:25 +02:00
Manuel Raynaud
6a783c92a2 fix error in insert.sql file 2014-04-24 22:18:28 +02:00
Manuel Raynaud
0deadcd247 create resource and page for export 2014-04-24 17:55:09 +02:00
Manuel Raynaud
dbe641ad84 create new resources 2014-04-24 17:55:09 +02:00
Franck Allimant
cf9fa6257c Fixed typo 2014-04-24 13:56:43 +02:00
Franck Allimant
7ab119fbaa Added missing permissions 2014-04-24 12:28:52 +02:00
Manuel Raynaud
a09543ace6 update thelia version in inser.sql file 2014-04-24 11:13:35 +02:00
Jérôme Billiras
be923d8f56 Change index from position to activate following issue comment [https://github.com/thelia/thelia/pull/332#issuecomment-41174056] 2014-04-24 10:28:59 +02:00
Jérôme Billiras
5197afb87d Load modules by position 2014-04-23 16:33:01 +02:00
Manuel Raynaud
855f6e4c02 fix update process 2014-04-22 14:46:10 +02:00
Manuel Raynaud
7593717736 remove RC1 references 2014-04-22 14:30:44 +02:00
Manuel Raynaud
66c5a3729c refactor customer and order ref 2014-04-22 09:59:23 +02:00
Manuel Raynaud
f257bf9422 create new password email template 2014-04-21 21:36:24 +02:00