TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,580 Commits 1 Branch 0 Tags
23a74999e80d2a306562d04286c2a9e29e91f55d
Commit Graph

3580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Franck Allimant
23a74999e8 Fixed date manipulation² 2014-05-02 18:24:15 +02:00
Franck Allimant
5e3585766d Added a localized check to the expiration date 2014-05-02 18:23:36 +02:00
Franck Allimant
3b7589ec84 Removed useless transactions 2014-05-02 18:23:04 +02:00
Franck Allimant
7996c866d3 Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons 
Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	templates/backOffice/default/coupon/form.html
 2014-05-02 17:16:39 +02:00
Franck Allimant
9d3dd8687a Added the transformer 2014-05-02 17:10:28 +02:00
Franck Allimant
989a44591f Added date translator 2014-05-02 17:10:27 +02:00
Franck Allimant
8ce6cdbae0 Fixed date input format and conversion 2014-05-02 17:10:27 +02:00
Franck Allimant
2647c62838 Added standard toolbar in creation mode 2014-05-02 17:10:26 +02:00
Franck Allimant
c457140dea Added hide_save_buttons and hide_save_and_close_button parameters 2014-05-02 17:10:25 +02:00
Franck Allimant
aa48a73343 Removed the useless coupon read function 2014-05-02 17:10:25 +02:00
Franck Allimant
d24d3c71bd Adding some padding to error texts 2014-05-02 17:10:24 +02:00
Franck Allimant
d0528a91d2 Coupons conditions HTML fragments 2014-05-02 17:10:23 +02:00
Franck Allimant
6b020fda13 Fixed labels, using templates for HTML fragments 2014-05-02 17:10:22 +02:00
Franck Allimant
bbe7634ad4 Using templates for conditions HTML fragments 2014-05-02 17:10:22 +02:00
Franck Allimant
d8c100373b Using template for coupons HTML fragments 2014-05-02 17:10:21 +02:00
Franck Allimant
aacdde5024 Added close button 2014-05-02 17:10:20 +02:00
Franck Allimant
70671c6949 Normalized coupon list appearance, added sorting 2014-05-02 17:10:19 +02:00
Franck Allimant
d54dd4d054 Added order parameter, improved request 2014-05-02 17:10:19 +02:00
Franck Allimant
794b160cc8 Removed check of admin.image/document, whis is not managed in the 
back-office
 2014-05-02 17:10:18 +02:00
Franck Allimant
c59b45feef Fixed potiential javascript error 2014-05-02 17:10:17 +02:00
Franck Allimant
7c1c3541b0 Removed the useless coupon read function 2014-05-02 12:24:11 +02:00
Franck Allimant
0c1c08aba0 Adding some padding to error texts 2014-05-02 12:23:40 +02:00
Franck Allimant
6d533149af Coupons conditions HTML fragments 2014-05-02 12:08:22 +02:00
Franck Allimant
b776a36bbd Fixed labels, using templates for HTML fragments 2014-05-02 12:07:17 +02:00
Franck Allimant
5518c6f0bd Using templates for conditions HTML fragments 2014-05-02 12:06:21 +02:00
Franck Allimant
859e9ca60b Using template for coupons HTML fragments 2014-05-02 12:05:32 +02:00
Franck Allimant
be8b4abece Added close button 2014-05-01 19:22:15 +02:00
Franck Allimant
8496685814 Normalized coupon list appearance, added sorting 2014-05-01 19:20:32 +02:00
Franck Allimant
4bcc2f7fa8 Added order parameter, improved request 2014-05-01 19:20:00 +02:00
Manuel Raynaud
fc4f79c014 Merge pull request #367 from lunika/image_removal 
create confirmation message before deleting an image
 2014-04-30 18:24:50 +02:00
Manuel Raynaud
3f254f31a8 create confirmation message before deleting an image 2014-04-30 17:34:04 +02:00
Manuel Raynaud
ba08271519 Merge pull request #366 from lunika/image_upload 
Image upload
 2014-04-30 14:31:24 +02:00
Manuel Raynaud
2ce1c79653 change image translation domain 2014-04-30 14:25:17 +02:00
Manuel Raynaud
171d388c41 change error message on image upload 2014-04-30 14:14:26 +02:00
Manuel Raynaud
fc130f295a Merge pull request #365 from lunika/seo 
Change some behaviors on SEO tab
 2014-04-30 11:52:43 +02:00
Manuel Raynaud
ca2194b7ea rediplay SEO tab after submit. Fix #352 2014-04-30 11:26:23 +02:00
Manuel Raynaud
a30181d09d seo title field is not mandatory anymore 2014-04-30 11:15:01 +02:00
Manuel Raynaud
dc286e3c23 Merge pull request #364 from lunika/content 
create prev next arg for content loop. Fix #361
 2014-04-30 11:03:06 +02:00
Manuel Raynaud
67293555ba refactor content loop splitting parseResults method 2014-04-30 10:57:04 +02:00
Manuel Raynaud
0b36b2222d implement addCriteriaToPositionQuery method in content model. #360 2014-04-30 10:44:34 +02:00
Manuel Raynaud
270b5f6499 filter with contentFolder table for finding next/prev content 2014-04-30 10:32:17 +02:00
Manuel Raynaud
b15d52e6d3 create prev next arg for content loop. Fix #361 2014-04-30 10:22:12 +02:00
Manuel Raynaud
ed1be7019b Merge pull request #357 from bibich/sitemap 
Sitemap functionality
 2014-04-30 09:25:54 +02:00
Franck Allimant
a23116ca61 Removed check of admin.image/document, whis is not managed in the 
back-office
 2014-04-29 19:07:06 +02:00
Julien Chanséaume
5db1cf21ec ajout doc 2014-04-29 17:23:08 +02:00
Julien Chanséaume
d04ca672fb Reimplementing sitemap functionality using Thelia loop 2014-04-29 17:14:44 +02:00
Manuel Raynaud
2aea36ab1e Merge pull request #354 from zzuutt/patch-1 
Update address-update.html
 2014-04-29 16:42:30 +02:00
Manuel Raynaud
a92f7bfa45 Merge pull request #356 from zzuutt/patch-3 
Update address.html
 2014-04-29 16:39:04 +02:00
zzuutt
ee43b71fdc Update address.html 2014-04-29 16:29:20 +02:00
zzuutt
17c367a21e Update address-update.html 2014-04-29 16:25:52 +02:00