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

137 Commits

Author SHA1 Message Date
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
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
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
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
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
franck
02a1b5c655 Event harmonization with MRA 2013-09-04 15:45:46 +02:00
gmorel
6cba95f4ee Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia: (32 commits)
  refactor name for updating actions
  choose UPDATE word for name actions
  add update address action and create tests
  404 not found management
  Working Fix unset namespace
  modify travis script
  test rewriting exception
  Fixed minor bug in Currencies
  Finished currency edition
  Added route methods
  address action implementation
  hot fix
  rewriting
  add address create controller and event
  Added AdminUtilities Smarty plugin, optimized templates
  update customer model createOrUpdate method
  update address model
  fix redirect process in viewListener
  refactor reset_install script
  refactor install process, database management in dedicated class
  ...

Conflicts:
	local/config/schema.xml
	reset_install.sh
 2013-09-04 15:42:38 +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
gmorel
dc271db577 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh
 2013-09-04 12:01:12 +02:00
mespeche
dafaa02718 Working : Major class changes migration from bootstrap 2.x to 3.0 2013-09-04 11:35:22 +02:00
franck
26da884dae Fixed minor bug in Currencies 2013-09-03 19:32:57 +02:00
franck
7128739da5 Finished currency edition 2013-09-03 19:03:54 +02:00
franck
ec32aa9eb5 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/BaseController.php
 2013-09-03 19:03:27 +02:00
franck
fce528c41f Added AdminUtilities Smarty plugin, optimized templates 2013-09-03 15:43:05 +02:00
gmorel
89edb958e5 WIP 
- Coupon create
 2013-09-03 14:04:05 +02:00
mespeche
5bd501315d Max usage field and Is enabled field updates 2013-09-03 12:31:57 +02:00
mespeche
94b1e3f5ff Max usage gestion 2013-09-03 12:31:17 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +02:00
mespeche
0754a1d880 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 2013-09-03 11:09:25 +02:00
mespeche
9dc8518202 Working 
Update of edit view
- Add Is unlimited field
 2013-09-03 11:04:55 +02:00
gmorel
6ee99b6cad Working 
- implementation Coupon Read page
 2013-09-03 11:02:02 +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
gmorel
33b8ceb24e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (2) and franck (1)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Completed mailing templates management
  change symfony/icu version for compatibility
  add file reset_install.sh

Conflicts:
	composer.json
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Model/Map/CouponI18nTableMap.php
	install/thelia.sql
	local/config/schema.xml
	reset_install.sh
 2013-09-02 17:25:25 +02:00
gmorel
4b1de5fe93 WIP 
- Coupon Controller
 2013-09-02 17:08:47 +02:00
mespeche
71d557020f WIP 
Add slider and others filter on tablesorter
 2013-09-02 16:39:57 +02:00
franck
3191a928ab Completed mailing templates management 2013-09-02 16:21:49 +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
34c201d5d9 Working 
Tablesorter styles
 2013-09-02 10:12:17 +02:00
mespeche
1a5c667c83 Working 
Merge of Frank's updates
 2013-09-02 09:51:31 +02:00
mespeche
034c9f6050 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
Conflicts:
	templates/admin/default/assets/css/admin.less
 2013-09-02 09:41:30 +02:00
mespeche
fb459eea8f WIP 
Modification message d'erreur miniBrowser
 2013-09-02 09:35:17 +02:00
gmorel
5a1d622284 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck (9) and others
# Via franck (3) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  Added get/setLangId() method in session
  Refactored VariableXxxxx.php as ConfigXxxx.php
  Added name duplication check when creating a variable
  Completed the backoffice variable management
  update propel version and dependencies
  add some phpdoc
  Fixed getUrl()
  Typo :(
  Intriducec BaseI18nLoop, started variable config management
  Fixed URL::absoluteUrl()
  Fixed customer front controller, events, addec admion config.
  rewriting
  specific rewrittend url retrievement
  product page
  url global substitution
  sid : rewriting
  rewriting tables
  start rewriting

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Event/TheliaEvents.php
 2013-09-02 09:19:24 +02:00
franck
e1cc7162ae Added get/setLangId() method in session 2013-09-02 02:04:36 +02:00
franck
beab17a18d Refactored VariableXxxxx.php as ConfigXxxx.php 2013-09-02 01:37:12 +02:00
franck
1558f6af5f Added name duplication check when creating a variable 2013-09-02 01:25:11 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
franck
6d5d0f6606 Fixed getUrl() 2013-08-31 15:52:42 +02:00
franck
6aa2f80444 Intriducec BaseI18nLoop, started variable config management 2013-08-31 11:38:00 +02:00
franck
a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/default/login.html
 2013-08-30 19:48:26 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
mespeche
fe859591f4 WIP 
Refonte et mise en place du minibrowser
 2013-08-30 16:32:01 +02:00
mespeche
64698b1d3d Working 
Remise en place du chartage CSS du composant datepicker et ajout de la
mixin gradient
 2013-08-30 16:01:40 +02:00
mespeche
031ba3d19c Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
Conflicts:
	templates/admin/default/assets/css/admin.less
 2013-08-30 15:50:40 +02:00