TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,434 Commits 1 Branch 0 Tags
21c29f453f925284f9cd80a75c8e74c7c94f4dd5
Commit Graph

94 Commits

Author SHA1 Message Date
Manuel Raynaud
b39f0fd936 Front module is activated by default 2013-11-18 10:51:46 +01:00
David
54d5e98971 Corrected the French translation of "Miss" in the Register form dropdown 
Corrected French translation of Miss from "Madamemoiselle" to "Mademoiselle"
 2013-11-17 01:01:01 +01:00
Etienne Roudeix
e8b4a4ac74 Colissimo proces 2013-11-14 09:22:56 +01:00
Etienne Roudeix
299b192018 Colissimo module + countires areas 2013-11-14 09:13:28 +01:00
Etienne Roudeix
be9aba9fb8 fix stuff + module management 2013-11-08 15:11:45 +01:00
Manuel Raynaud
a793dc9f3e change variable name for active front template 2013-11-07 10:47:14 +01:00
Franck Allimant
361e4a9d74 Implementing translations (still in progress) 2013-11-06 10:49:03 +01:00
Franck Allimant
3b9f94cec8 Using now templates instead of hard code in AdminUtilities smarty plugin 2013-10-31 12:16:14 +01:00
Manuel Raynaud
3bde3ffca9 fix typo in sql file 2013-10-25 15:03:31 +02:00
Manuel Raynaud
373fe13287 save thelia version 2013-10-25 09:10:27 +02:00
Manuel Raynaud
f6b65e70d9 create order confirmation email 2013-10-24 20:23:43 +02:00
Manuel Raynaud
72f9cbb305 save website url in install process 2013-10-24 19:45:51 +02:00
Franck Allimant
5bf51dd47e Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml
 2013-10-24 00:16:33 +02:00
Franck Allimant
0bd57b0a5a Worked on catalog 2013-10-23 23:41:39 +02:00
Manuel Raynaud
bfbb9c46db hide default_lang_without_translation config parameter 2013-10-23 19:21:30 +02:00
Manuel Raynaud
c924b2a5bd create form for language url 2013-10-23 18:02:04 +02:00
Etienne Roudeix
fb66f5a021 fix insert 2013-10-23 08:48:59 +02:00
Etienne Roudeix
c94fa9bc24 permission management 2013-10-22 15:04:06 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Etienne Roudeix
cdeda0123e Merge branch 'master' into tax 2013-10-21 19:12:07 +02:00
Etienne Roudeix
d13434bb08 permissions 2013-10-21 19:11:42 +02:00
Manuel Raynaud
9ce90abdf5 finish contact process 2013-10-21 19:07:59 +02:00
Manuel Raynaud
48d112c736 update countries list 2013-10-21 14:21:32 +02:00
Manuel Raynaud
ee57c7cbcf fix issue #35 2013-10-21 12:34:31 +02:00
Manuel Raynaud
1545987d51 update insert script 2013-10-21 09:29:52 +02:00
Etienne Roudeix
a8594ef6af tax rule edition admin 2013-10-09 15:03:07 +02:00
Etienne Roudeix
b84e863033 fix tests 2013-10-07 14:36:20 +02:00
Etienne Roudeix
fe3aea4ab7 tax types 2013-10-07 11:57:43 +02:00
Manuel Raynaud
6e29325d19 create purchase order pdf 2013-10-03 10:45:21 +02:00
franck
22f3f49f79 Finished product multiple categories attachment 2013-09-22 22:14:39 +02:00
Etienne Roudeix
4ac9a0afad Merge branch 'master' of github.com:thelia/thelia 2013-09-19 16:24:05 +02:00
Manuel Raynaud
41bd8a7cec icomplete product page 2013-09-19 15:39:36 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +02:00
Etienne Roudeix
66536d0b31 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php
 2013-09-18 20:03:13 +02:00
Etienne Roudeix
891ebcd491 fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar 2013-09-18 19:51:01 +02:00
Etienne Roudeix
16d0985718 payment modules 2013-09-18 17:06:08 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Manuel Raynaud
e638a927c0 add more test for rewriten url 2013-09-18 12:03:02 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00
franck
d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Model/Product.php
 2013-09-18 00:35:48 +02:00
franck
de4767ef56 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Model/Product.php
 2013-09-17 23:51:31 +02:00
Etienne Roudeix
8d20316217 no-return-functions block 2013-09-17 14:59:40 +02:00
gmorel
df6b3dbcd5 Merge branch 'master' of https://github.com/thelia/thelia 
# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php
 2013-09-17 14:42:06 +02:00
Etienne Roudeix
233c952b4e Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-17 12:44:34 +02:00
franck
d097851522 Added documents action and loop 2013-09-17 01:07:42 +02:00
Etienne Roudeix
361e9e1126 delivery process 2013-09-16 16:12:04 +02:00
Etienne Roudeix
84204cbf05 Merge branch 'master' into template 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Feed.php
 2013-09-16 15:32:17 +02:00
Etienne Roudeix
5ca7136e6d default country 2013-09-16 15:30:46 +02:00
Etienne Roudeix
d8b5df4162 delivery process 2013-09-16 15:24:08 +02:00
gmorel
970d6b6ff7 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (6) and others
# Via franck (3) and others
* 'master' of https://github.com/thelia/thelia:
  Implemented "Remember Me" feature on admin. Started template management
  Added Templates events
  First version of installation wizard
  tax engine retriever
  allow address removal from front
  Insert pagination inside tfoot
  allow update customer address in front tempalte
  allow to create a new address
  allow to make an address as default on update action
  Finished attributes management
  Fixed action column alignment
  Fixed duplication parameter check regexp
  absoluteUrl prevetn duplicate parameters in generated URL
 2013-09-16 10:01:34 +02:00