franck
|
3d78af8b97
|
Finished category related content management
|
2013-09-17 13:50:01 +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
|
7a8dea28a6
|
fix typo
|
2013-09-16 19:08:01 +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 |
|
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 |
|
Manuel Raynaud
|
035d9dd0e9
|
add swiftmailer in composer
|
2013-09-16 16:57:08 +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 |
|
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
|
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 |
|
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 |
|
Etienne Roudeix
|
2021ddfc9e
|
feed loop is now countable
|
2013-09-16 14:42:00 +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 |
|
gmorel
|
55890e1498
|
Merge remote-tracking branch 'origin/master'
|
2013-09-16 11:26:48 +02:00 |
|
gmorel
|
c49bfa4b25
|
Working : Coupon : Fix unit tests @todo refactor
|
2013-09-16 11:26:37 +02:00 |
|
Manuel Raynaud
|
42ade8a45a
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-16 11:12:37 +02:00 |
|
Manuel Raynaud
|
77c0dd73d6
|
force charset in sql files
|
2013-09-16 11:10:25 +02:00 |
|
mespeche
|
76dc9609b6
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Config/Resources/routing/admin.xml
|
2013-09-16 11:01:00 +02:00 |
|
mespeche
|
15d9b55284
|
Countries view and routing creation
|
2013-09-16 10:59:30 +02:00 |
|
Manuel Raynaud
|
da60359c15
|
save if producSaleElements is in promo or not
|
2013-09-16 10:49:42 +02:00 |
|
franck
|
657456109b
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-16 10:41:22 +02:00 |
|
franck
|
2cf1c62b06
|
Finished Features management
|
2013-09-16 10:40:52 +02:00 |
|
Manuel Raynaud
|
365d90b4a8
|
Merge branch 'master' into template
Conflicts:
core/lib/Thelia/Core/Event/TheliaEvents.php
|
2013-09-16 10:19:40 +02:00 |
|
Manuel Raynaud
|
2468db3a00
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-16 10:17:35 +02:00 |
|
Manuel Raynaud
|
5e3c10cd4f
|
add promo column in cart_item
|
2013-09-16 10:16:54 +02:00 |
|