TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,342 Commits 1 Branch 0 Tags
ced7b5e6dccaa80cd5c5b6ba2fed4ec96bed78f7
Commit Graph

1058 Commits

Author SHA1 Message Date
gmorel
ced7b5e6dc WIP : Upload management (upload+save+delete done) need to finish integration and add all image fields 2013-09-20 16:51:34 +02:00
gmorel
3627d96175 WIP : Upload management 2013-09-18 10:07:57 +02:00
franck
9e927c40be Merge branch 'master' of https://github.com/thelia/thelia 2013-09-17 18:40:06 +02:00
franck
ecf4412fbd Changed getDefaultCategory in getDefaultCategoryId 2013-09-17 18:38:49 +02:00
gmorel
c99e7a91b9 Working : Content : fix loop giving no elements 2013-09-17 17:43:19 +02:00
gmorel
9c0d310441 Merge remote-tracking branch 'origin/master' 2013-09-17 17:39:22 +02:00
gmorel
82c7cdeb44 Working : Content : fix loop giving no elements 2013-09-17 17:39:12 +02:00
franck
c8baa38fed Added missing files... 2013-09-17 17:31:22 +02:00
franck
4731929a70 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-17 17:15:39 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
gmorel
df80d39954 Working : Content : fix loop giving no elements 2013-09-17 17:11:08 +02:00
gmorel
b878bf54ad Merge remote-tracking branch 'origin/master' 2013-09-17 17:09:14 +02:00
gmorel
f8072a02d2 Working : Product : fix loop giving no elements 2013-09-17 17:09:01 +02:00
franck
7ca3429cbb Merge branch 'master' of https://github.com/thelia/thelia 2013-09-17 16:38:49 +02:00
Manuel Raynaud
79e508524d remove isntall routing and template 2013-09-17 16:30:15 +02:00
franck
34f0b03bdc Added product management routes 2013-09-17 16:30:14 +02:00
Manuel Raynaud
8122dc3084 Merge branch 'install_wizard' 2013-09-17 16:02:24 +02:00
Manuel Raynaud
072dec5cc9 nstall step Please enter the commit message for your changes. Lines starting 2013-09-17 15:43:15 +02:00
Etienne Roudeix
ddbced036f Merge branch 'master' of github.com:thelia/thelia 2013-09-17 15:02:38 +02:00
Etienne Roudeix
8d20316217 no-return-functions block 2013-09-17 14:59:40 +02:00
gmorel
fd1aaaef63 Working : Content loop : add default content parameter 2013-09-17 14:56:17 +02:00
gmorel
5509f08df8 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:40:28 +02:00
Manuel Raynaud
35299dd6be config step 2013-09-17 14:22:32 +02:00
gmorel
f10842069c Working : Fixture : Product add default category 2013-09-17 14:15:23 +02:00
franck
a3dd6c7e8b Polished categories related content 2013-09-17 14:03:52 +02:00
franck
13265182c2 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-17 13:50:23 +02:00
franck
3d78af8b97 Finished category related content management 2013-09-17 13:50:01 +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
Etienne Roudeix
c4fd65e6ea delivery process 2013-09-17 12:38:23 +02:00
Manuel Raynaud
edd84fb622 icreate install wizard 2013-09-17 12:17:48 +02:00
gmorel
67060c6367 Working : Updating model schema.xml 2013-09-17 11:56:46 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
franck
d097851522 Added documents action and loop 2013-09-17 01:07:42 +02:00
franck
bff08dd581 Typo 2013-09-16 22:35:29 +02:00
franck
4721b6c1de Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 22:32:22 +02:00
franck
7858e809b7 Added UrlRewritingTrait to manage URLs from model classes 2013-09-16 22:31:55 +02:00
Manuel Raynaud
eeb9a0f9eb use sqlite database for install process 2013-09-16 20:42:18 +02:00
Manuel Raynaud
7a8dea28a6 fix typo 2013-09-16 19:08:01 +02:00
gmorel
63472b9f80 WIP : install wizard : step 1, 2, 3 2013-09-16 19:00:28 +02:00
franck
e473c64588 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-16 18:59:18 +02:00
franck
2f41d4db6f Started category management 2013-09-16 18:58:45 +02:00
Etienne Roudeix
afa9a46abf order delivery form 2013-09-16 18:55:29 +02:00
Manuel Raynaud
67b6e5f07d add some php doc 2013-09-16 18:21:07 +02:00
Manuel Raynaud
874c5f6cac integrate swiftMailer as mailer solution 2013-09-16 18:20:15 +02:00
gmorel
cfc52c4e7f Working : install wizard : type inference 2013-09-16 18:15:09 +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
5399e08490 Merge branch 'master' of github.com:thelia/thelia 2013-09-16 15:31:07 +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