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

355 Commits

Author SHA1 Message Date
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
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
mespeche
c5f1e5288c Working : 
- Create product_attributes view for loop intergration
 2013-09-06 16:32:27 +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
Etienne Roudeix
1d231dc11b Merge branch 'master' of github.com:thelia/thelia 2013-09-06 16:14:38 +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
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
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
617b762d8a Working : Resize countries flag + Add bootstrap-switch 2013-09-06 10:16:08 +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
351c669e05 Merge branch 'master' of github.com:thelia/thelia 2013-09-06 07:49:14 +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
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
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
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
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
5d6f01d338 Working : Clean of currencies list and storage bootstrap-editable 2013-09-05 11:12:18 +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
75513c778a Working : New version of bootstrap-editable + Update of currency pages to bootstrap3 2013-09-05 09:56:06 +02:00
gmorel
a9b0f53334 Merge remote-tracking branch 'origin/coupon' into coupon 
Conflicts:
	templates/admin/default/coupon/form.html
 2013-09-04 19:25:57 +02:00
gmorel
23a4ff26c8 Working 
- Base create/update coupon in backoffice
 2013-09-04 19:22:20 +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
mespeche
910477f371 Working : Migration form to bootstrap3 2013-09-04 18:08:13 +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
franck
866036a0bf Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html
 2013-09-04 17:40:34 +02:00
franck
6387182026 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
 2013-09-04 17:34:23 +02:00
mespeche
1d38639ca5 Working : Update to bootstrap3 2013-09-04 17:20:34 +02:00
mespeche
7362a5a93b Working : Update to bootstrap3 + Delete js filter for the moment 2013-09-04 17:09:59 +02:00
gmorel
b9577e87e3 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
 2013-09-04 16:23:16 +02:00
gmorel
7b0f2ee4bc Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
 2013-09-04 16:12:22 +02:00