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

1068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
mespeche
56de467362 Working : 
- Add label information in Form file
- Refactor to bootstrap3
 2013-09-06 12:55:53 +02:00
mespeche
fed1795e93 Working : 
- Change alert class
 2013-09-06 12:30:40 +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
gmorel
8a5e12f814 WIP 
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
 2013-09-06 11:47:00 +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
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