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

25 Commits

Author SHA1 Message Date
gmorel
90f4db6aa4 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (8) and others
* 'master' of https://github.com/thelia/thelia: (47 commits)
  tax engine
  tax engine
  - Add orders view route - Add view & action for orders index
  Removed a redondant "use"
  Add tooltip
  - Add creation address form - Add addresses list - Add update address form
  Added process_assets config variable
  Change breadcrumb separator color
  Add breadcrumb to customers view
  - Change boolean type to integer type for update_logged_in_user field - Create view for customer modification
  syntax
  use ROUTER::ABSOLUTE_URL by default
  PSE loop todo
  currency management in PSE loop
  Add customer view finish
  Add modal for create/delete customer
  Update body background
  fixed typo
  searching route return relative path
  pse loop currency
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
	web/index_dev.php
 2013-09-11 17:12:47 +02:00
gmorel
a9dae509c7 WIP 
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
 2013-09-11 14:40:55 +02:00
mespeche
d21e4532c9 - Add creation address form 
- Add addresses list
- Add update address form
 2013-09-11 13:32:21 +02:00
gmorel
f481da7a2f WIP 
- Coupon Add/Edit/Delete rule AJAX
 2013-09-10 15:41:23 +02:00
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
mespeche
617b762d8a Working : Resize countries flag + Add bootstrap-switch 2013-09-06 10:16:08 +02:00
mespeche
91670d8347 Working : Add of bootstrap-editable in good directories 2013-09-05 11:14:31 +02:00
mespeche
7362a5a93b Working : Update to bootstrap3 + Delete js filter for the moment 2013-09-04 17:09:59 +02:00
gmorel
0ea7beb70f 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:11:51 +02:00
mespeche
fec1b57aea Working : Cleanup admin new version bootstrap v3 2013-09-04 15:34:29 +02:00
mespeche
7258b24c88 Working : Finish renaming class for bootstrap migration 2013-09-04 15:05:49 +02:00
mespeche
dafaa02718 Working : Major class changes migration from bootstrap 2.x to 3.0 2013-09-04 11:35:22 +02:00
mespeche
94b1e3f5ff Max usage gestion 2013-09-03 12:31:17 +02:00
mespeche
9dc8518202 Working 
Update of edit view
- Add Is unlimited field
 2013-09-03 11:04:55 +02:00
mespeche
42175ca4eb Working 
- Add Jqueryui theme
- Change values in edit page
- Add filter on list page
 2013-09-03 10:45:06 +02:00
mespeche
71d557020f WIP 
Add slider and others filter on tablesorter
 2013-09-02 16:39:57 +02:00
mespeche
f48de82e96 WIP 
Filters input on tablesorter tables
 2013-09-02 15:10:07 +02:00
mespeche
7f3e90555a Working 
Implementation of metadata for the exclusion of certain columns
 2013-09-02 12:38:52 +02:00
mespeche
fb459eea8f WIP 
Modification message d'erreur miniBrowser
 2013-09-02 09:35:17 +02:00
mespeche
fe859591f4 WIP 
Refonte et mise en place du minibrowser
 2013-08-30 16:32:01 +02:00
mespeche
e5f8f65f77 WIP 
Suite de mise en place de la page d'édition des coupons avec miniBrowser
 2013-08-30 15:47:13 +02:00
mespeche
db102a5329 Working 
Supprésion de cette version de jQuery
 2013-08-30 08:52:37 +02:00
Michaël ESPECHE
4b9a54fa68 WIP 
- Implémentation coupon/list en cours
- Implémentation coupon/read OK
- Implémentation coupon/edit en cours
 2013-08-29 16:16:21 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles 
change composer required PHP version from 5.4 to 5.3
 2013-06-20 15:21:16 +02:00
franck
7351edeb46 Test du sparty parser 2013-06-18 15:36:22 +02:00