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

805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
gmorel
89edb958e5 WIP 
- Coupon create
 2013-09-03 14:04:05 +02:00
gmorel
2b337229b8 Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'coupon' of https://github.com/thelia/thelia:
  Max usage field and Is enabled field updates
  Max usage gestion
 2013-09-03 12:33:51 +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
69f88db090 en_EN -> en_UK, the "en_EN" locale does not exists. 2013-09-03 11:32:13 +02:00
franck
55bf4868d9 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-03 11:26:49 +02:00
franck
e4c23adba6 Smarty inheritance in admin template. 2013-09-03 11:26:03 +02:00
gmorel
4088b2ef03 WIP 
- Coupon create
 2013-09-03 11:20:20 +02:00
gmorel
56ccc2c06d Merge branch 'coupon' of https://github.com/thelia/thelia into coupon 
# By mespeche
# Via mespeche
* 'coupon' of https://github.com/thelia/thelia:
  Working
  Working
  WIP
  WIP
  Working
  Working
  Working
  WIP
  WIP
  Working
  WIP
  WIP
  Working
 2013-09-03 11:10:46 +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
19ea6d25df WIP 
Merge on master
 2013-09-03 11:02:36 +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
Manuel Raynaud
dce816d77c fix typo in phpdoc 2013-09-03 09:22:12 +02:00
Manuel Raynaud
29dc067076 complete test for foramt_number smarty function 2013-09-03 09:06:02 +02:00
Manuel Raynaud
1f50158398 test foramt_date without datetime object 2013-09-03 08:43:00 +02:00
Manuel Raynaud
7718c90e60 create foramt_number smarty function 2013-09-03 08:34:46 +02:00
Manuel Raynaud
cf53e45ef0 remove sqlmap file 2013-09-03 07:57:14 +02:00
Manuel Raynaud
0d261373f8 add some phpdoc 2013-09-03 00:05:37 +02:00
Manuel Raynaud
92b64db156 complete test for format_date smarty function 2013-09-02 23:51:51 +02:00
Manuel Raynaud
eeea885543 create new smarty function for displaying date in expected format 2013-09-02 23:36:34 +02:00
gmorel
6383de251e Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By franck
# Via franck
* 'master' of https://github.com/thelia/thelia:
  Added missing CategoryEvent class
 2013-09-02 17:34:24 +02:00
franck
5568f2dc62 Added missing CategoryEvent class 2013-09-02 17:34:11 +02:00
gmorel
4a62419bf6 Working 
- fix composer.json
 2013-09-02 17:30:48 +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
451dc93eb3 Working 
- Fully automatic reset script
 2013-09-02 17:09:14 +02:00
gmorel
4b1de5fe93 WIP 
- Coupon Controller
 2013-09-02 17:08:47 +02:00
gmorel
ae0f2e766b Working 
- merge schema
 2013-09-02 17:08:01 +02:00
gmorel
c3650b4482 WIP 
Coupon Loop
 2013-09-02 17:07:25 +02:00
gmorel
273e6144aa Working 
- Add parameters to command
 2013-09-02 16:57:34 +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
Manuel Raynaud
fd80139a9c change symfony/icu version for compatibility 2013-09-02 15:25:01 +02:00
mespeche
f48de82e96 WIP 
Filters input on tablesorter tables
 2013-09-02 15:10:07 +02:00
Manuel Raynaud
58484b6c80 add file reset_install.sh 2013-09-02 13:20:26 +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
gmorel
eef57ba30a WIP 
- Coupon controller
 2013-09-02 09:17:47 +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
928bf7b638 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-02 00:18:29 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +02:00
Manuel Raynaud
932bf00532 update propel version and dependencies 2013-09-01 19:26:13 +02:00