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

1045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mespeche
967cb735f0 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-05 11:12:34 +02:00
mespeche
5d6f01d338 Working : Clean of currencies list and storage bootstrap-editable 2013-09-05 11:12:18 +02:00
Manuel Raynaud
cd5032fc51 Merge branch 'master' of github.com:thelia/thelia 2013-09-05 10:26:07 +02:00
Manuel Raynaud
be44367d41 enable auto-escapin in smarty 2013-09-05 10:25:45 +02:00
franck
3b27a71967 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-05 10:00:39 +02:00
franck
271e6c64f0 Before merging coupon 2013-09-05 10:00:17 +02:00
mespeche
1e334dccee Merge branch 'master' of https://github.com/thelia/thelia 2013-09-05 09:57:57 +02:00
mespeche
75513c778a Working : New version of bootstrap-editable + Update of currency pages to bootstrap3 2013-09-05 09:56:06 +02:00
Manuel Raynaud
b70f5b1d68 fix typo in method name 2013-09-05 09:25:15 +02:00
Manuel Raynaud
b0ac5f3f03 add more test on DefaultController 2013-09-05 09:24:22 +02:00
Manuel Raynaud
86892f7af6 fix issue for retrieving default view in defaultController 2013-09-05 09:10:53 +02:00
Manuel Raynaud
c22761b60a fix issue if base_url does not exists 2013-09-05 09:00:46 +02:00
Manuel Raynaud
fae48e9ee4 fix issue in Lang Model 2013-09-05 08:35:47 +02:00
Manuel Raynaud
43a2c0ac7b refactor Lang table 2013-09-05 08:30:15 +02:00
gmorel
a9b0f53334 Merge remote-tracking branch 'origin/coupon' into coupon 
Conflicts:
	templates/admin/default/coupon/form.html
 2013-09-04 19:25:57 +02:00
gmorel
23a4ff26c8 Working 
- Base create/update coupon in backoffice
 2013-09-04 19:22:20 +02:00
franck
58a68b1959 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-04 19:03:37 +02:00
franck
d3a287333e Fixed TheliaLoop Smarty plugin (lopp imbrication was broken) 2013-09-04 19:02:26 +02:00
mespeche
910477f371 Working : Migration form to bootstrap3 2013-09-04 18:08:13 +02:00
gmorel
f399b1de2e Working 
- Render form now can render CheckBox
 2013-09-04 18:04:23 +02:00
franck
31c074d492 Fixed image tests 2013-09-04 17:59:07 +02:00
Manuel Raynaud
3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
 2013-09-04 17:57:41 +02:00
Manuel Raynaud
ceb02841e1 validate create and update address in front context 2013-09-04 17:52:58 +02:00
franck
866036a0bf Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html
 2013-09-04 17:40:34 +02:00
franck
6387182026 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
 2013-09-04 17:34:23 +02:00
mespeche
1d38639ca5 Working : Update to bootstrap3 2013-09-04 17:20:34 +02:00
mespeche
7362a5a93b Working : Update to bootstrap3 + Delete js filter for the moment 2013-09-04 17:09:59 +02:00
gmorel
b9577e87e3 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
 2013-09-04 16:23:16 +02:00
gmorel
7b0f2ee4bc Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
 2013-09-04 16:12:22 +02:00
gmorel
0ea7beb70f Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
 2013-09-04 16:11:51 +02:00
mespeche
ba645764fc Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	reset_install.sh
 2013-09-04 16:05:25 +02:00
mespeche
308d4d9297 WIP : Comment of route url-rewriting.check 2013-09-04 15:54:49 +02:00
mespeche
2cd2c6bc59 Working : Fix script reset 2013-09-04 15:52:16 +02:00
franck
02a1b5c655 Event harmonization with MRA 2013-09-04 15:45:46 +02:00
gmorel
a461420c67 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Etienne Roudeix
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  fix URL::retrieve
  global outputs in loops
 2013-09-04 15:45:19 +02:00
gmorel
62c1a59f68 WIP 
- Coupon create
 2013-09-04 15:43:05 +02:00
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
mespeche
e3c6e960b5 Merge branch 'bootstrap3' 2013-09-04 15:35:24 +02:00
mespeche
fec1b57aea Working : Cleanup admin new version bootstrap v3 2013-09-04 15:34:29 +02:00
Etienne Roudeix
b910b0af86 fix URL::retrieve 2013-09-04 15:15:38 +02:00
mespeche
7258b24c88 Working : Finish renaming class for bootstrap migration 2013-09-04 15:05:49 +02:00
Etienne Roudeix
f10294fee2 Merge branch 'rewrite' 2013-09-04 14:45:57 +02:00
Etienne Roudeix
e1965a5145 global outputs in loops 2013-09-04 14:45:14 +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
3cb4e6ff2e create Address::update method in controller 2013-09-04 11:42:18 +02:00
mespeche
dafaa02718 Working : Major class changes migration from bootstrap 2.x to 3.0 2013-09-04 11:35:22 +02:00
Manuel Raynaud
1105990a41 event classes must extends ActionEvent 2013-09-04 11:33:24 +02:00
franck
ecf6326820 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-04 10:54:19 +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