Manuel Raynaud
|
00d7d9b29a
|
create router for rewriting matching
|
2013-09-05 20:46:46 +02:00 |
|
Manuel Raynaud
|
c63120478b
|
start refactorin rewriting routing
|
2013-09-05 12:25:27 +02:00 |
|
Manuel Raynaud
|
be44367d41
|
enable auto-escapin in smarty
|
2013-09-05 10:25:45 +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 |
|
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 |
|
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
|
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 |
|
franck
|
02a1b5c655
|
Event harmonization with MRA
|
2013-09-04 15:45:46 +02:00 |
|
Etienne Roudeix
|
b910b0af86
|
fix URL::retrieve
|
2013-09-04 15:15:38 +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 |
|
Manuel Raynaud
|
3cb4e6ff2e
|
create Address::update method in controller
|
2013-09-04 11:42:18 +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 |
|
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 |
|
franck
|
4eac17fe85
|
Typo (sorry Etienne)
|
2013-09-04 10:32:37 +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
|
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 |
|
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 |
|