TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
848 Commits 1 Branch 0 Tags
6cba95f4ee2ca1315b87ee06d0409bfeed987ee4
Commit Graph

848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gmorel
6cba95f4ee Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
  refactor name for updating actions
  choose UPDATE word for name actions
  add update address action and create tests
  404 not found management
  Working Fix unset namespace
  modify travis script
  test rewriting exception
  Fixed minor bug in Currencies
  Finished currency edition
  Added route methods
  address action implementation
  hot fix
  rewriting
  add address create controller and event
  Added AdminUtilities Smarty plugin, optimized templates
  update customer model createOrUpdate method
  update address model
  fix redirect process in viewListener
  refactor reset_install script
  refactor install process, database management in dedicated class
  ...

Conflicts:
	local/config/schema.xml
	reset_install.sh
 2013-09-04 15:42:38 +02:00
gmorel
dc271db577 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh
 2013-09-04 12:01:12 +02:00
Manuel Raynaud
8b2007f94d Merge branch 'actions' 
Conflicts:
	core/lib/Thelia/Action/Currency.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-04 10:53:32 +02:00
Manuel Raynaud
0efe393e3c Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
 2013-09-04 10:50:13 +02:00
Manuel Raynaud
d23190303c refactor name for updating actions 2013-09-04 10:48:59 +02:00
Manuel Raynaud
b9a7030d90 choose UPDATE word for name actions 2013-09-04 10:37:25 +02:00
Manuel Raynaud
dad1a1c612 add update address action and create tests 2013-09-04 10:09:51 +02:00
Etienne Roudeix
dffbf76cfd Merge branch 'master' into rewrite 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
	install/insert.sql
 2013-09-04 10:06:22 +02:00
Etienne Roudeix
29bf7d9a92 404 not found management 2013-09-04 10:02:58 +02:00
mespeche
1b7a36addf Working Fix unset namespace 2013-09-04 09:58:59 +02:00
Manuel Raynaud
0b9e2552ed modify travis script 2013-09-04 08:30:24 +02:00
Etienne Roudeix
9a537b69d3 test rewriting exception 2013-09-04 08:16:25 +02:00
franck
26da884dae Fixed minor bug in Currencies 2013-09-03 19:32:57 +02:00
franck
7128739da5 Finished currency edition 2013-09-03 19:03:54 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
 2013-09-03 19:03:27 +02:00
franck
da7fcc4274 Added route methods 2013-09-03 18:58:51 +02:00
Manuel Raynaud
deee59244d address action implementation 2013-09-03 17:11:11 +02:00
Etienne Roudeix
a47ef40996 hot fix 2013-09-03 16:57:31 +02:00
Etienne Roudeix
ac1bb60b50 Merge branch 'master' into rewrite 2013-09-03 16:52:28 +02:00
Etienne Roudeix
43ff0b7297 rewriting 2013-09-03 16:51:41 +02:00
Manuel Raynaud
5c3ac1561d add address create controller and event 2013-09-03 16:13:17 +02:00
franck
fce528c41f Added AdminUtilities Smarty plugin, optimized templates 2013-09-03 15:43:05 +02:00
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
gmorel
2b337229b8 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'coupon' of https://github.com/thelia/thelia:
  Max usage field and Is enabled field updates
  Max usage gestion
 2013-09-03 12:33:51 +02:00
mespeche
5bd501315d Max usage field and Is enabled field updates 2013-09-03 12:31:57 +02:00
mespeche
94b1e3f5ff Max usage gestion 2013-09-03 12:31:17 +02:00
Manuel Raynaud
8a84af399d fix redirect process in viewListener 2013-09-03 12:25:47 +02:00
franck
69f88db090 en_EN -> en_UK, the "en_EN" locale does not exists. 2013-09-03 11:32:13 +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
gmorel
56ccc2c06d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'coupon' of https://github.com/thelia/thelia:
  Working
  Working
  WIP
  WIP
  Working
  Working
  Working
  WIP
  WIP
  Working
  WIP
  WIP
  Working
 2013-09-03 11:10:46 +02:00
Manuel Raynaud
15a91a9fd9 refactor install process, database management in dedicated class 2013-09-03 11:09:27 +02:00
mespeche
0754a1d880 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 2013-09-03 11:09:25 +02:00
Manuel Raynaud
9f96b830e7 create task for reloaded database 2013-09-03 11:07:32 +02:00
mespeche
9dc8518202 Working 
Update of edit view
- Add Is unlimited field
 2013-09-03 11:04:55 +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
mespeche
42175ca4eb Working 
- Add Jqueryui theme
- Change values in edit page
- Add filter on list page
 2013-09-03 10:45:06 +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