Etienne Roudeix
|
a178835f6b
|
tax faker
|
2013-09-09 11:31:41 +02:00 |
|
Etienne Roudeix
|
2548fb9e3c
|
insert 19.6 tva
|
2013-09-09 11:28:02 +02:00 |
|
Etienne Roudeix
|
ca9ec3b089
|
tax engine model
|
2013-09-09 11:01:31 +02:00 |
|
Etienne Roudeix
|
0a5281c1e6
|
tax engine model
|
2013-09-09 10:48:41 +02:00 |
|
Manuel Raynaud
|
99f40cbc80
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-09 09:03:02 +02:00 |
|
Manuel Raynaud
|
f2a80e4b6a
|
clean some code
|
2013-09-09 09:02:50 +02:00 |
|
Etienne Roudeix
|
928cc3ee4f
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-09 08:06:08 +02:00 |
|
Etienne Roudeix
|
1ec386ff79
|
Merge branch 'rewrite'
|
2013-09-09 08:05:57 +02:00 |
|
Etienne Roudeix
|
b637ad79f4
|
fix phpdoc
|
2013-09-09 08:05:43 +02:00 |
|
franck
|
ff4f3be64d
|
Added windows version of reset_install script
|
2013-09-08 12:29:20 +02:00 |
|
Manuel Raynaud
|
04ec683021
|
add PropelDataCollector to debugbar, still missing some informations
|
2013-09-07 17:37:24 +02:00 |
|
Manuel Raynaud
|
9bb48a2ef1
|
remove unused class
|
2013-09-07 16:54:18 +02:00 |
|
Manuel Raynaud
|
525e449fb2
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-07 16:40:14 +02:00 |
|
Manuel Raynaud
|
b036f16437
|
integrate debugbar module
|
2013-09-07 16:39:52 +02:00 |
|
Manuel Raynaud
|
1e660cd930
|
Merge branch 'delivery'
Conflicts:
composer.lock
install/insert.sql
|
2013-09-07 16:37:54 +02:00 |
|
Manuel Raynaud
|
9ebf16f1f6
|
remove htmlpurifier
|
2013-09-07 16:36:41 +02:00 |
|
Manuel Raynaud
|
c9aa06fd70
|
modify insert.sql including debugBar module
|
2013-09-07 16:34:51 +02:00 |
|
Manuel Raynaud
|
ed468ccb67
|
Merge branch 'master' into debugbar
|
2013-09-07 16:31:29 +02:00 |
|
Manuel Raynaud
|
5315e13ce9
|
add new event and new tag
|
2013-09-07 16:31:15 +02:00 |
|
franck
|
3bd3a4d943
|
Started category modification
|
2013-09-07 10:59:43 +02:00 |
|
franck
|
f304caa88f
|
Factorized modal dialogs javascript
|
2013-09-06 20:26:29 +02:00 |
|
franck
|
e8d96937e7
|
Factorized creation and confirmation modal dialogs
|
2013-09-06 20:00:02 +02:00 |
|
Manuel Raynaud
|
0aad4baf26
|
create controller adding delivery module in session
|
2013-09-06 19:29:19 +02:00 |
|
Manuel Raynaud
|
b067ef7dcc
|
create Delivery loop
|
2013-09-06 18:41:44 +02:00 |
|
franck
|
c6612a0246
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-06 17:51:10 +02:00 |
|
mespeche
|
ae667d33ee
|
Working :
- Nice construct of search form
|
2013-09-06 17:50:19 +02:00 |
|
franck
|
d11906eca5
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Config/Resources/routing/admin.xml
|
2013-09-06 17:48:12 +02:00 |
|
franck
|
c68f282fe8
|
Continuing categories administration...
|
2013-09-06 17:46:40 +02:00 |
|
mespeche
|
0adbb9a997
|
Working :
- Replacing the search form who had disappeared
|
2013-09-06 17:45:22 +02:00 |
|
Manuel Raynaud
|
a3b7e977da
|
create base loop for delivery and payment entities
|
2013-09-06 17:40:49 +02:00 |
|
Manuel Raynaud
|
2fda14cfeb
|
remove htmlpurifier dependency
|
2013-09-06 17:35:51 +02:00 |
|
Manuel Raynaud
|
fa7d88f8dc
|
country id can be an argument for calculate method
|
2013-09-06 17:34:25 +02:00 |
|
franck
|
8b82f58a5b
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-06 17:24:05 +02:00 |
|
mespeche
|
771d9e6322
|
Working :
- Add product attributes edit routing
- Add product attributes edit action
|
2013-09-06 17:23:06 +02:00 |
|
mespeche
|
eebe1d4f58
|
Working :
- Rename file for best practices regard
|
2013-09-06 16:47:21 +02:00 |
|
Manuel Raynaud
|
e9c47bf59d
|
fix typo
|
2013-09-06 16:45:13 +02:00 |
|
Manuel Raynaud
|
8ba5ef616d
|
change phpdoc for BaseLoop::exec method
|
2013-09-06 16:34:55 +02:00 |
|
mespeche
|
def9b5dd1b
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-06 16:33:50 +02:00 |
|
mespeche
|
c5f1e5288c
|
Working :
- Create product_attributes view for loop intergration
|
2013-09-06 16:32:27 +02:00 |
|
Manuel Raynaud
|
5b637598e9
|
refactor phpdoc block for BaseLoop::getArgDefinitions();
|
2013-09-06 16:31:04 +02:00 |
|
franck
|
af93f810f7
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-06 16:19:06 +02:00 |
|
franck
|
8bd7a6413d
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
templates/admin/default/categories.html
templates/admin/default/includes/add-category-dialog.html
templates/admin/default/includes/delete-category-dialog.html
|
2013-09-06 16:18:54 +02:00 |
|
Manuel Raynaud
|
1c307385ce
|
fix typo
|
2013-09-06 16:16:48 +02:00 |
|
Manuel Raynaud
|
ab134f872c
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-06 16:15:04 +02:00 |
|
Etienne Roudeix
|
1d231dc11b
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-06 16:14:38 +02:00 |
|
Manuel Raynaud
|
3ac3224e1c
|
add help in BaseController for retrieving the translator (method
getTranslator)
|
2013-09-06 16:14:35 +02:00 |
|
Etienne Roudeix
|
f2aad186f6
|
position output in loops
|
2013-09-06 16:13:51 +02:00 |
|
Manuel Raynaud
|
2dee65727d
|
set good module delivery id in session
|
2013-09-06 16:12:57 +02:00 |
|
franck
|
6fdf60b960
|
Categories refactoring
|
2013-09-06 15:56:06 +02:00 |
|
mespeche
|
ebb350111a
|
Working :
- Add attribute and feature routes management
- Add product attributes view
|
2013-09-06 15:00:52 +02:00 |
|