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

3914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gmorel
3b249dc21c Working : Coupon : Unit testing 2013-09-17 11:41:09 +02:00
Etienne Roudeix
692badb06b delivery form 2013-09-17 11:05:29 +02:00
gmorel
ae4ad0038b Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (27) and others
# Via Manuel Raynaud (8) and others
* 'coupon' of https://github.com/thelia/thelia: (50 commits)
  WIP : Coupon : unit tests on Rules
  WIP : Coupon : unit tests on Rules
  WIP : Coupon : unit tests on Operator
  WIP : Coupon functional tests
  Typo
  Added UrlRewritingTrait to manage URLs from model classes
  Merge branch 'master' of https://github.com/thelia/thelia into coupon
  fix typo
  Started category management
  add some php doc
  integrate swiftMailer as mailer solution
  add swiftmailer in composer
  use dump autoloader in all compser scripts
  remove script part of composer.json file
  fix typo
  add some information for OSX requirements
  No alert bloc
  default country
  Autofocus on username field for better use
  Beautiful login page
  ...
 2013-09-17 09:20:13 +02:00
franck
d097851522 Added documents action and loop 2013-09-17 01:07:42 +02:00
gmorel
a7ef4300aa WIP : Coupon : unit tests on Rules 2013-09-16 23:56:31 +02:00
gmorel
ad48823b48 WIP : Coupon : unit tests on Rules 2013-09-16 23:51:47 +02:00
gmorel
73c0a96979 WIP : Coupon : unit tests on Operator 2013-09-16 23:05:46 +02:00
gmorel
cfc54bd6df Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Typo
  Added UrlRewritingTrait to manage URLs from model classes
  Started category management
 2013-09-16 22:47:58 +02:00
gmorel
6f1c77a57e WIP : Coupon functional tests 2013-09-16 22:41:17 +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
gmorel
16f402aaf4 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (92) and others
# Via Manuel Raynaud (28) and others
* 'master' of https://github.com/thelia/thelia: (212 commits)
  fix typo
  add some php doc
  integrate swiftMailer as mailer solution
  add swiftmailer in composer
  use dump autoloader in all compser scripts
  remove script part of composer.json file
  fix typo
  add some information for OSX requirements
  No alert bloc
  default country
  Autofocus on username field for better use
  Beautiful login page
  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
  ...
 2013-09-16 22:07:09 +02:00
gmorel
9338cdb472 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia: (37 commits)
  add PropelDataCollector to debugbar, still missing some informations
  remove unused class
  integrate debugbar module
  remove htmlpurifier
  modify insert.sql including debugBar module
  add new event and new tag
  Started category modification
  Factorized modal dialogs javascript
  Factorized creation and confirmation modal dialogs
  create controller adding delivery module in session
  create Delivery loop
  Working :
  Continuing categories administration...
  Working :
  create base loop for delivery and payment entities
  remove htmlpurifier dependency
  country id can be an argument for calculate method
  Working :
  Working :
  fix typo
  ...

Conflicts:
	composer.lock
	core/lib/Thelia/Controller/Admin/CategoryController.php
	templates/admin/default/assets/less/thelia/variables.less
 2013-09-16 22:05:33 +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