TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
789 Commits 1 Branch 0 Tags
5bd501315d6d3eaa71a2c19f67a38289dd9c0093
Commit Graph

120 Commits

Author SHA1 Message Date
gmorel
33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
 2013-09-02 17:25:25 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-02 09:19:24 +02:00
franck
1558f6af5f Added name duplication check when creating a variable 2013-09-02 01:25:11 +02:00
franck
928bf7b638 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-02 00:18:29 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
Manuel Raynaud
ef8e98d415 add some phpdoc 2013-09-01 11:32:05 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
gmorel
fd63115c97 WIP 
- Update Coupon Controller/Form/Event - create()
 2013-08-30 12:23:49 +02:00
gmorel
37659415ad WIP 
- Add Coupon Event
- Customer Parameter
 2013-08-29 16:20:41 +02:00
gmorel
71a91ff60f Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix (4) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Removed InternalEvent, simplified SecurityContext
  rewriting tables
  rewriting tables
  rewriting tables
  rewriting tables

Conflicts:
	composer.lock
	local/config/schema.xml
 2013-08-28 18:19:38 +02:00
franck
0361cd1ff2 Removed InternalEvent, simplified SecurityContext 2013-08-28 17:52:32 +02:00
gmorel
8b6cbb0621 WIP 
- Beginning BackOffice Coupon implementation
 2013-08-28 14:37:29 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
 2013-08-21 09:19:56 +02:00
Manuel Raynaud
0397f5fdf8 create customer login controller 2013-08-16 14:24:00 +02:00
Manuel Raynaud
4f31627301 refactor action customer 2013-08-16 14:04:44 +02:00
Manuel Raynaud
ab5e845ad3 start refactoring customer update process 2013-08-16 12:09:08 +02:00
Manuel Raynaud
382fbe230e update customer process creation 2013-08-16 11:01:32 +02:00
franck
f028d2b2db Added image-cache:clear console command 2013-08-15 21:18:16 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
franck
5762711146 Added original file data 2013-08-15 12:27:30 +02:00
franck
a56e05b36b Added image action and loop 2013-08-15 11:46:46 +02:00
franck
47bc545019 Added image processing actgion and loop 2013-08-15 11:44:46 +02:00
Manuel Raynaud
1db41a36ab /bin/bash: q : commande introuvable 2013-08-14 16:24:22 +02:00
Manuel Raynaud
b731a767d5 remove unused method 2013-08-14 16:14:01 +02:00
Manuel Raynaud
d1b6b1dae4 change quantity on cartUpdate EventListener 2013-08-14 16:07:51 +02:00
Manuel Raynaud
ecb42e906b refactor update item eventListener 2013-08-14 15:55:06 +02:00
Manuel Raynaud
f9b2584485 remove references to Request in deleteArticle eventListener 2013-08-14 15:31:09 +02:00
Manuel Raynaud
7918ce9723 refactor deleteArticle eventListener 2013-08-14 15:30:44 +02:00
Manuel Raynaud
32e7b334dd move form exception in Form namespace 2013-08-14 15:23:59 +02:00
Manuel Raynaud
ab81b58e94 refactor cartAdd EventListener, removing Request references 2013-08-14 15:10:21 +02:00
Manuel Raynaud
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +02:00
Manuel Raynaud
3bf7e79960 change action name for change item article 2013-08-13 10:12:04 +02:00
Manuel Raynaud
cf5ccdc7ae refactor modify Article action 2013-08-13 10:09:12 +02:00
Manuel Raynaud
541fe7f75d fix issue on adding item action 2013-08-13 09:53:49 +02:00
Manuel Raynaud
7f83225645 fix test suite issue 2013-08-13 09:34:08 +02:00
Manuel Raynaud
be5d1e9ddb refactor cart and cartEvent process 2013-08-12 17:48:48 +02:00
Manuel Raynaud
b377ebe6e8 refactor action process to controller process 2013-08-12 16:42:23 +02:00
Manuel Raynaud
bb2676a719 retrieve context value in BaseAction 2013-08-12 14:58:28 +02:00
Manuel Raynaud
b4c4898374 change context by Class and service context 2013-08-12 14:49:43 +02:00
Manuel Raynaud
88f8e22408 creating new ContainerAware class fixing context on it 2013-08-12 10:07:37 +02:00
Manuel Raynaud
8d1cd1019b remove doc 2013-08-09 16:47:49 +02:00
Manuel Raynaud
d213278fe3 Merge branch 'master' into actions 
Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php
 2013-08-09 16:46:56 +02:00
Manuel Raynaud
31743fd987 apply php-cs-fiwer on Action directory 2013-08-09 10:38:58 +02:00
franck
00100945f6 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php
 2013-08-09 10:25:03 +02:00
Manuel Raynaud
5cd2584cbc continue refactoring dispatching event on model modification 2013-08-09 10:24:38 +02:00
Manuel Raynaud
654220882a move dispatch during customer creation process in post/preInsert methods 2013-08-09 10:19:36 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +02:00