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
Manuel Raynaud
035d9dd0e9
add swiftmailer in composer
2013-09-16 16:57:08 +02:00
Etienne Roudeix
bf3bc02f8b
fix fixture dependant unit test
2013-09-16 16:46:12 +02:00
Manuel Raynaud
aa4e0636e8
use dump autoloader in all compser scripts
2013-09-16 16:31:13 +02:00
Manuel Raynaud
2309a2e788
remove script part of composer.json file
2013-09-16 16:29:09 +02:00
Etienne Roudeix
361e9e1126
delivery process
2013-09-16 16:12:04 +02:00
Manuel Raynaud
1dcde3ff2c
fix typo
2013-09-16 15:47:32 +02:00
Manuel Raynaud
484b2730de
Merge branch 'master' of github.com:thelia/thelia
2013-09-16 15:44:10 +02:00
Manuel Raynaud
785057c0be
add some information for OSX requirements
2013-09-16 15:42:25 +02:00
mespeche
5a7794b0cc
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-16 15:33:14 +02:00
mespeche
a229f555cb
No alert bloc
2013-09-16 15:32:52 +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
mespeche
a58d0fb027
Autofocus on username field for better use
2013-09-16 15:15:30 +02:00
mespeche
798e5e94a5
Beautiful login page
2013-09-16 15:14:26 +02:00
gmorel
b3df29a788
Merge branch 'master' of https://github.com/thelia/thelia into install_wizard
...
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (29 commits)
feed loop is now countable
Change error page design
Add validation button on form
- Edit country view creation - Delete and edit modalbox creation - Countries routes management
Completed template management
fix faker
fix faker script
Working : Fixture : cleaning
debugbar log query also use Tlog
update CartAdd form
Working : Fixture : cleaning
Working : Coupon : Fix unit tests @todo refactor
force charset in sql files
Countries view and routing creation
save if producSaleElements is in promo or not
Finished Features management
add promo column in cart_item
dispatch event when default currency change
add return statement in clear cache method
create cache for config entity
...
2013-09-16 15:08:09 +02:00
gmorel
bca2b58e41
Merge master
2013-09-16 15:07:58 +02:00
gmorel
b151325e57
WIP : Install wizard : step 2 file permission
2013-09-16 15:07:41 +02:00
Etienne Roudeix
2021ddfc9e
feed loop is now countable
2013-09-16 14:42:00 +02:00
Etienne Roudeix
c7b3aea7f0
cart integration
2013-09-16 14:31:34 +02:00
Etienne Roudeix
e0a48df23e
cart integration
2013-09-16 13:15:35 +02:00
mespeche
64bd7e1786
Change error page design
2013-09-16 13:14:37 +02:00
mespeche
dc807c4df8
Add validation button on form
2013-09-16 13:02:57 +02:00
mespeche
4929e6f88a
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-16 12:56:47 +02:00
mespeche
5e8749e054
- Edit country view creation
...
- Delete and edit modalbox creation
- Countries routes management
2013-09-16 12:55:34 +02:00
franck
dd2ba89a4c
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-16 12:52:59 +02:00
franck
696a2be8ba
Completed template management
2013-09-16 12:52:35 +02:00
Manuel Raynaud
8d2fab911c
fix faker
2013-09-16 12:41:19 +02:00
Manuel Raynaud
ae08f448cc
Merge branch 'master' of github.com:thelia/thelia
2013-09-16 12:15:26 +02:00
Manuel Raynaud
8a19b8ec71
fix faker script
2013-09-16 12:15:04 +02:00
gmorel
5a2ca00ec9
Merge remote-tracking branch 'origin/master'
2013-09-16 12:03:31 +02:00
gmorel
d68e1f3d4f
Working : Fixture : cleaning
2013-09-16 12:03:22 +02:00
Manuel Raynaud
541bd3a4da
debugbar log query also use Tlog
2013-09-16 11:59:56 +02:00
Manuel Raynaud
c9d0e2b2b3
Merge branch 'master' of github.com:thelia/thelia
2013-09-16 11:47:19 +02:00
Manuel Raynaud
3675428ecc
update CartAdd form
2013-09-16 11:47:03 +02:00
gmorel
f53c59bffc
Working : Fixture : cleaning
2013-09-16 11:35:21 +02:00