TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,449 Commits 1 Branch 0 Tags
3b37f839e29bf81739cb24777442ca9e6d74ccf3
Commit Graph

4449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheCoreDev
3b37f839e2 Inversion des valeurs dans la liste déroulante "Type de promotion" sur la création de nouvelle commande depuis le BO, afin que le pourcentage soit le choix par défaut. 2020-11-20 10:35:20 +01:00
TheCoreDev
8efc96d81d Rajout du module AdminComment + modifs pour que le commentaire (= le n° de bon de commande) figure dans la facture et dans le relevé de facture 2020-11-19 16:22:51 +01:00
TheCoreDev
66ce4ee218 Inital commit 2020-11-19 15:36:28 +01:00
Manuel Raynaud
71f32f83d3 Merge pull request #590 from bibich/mail 
Mail
 2014-08-14 11:59:55 +02:00
Manuel Raynaud
4651e6ba6c Merge pull request #593 from griotteau/patch-translate 
Missing translation with wrong password
 2014-08-14 09:24:21 +02:00
Riotteau
0965a846a5 Missing translation with wrong password 2014-08-13 18:01:47 +02:00
Manuel Raynaud
5ff5be7634 Merge pull request #592 from griotteau/patch-admin 
Default country set in customer creation
 2014-08-13 17:23:08 +02:00
Riotteau
531536ab06 Default country set in customer creation 2014-08-13 14:30:52 +02:00
Julien Chanséaume
d01b04d555 missing semicolon 2014-08-13 12:10:53 +02:00
Julien Chanséaume
8044736f34 fixed ace editor on message edition 2014-08-13 11:54:45 +02:00
Manuel Raynaud
aa92585794 add missing use statement 2014-08-13 10:28:52 +02:00
Manuel Raynaud
4d79acf06d Merge pull request #585 from lovenunu/firewall 
Apply firewall rules only in prod environment
 2014-08-13 10:18:44 +02:00
Benjamin Perche
ff16587acf Apply firewall rules only in prod environment 
modifié:         core/lib/Thelia/Controller/BaseController.php
	modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-08-13 09:49:58 +02:00
Manuel Raynaud
9a43f5aa3c update composer file, introducing 2.1 version 2014-08-11 17:06:48 +02:00
Manuel Raynaud
4800a1e801 Merge pull request #581 from bibich/casperjs 
Casperjs : functionnal tests for front office
 2014-08-11 15:48:01 +02:00
Julien Chanseaume
a6cc31db23 changed some paths 2014-08-11 14:36:25 +02:00
Julien Chanseaume
ebb20e075e make a uniq script to execute phpunit and casperjs 2014-08-11 14:19:45 +02:00
Julien Chanseaume
fbb9afa8b9 Added script for phpunit 2014-08-11 14:01:40 +02:00
Julien Chanseaume
4b85156fb8 changed screenshot path 2014-08-11 13:43:55 +02:00
Julien Chanseaume
8cbfe5e22a changed wait timeout 2014-08-11 13:43:12 +02:00
Manuel Raynaud
0a011560c8 Merge pull request #580 from lovenunu/patch-1 
Prepare 2.0.3-beta2
 2014-08-11 12:22:56 +02:00
Julien Chanseaume
d7c590961e Removed outputs from php built in server 2014-08-11 12:22:09 +02:00
Julien Chanseaume
36b5e65353 Fixed test path 2014-08-11 11:43:57 +02:00
Julien Chanseaume
67fe4125fe use beta version of CasperJS for more stability :/ 2014-08-11 11:38:32 +02:00
Julien Chanseaume
473402bf88 Added functionnal test for front office : home, register, login, cart 2014-08-11 11:28:23 +02:00
Julien Chanseaume
94cc1ea516 ignore casperjs screenshots in git 2014-08-11 11:27:23 +02:00
Manuel Raynaud
f324d25cd3 Merge pull request #579 from lunika/prepare_beta 
Prepare 2.0.3-beta2 version
 2014-08-11 09:16:55 +02:00
Benjamin Perche
bfc02ca08c Prepare 2.0.3-beta2 
Update README ( composer create-project )
 2014-08-09 09:59:52 +02:00
Manuel Raynaud
d1f4f4ca0a update changelog and change thelia version 2014-08-08 12:02:22 +02:00
Manuel Raynaud
6dbe4f3539 Merge pull request #571 from MrGuillou/patch-1 
Multiple ajax call if multiple address
 2014-08-08 11:39:44 +02:00
Manuel Raynaud
afbc3dde3f Merge pull request #563 from bibich/previous-url 
Previous url
 2014-08-08 11:38:59 +02:00
Julien Chanseaume
77b341b770 Removed old code. 2014-08-08 10:32:49 +02:00
Julien Chanseaume
b4e60ba69c Use of the kernel.request event 2014-08-08 10:28:45 +02:00
Manuel Raynaud
db38e51c92 Merge pull request #574 from lovenunu/update-schema 
Update schema with PropelUtility
 2014-08-08 09:28:32 +02:00
Julien Chanseaume
8627de3f17 Merge branch 'previous-url' of github.com:bibich/thelia into previous-url 2014-08-08 09:17:40 +02:00
Benjamin Perche
f6920fd12f Add thelia version and fix FK and types 
modifié:         core/lib/Thelia/Model/Map/ExportCategoryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ExportI18nTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ExportTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportCategoryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportI18nTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportTableMap.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	modifié:         setup/update/2.0.3-beta2.sql
 2014-08-08 09:05:23 +02:00
Manuel Raynaud
22079340ec Merge pull request #576 from lunika/coupon_fix 
change method visibility on coupon trait
 2014-08-07 21:12:37 +02:00
Manuel Raynaud
694b0c9fed Merge pull request #575 from griotteau/patch-template-default 
Add document loop in folder/content default template
 2014-08-07 16:56:06 +02:00
Manuel Raynaud
5e8cdfd6f7 change method visibility on coupon trait 2014-08-07 16:55:16 +02:00
Riotteau
083e80891f Add document loop in folder/content default template 2014-08-07 15:46:02 +02:00
Benjamin Perche
f859b17dda Add Index on export/import foreign keys 
modifié:         core/lib/Thelia/Model/Base/Export.php
	modifié:         core/lib/Thelia/Model/Base/ExportQuery.php
	modifié:         core/lib/Thelia/Model/Base/Import.php
	modifié:         core/lib/Thelia/Model/Base/ImportCategory.php
	modifié:         core/lib/Thelia/Model/Base/ImportCategoryQuery.php
	modifié:         core/lib/Thelia/Model/Base/ImportQuery.php
	modifié:         core/lib/Thelia/Model/Map/ExportCategoryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ExportI18nTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ExportTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportCategoryTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportI18nTableMap.php
	modifié:         core/lib/Thelia/Model/Map/ImportTableMap.php
	modifié:         local/config/schema.xml
	modifié:         setup/thelia.sql
	nouveau fichier: setup/update/2.0.3-beta2.sql
 2014-08-07 11:22:42 +02:00
Benjamin Perche
c678998556 Remove auto Add AI 
core/lib/Thelia/Model/Thelia/
 2014-08-07 09:40:15 +02:00
Benjamin Perche
f3ae4fa088 Remove namespace 
modifié:         local/config/schema.xml
 2014-08-07 09:34:49 +02:00
Benjamin Perche
1cd1da5388 Update schema with Propel Utility 
modifié:         local/config/schema.xml
 2014-08-07 09:32:31 +02:00
MrGuillou
93f7099682 Multiple ajax call if multiple address 
Add test if input radio is checked on event listener "change"
 2014-08-06 12:47:36 +02:00
Manuel Raynaud
d67c973460 Merge pull request #570 from lovenunu/fix-update 
Fix update and CS
 2014-08-06 09:52:44 +02:00
Benjamin Perche
eae1acba81 Fix cs 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Form/CustomerUpdateForm.php
	modifié:         core/lib/Thelia/Model/Export.php
 2014-08-06 09:08:48 +02:00
Benjamin Perche
74ec51b06e Log insertion error instead of throwing them 
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
 2014-08-06 09:07:37 +02:00
Manuel Raynaud
710bb47990 update thelia version in sql files 2014-08-05 16:44:08 +02:00
Manuel Raynaud
341e2a769f Merge pull request #569 from lovenunu/readme 
Add archive builders' dependencies in readme
 2014-08-05 16:23:31 +02:00