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

890 Commits

Author SHA1 Message Date
Manuel Raynaud
394b533dd7 update customer model createOrUpdate method 2013-09-03 14:22:06 +02:00
gmorel
89edb958e5 WIP 
- Coupon create
 2013-09-03 14:04:05 +02:00
Manuel Raynaud
483710afd2 update address model 2013-09-03 14:01:07 +02:00
Manuel Raynaud
8a84af399d fix redirect process in viewListener 2013-09-03 12:25:47 +02:00
Manuel Raynaud
e4d59fc2e0 Merge branch 'master' of github.com:thelia/thelia 2013-09-03 11:28:13 +02:00
franck
55bf4868d9 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-03 11:26:49 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +02:00
gmorel
4088b2ef03 WIP 
- Coupon create
 2013-09-03 11:20:20 +02:00
Manuel Raynaud
1496f51c0e refactor reset_install script 2013-09-03 11:14:44 +02:00
Manuel Raynaud
15a91a9fd9 refactor install process, database management in dedicated class 2013-09-03 11:09:27 +02:00
Manuel Raynaud
9f96b830e7 create task for reloaded database 2013-09-03 11:07:32 +02:00
gmorel
19ea6d25df WIP 
Merge on master
 2013-09-03 11:02:36 +02:00
gmorel
6ee99b6cad Working 
- implementation Coupon Read page
 2013-09-03 11:02:02 +02:00
Manuel Raynaud
1e6a31d1a3 Merge branch 'install' into reloadTask 2013-09-03 10:30:21 +02:00
Etienne Roudeix
2bc1dc0bec Merge branch 'master' into rewrite 2013-09-03 10:10:32 +02:00
Etienne Roudeix
3de03dc876 SID : rewriting 2013-09-03 10:09:51 +02:00
Manuel Raynaud
13ffbddc1b Merge branch 'master' into actions 2013-09-03 09:36:54 +02:00
Manuel Raynaud
dce816d77c fix typo in phpdoc 2013-09-03 09:22:12 +02:00
Manuel Raynaud
29dc067076 complete test for foramt_number smarty function 2013-09-03 09:06:02 +02:00
Manuel Raynaud
1f50158398 test foramt_date without datetime object 2013-09-03 08:43:00 +02:00
Manuel Raynaud
7718c90e60 create foramt_number smarty function 2013-09-03 08:34:46 +02:00
Manuel Raynaud
0d261373f8 add some phpdoc 2013-09-03 00:05:37 +02:00
Manuel Raynaud
92b64db156 complete test for format_date smarty function 2013-09-02 23:51:51 +02:00
Manuel Raynaud
eeea885543 create new smarty function for displaying date in expected format 2013-09-02 23:36:34 +02:00
Manuel Raynaud
50e585044f initialize step 2 2013-09-02 19:56:34 +02:00
gmorel
6383de251e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Added missing CategoryEvent class
 2013-09-02 17:34:24 +02:00
franck
5568f2dc62 Added missing CategoryEvent class 2013-09-02 17:34:11 +02:00
Manuel Raynaud
384b0cd355 start to create install template 2013-09-02 17:27:11 +02:00
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
Manuel Raynaud
347d3050f3 add missinf files 2013-09-02 17:13:01 +02:00
Manuel Raynaud
39d17fe30d create BaseAdminController 2013-09-02 17:12:30 +02:00
gmorel
4b1de5fe93 WIP 
- Coupon Controller
 2013-09-02 17:08:47 +02:00
gmorel
ae0f2e766b Working 
- merge schema
 2013-09-02 17:08:01 +02:00
gmorel
c3650b4482 WIP 
Coupon Loop
 2013-09-02 17:07:25 +02:00
Manuel Raynaud
ac5c6b9f5a create install router 2013-09-02 16:59:10 +02:00
gmorel
273e6144aa Working 
- Add parameters to command
 2013-09-02 16:57:34 +02:00
Manuel Raynaud
4e1cc9e810 start refacroting install process 2013-09-02 16:54:18 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +02:00
Manuel Raynaud
7d0d1a90a1 create action install file 2013-09-02 15:10:29 +02:00
Manuel Raynaud
3f078b8c81 add some phpdoc to customer front controller 2013-09-02 13:17:55 +02:00
Manuel Raynaud
0ae5d00054 change module routing priority to 1 2013-09-02 10:09:40 +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
gmorel
eef57ba30a WIP 
- Coupon controller
 2013-09-02 09:17:47 +02:00
franck
e1cc7162ae Added get/setLangId() method in session 2013-09-02 02:04:36 +02:00
franck
beab17a18d Refactored VariableXxxxx.php as ConfigXxxx.php 2013-09-02 01:37:12 +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