gmorel
86d6a0fa05
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia : (39 commits)
Working :
Working :
Working :
Working :
Fixed minor visual glitches
Working : Resize countries flag + Add bootstrap-switch
fix test suite
clear asset cache in cache:cler command
Added a 'development mode' to assetic smarty plugin
rewriting router
use good Request object
Added Tools\URL test case, and a test case superclass for initializing Tools\URL
remove unused UrlWritin controller
create router for rewriting matching
customer substitutions
fix typo in front id
Working : For attributes on labels
Working : For attributes on labels
add label_attr attribute to form smarty plugin
start refactorin rewriting routing
...
Conflicts:
core/lib/Thelia/Config/Resources/routing/front.xml
templates/admin/default/assets/less/thelia/bootstrap-editable.less
templates/admin/default/categories.html
2013-09-06 19:36:52 +02:00
gmorel
8a5e12f814
WIP
...
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
2013-09-06 11:47:00 +02:00
mespeche
a82251b4b6
Working :
...
- Refactor modal
2013-09-06 11:15:39 +02:00
mespeche
86569b01a5
Working :
...
- Add switch to second table
2013-09-06 11:13:47 +02:00
mespeche
7f10926b03
Working :
...
- Add bootstrap switch
- Add css class to img
- Refactor modal add
- Label information in CategoryCreationForm file
2013-09-06 11:07:44 +02:00
mespeche
7b3cd46261
Working :
...
- Add "Action" label to table head
- Group buttons on "Action" col
- Add bootstrap-switch
2013-09-06 10:44:50 +02:00
franck
bbce082df3
Fixed minor visual glitches
2013-09-06 10:41:19 +02:00
mespeche
b83117653f
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-06 10:16:33 +02:00
mespeche
617b762d8a
Working : Resize countries flag + Add bootstrap-switch
2013-09-06 10:16:08 +02:00
Manuel Raynaud
2ef5e8bd0c
fix test suite
2013-09-06 10:08:30 +02:00
Manuel Raynaud
8538343a37
Merge branch 'master' of github.com:thelia/thelia
2013-09-06 09:58:54 +02:00
Manuel Raynaud
012432dad0
clear asset cache in cache:cler command
2013-09-06 09:58:35 +02:00
franck
30831f0ab5
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-06 09:57:18 +02:00
franck
9655ce3c72
Added a 'development mode' to assetic smarty plugin
2013-09-06 09:56:39 +02:00
Etienne Roudeix
b95218295d
rewriting router
2013-09-06 08:59:06 +02:00
Etienne Roudeix
41ed2dcebd
Merge branch 'master' of github.com:thelia/thelia
2013-09-06 08:25:52 +02:00
Manuel Raynaud
89ad332d88
use good Request object
2013-09-06 08:24:03 +02:00
Etienne Roudeix
eeedd540bc
Merge branch 'master' of github.com:thelia/thelia
2013-09-06 07:53:48 +02:00
Manuel Raynaud
c6884274ed
Merge branch 'master' of github.com:thelia/thelia
2013-09-06 07:51:37 +02:00
Manuel Raynaud
c540bf5b09
Merge branch 'rewrite_routing'
...
Conflicts:
core/lib/Thelia/Controller/Front/UrlRewritingController.php
2013-09-06 07:51:21 +02:00
Etienne Roudeix
351c669e05
Merge branch 'master' of github.com:thelia/thelia
2013-09-06 07:49:14 +02:00
franck
c8a5734a9e
Added Tools\URL test case, and a test case superclass for initializing
...
Tools\URL
2013-09-06 01:55:16 +02:00
franck
07f0f34e5c
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-05 23:31:07 +02:00
franck
318fb3bf2d
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
templates/admin/default/currencies.html
2013-09-05 23:30:50 +02:00
Manuel Raynaud
e82a49d326
remove unused UrlWritin controller
2013-09-05 20:53:03 +02:00
Manuel Raynaud
00d7d9b29a
create router for rewriting matching
2013-09-05 20:46:46 +02:00
gmorel
eea29cba06
WIP
...
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
2013-09-05 20:07:17 +02:00
Etienne Roudeix
a0f894d70f
customer substitutions
2013-09-05 17:54:04 +02:00
Manuel Raynaud
c8763be6ae
Merge branch 'master' of github.com:thelia/thelia
2013-09-05 17:43:32 +02:00
Manuel Raynaud
d921341d94
fix typo in front id
2013-09-05 16:56:38 +02:00
franck
c276ab236e
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
templates/admin/default/currencies.html
2013-09-05 16:53:07 +02:00
mespeche
baa1df6d59
Working : For attributes on labels
2013-09-05 16:52:17 +02:00
mespeche
e289c8026f
Working : For attributes on labels
2013-09-05 16:51:45 +02:00
Manuel Raynaud
40b524e9d6
add label_attr attribute to form smarty plugin
2013-09-05 14:22:28 +02:00
Manuel Raynaud
c63120478b
start refactorin rewriting routing
2013-09-05 12:25:27 +02:00
mespeche
f4c2f865e4
Working : clean of currency-edit page
2013-09-05 11:29:07 +02:00
mespeche
91670d8347
Working : Add of bootstrap-editable in good directories
2013-09-05 11:14:31 +02:00
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
