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

724 Commits

Author SHA1 Message Date
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
Etienne Roudeix
1d231dc11b Merge branch 'master' of github.com:thelia/thelia 2013-09-06 16:14:38 +02:00
Etienne Roudeix
f2aad186f6 position output in loops 2013-09-06 16:13:51 +02:00
mespeche
ebb350111a Working : 
- Add attribute and feature routes  management
- Add product attributes view
 2013-09-06 15:00:52 +02:00
mespeche
56de467362 Working : 
- Add label information in Form file
- Refactor to bootstrap3
 2013-09-06 12:55:53 +02:00
mespeche
a9f2b70ab5 Working : 
- fix route name in ConfigController
 2013-09-06 12:29:38 +02:00
Etienne Roudeix
b6a216fd9b substitutions : product category folder content 2013-09-06 12:21:36 +02:00
mespeche
c015bbe8b5 Working : 
- Refactor to bootstrap3
- Label information in Form files
 2013-09-06 12:12:27 +02:00
mespeche
7e28c92b0b Working : 
- Refactor to bootstrap3
 2013-09-06 11:48:24 +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
franck
bbce082df3 Fixed minor visual glitches 2013-09-06 10:41:19 +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
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
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
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
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