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
mespeche
5bd501315d
Max usage field and Is enabled field updates
2013-09-03 12:31:57 +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
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
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
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
0d4b992bc6
WIP
...
Réorganisation des scripts
2013-08-30 08:54:03 +02:00
mespeche
ed763344ec
WIP
...
Début de mise en place de coupon/add (coupon/edit)
2013-08-29 17:51:50 +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
gmorel
84a2314108
WIP
...
- Add Coupon BackOffice controller
- Add Coupon BackOffice template skeleton
- Add Coupon BackOffice routes
2013-08-28 18:06:22 +02:00
