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

738 Commits

Author SHA1 Message Date
Manuel Raynaud
1e660cd930 Merge branch 'delivery' 
Conflicts:
	composer.lock
	install/insert.sql
 2013-09-07 16:37:54 +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
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
Manuel Raynaud
a3b7e977da create base loop for delivery and payment entities 2013-09-06 17:40:49 +02:00
Manuel Raynaud
fa7d88f8dc country id can be an argument for calculate method 2013-09-06 17:34:25 +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
Manuel Raynaud
5b637598e9 refactor phpdoc block for BaseLoop::getArgDefinitions(); 2013-09-06 16:31:04 +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
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
Manuel Raynaud
1686d6d87c each module is available in the container with name module.ModuleName 2013-09-06 11:43:37 +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
f6ab8888f3 start creating debugbar 2013-09-05 17:43:12 +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