TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,475 Commits 1 Branch 0 Tags
05b729142bf3532f83537ce040c49b632895808a
Commit Graph

4475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Benjamin Perche
1cc904b107 Add line return 
modifié:         Readme.md
 2014-08-05 16:12:55 +02:00
Benjamin Perche
1b6154cdc0 Add archive builders' dependencies 
modifié:         Readme.md
 2014-08-05 16:11:34 +02:00
Manuel Raynaud
f69878b623 Merge pull request #566 from griotteau/patch-reseller 
Add the reseller field in the customer form
 2014-08-05 16:02:12 +02:00
Manuel Raynaud
bd26e3da9a Merge pull request #568 from lovenunu/fix-archiving 
Fix archiving
 2014-08-05 15:57:51 +02:00
Benjamin Perche
8de8939b2f Fix cs 
modifié:         core/lib/Thelia/Action/Export.php
	modifié:         core/lib/Thelia/Action/Import.php
	modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Controller/Admin/FileController.php
 2014-08-05 15:51:44 +02:00
Benjamin Perche
606ad49316 Fix tests 
modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
 2014-08-05 15:32:51 +02:00
Benjamin Perche
45aaedc81f Fix bz2 extension name 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
 2014-08-05 15:14:31 +02:00
Benjamin Perche
d1a07b883b Add checks for archive building libraries 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/export-page.html
 2014-08-05 15:10:19 +02:00
Benjamin Perche
b5dbf08bb7 Fix cs 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
 2014-08-05 14:36:37 +02:00
Benjamin Perche
370bf94f40 Add don't use phar based archive builders if modules not enabled 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
 2014-08-05 14:34:27 +02:00
root
f5318df219 Add the reseller field in the customer form 2014-08-05 11:40:49 +02:00
Manuel Raynaud
b72a7a5c08 Merge pull request #565 from lovenunu/fix 
Fix imports and exports
 2014-08-05 10:36:45 +02:00
Benjamin Perche
718ed2ae2d hide category if no export/import and add module category 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Config/Resources/import.xml
	modifié:         templates/backOffice/default/export.html
	modifié:         templates/backOffice/default/import.html
 2014-08-05 10:30:57 +02:00
Benjamin Perche
c453981d5a Fix translation domain in modales 
modifié:         templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/ajax/import-modal.html
 2014-08-05 10:02:42 +02:00
Benjamin Perche
37d8a2d9e2 Fix 404 usage 
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
 2014-08-05 09:58:34 +02:00
Benjamin Perche
318341b702 Add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         templates/backOffice/default/I18n/en_US.php
	modifié:         templates/backOffice/default/I18n/fr_FR.php
 2014-08-05 09:50:01 +02:00
Benjamin Perche
9967fbdd6c Add import positionning 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         templates/backOffice/default/import.html
 2014-08-05 09:25:49 +02:00
Benjamin Perche
3e51e62241 Fix import and import category parsing 
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
 2014-08-05 09:19:33 +02:00
Benjamin Perche
f3c4d15163 Add position management with categories for imports and exports 
modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
 2014-08-05 09:17:38 +02:00
Benjamin Perche
394edf8fdc Add preInsert method for positions 
modifié:         core/lib/Thelia/Model/ExportCategory.php
	modifié:         core/lib/Thelia/Model/Import.php
	modifié:         core/lib/Thelia/Model/ImportCategory.php
 2014-08-05 09:07:18 +02:00
Julien
1bbf34e8a2 Merge pull request #564 from bibich/thelia-203-beta 
Thelia 203 beta
 2014-08-05 08:36:30 +02:00
Julien
6640abc7b6 Merge pull request #554 from lovenunu/security-fix 
Security fix
 2014-08-05 08:35:57 +02:00
Benjamin Perche
967dbc15d4 Fix point usage in regex 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
b8a9518deb Add missing points in extensions 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
 2014-08-05 08:26:56 +02:00