touffies
8ace57200c
Error placeholder contact email
2013-11-06 09:59:14 +01:00
touffies
bbcda888cf
Merge branch 'master' into frontend
...
Conflicts:
templates/default/I18n/fr_FR.php
2013-11-06 09:58:34 +01:00
Manuel Raynaud
1ccd2e63ce
Merge branch 'master' of github.com:thelia/thelia
2013-11-06 09:30:17 +01:00
Manuel Raynaud
7fdcce3c92
fix typo
2013-11-06 09:30:00 +01:00
touffies
5bf9050a12
Delete address with ajax callback function address.delete()
2013-11-05 17:33:55 +01:00
touffies
1426984f55
Use attribute data-confirm
2013-11-05 16:39:52 +01:00
touffies
e13c5dc3d5
Change position of the "Add new address" button
2013-11-05 16:38:36 +01:00
touffies
c0981671bf
Remove js-update-quantity class
2013-11-05 16:37:35 +01:00
Manuel Raynaud
833472e6eb
complete french translation
2013-11-05 15:59:14 +01:00
touffies
2b4924bc55
Add Placeholder
2013-11-05 15:50:25 +01:00
touffies
aa030f20ea
Review html for the forms
...
- Remove icon error from html (Added with css)
- Add maxlenght
- Remove class has-success
- Translate placeholder
- Confirm dialog to delete an address
2013-11-05 15:49:55 +01:00
touffies
fc49ff2e0a
Missing security (Customer should be logged in to access these pages)
2013-11-05 10:23:08 +01:00
touffies
45e84f22e9
Change icon between mobile and home phone number
2013-11-05 09:53:51 +01:00
touffies
e19b2e59bc
Integration page 404
...
- New less file
- Remove Upsell product
2013-11-05 09:42:58 +01:00
touffies
5d8672c9e7
Upsell Product: hide button
2013-11-05 09:30:22 +01:00
touffies
23cd90b63f
Platform was misspelled
2013-11-04 16:39:29 +01:00
touffies
65a8953143
Profile and Useful was misspelled
...
Add missing language key into the dictionary
2013-11-04 16:35:01 +01:00
Etienne Roudeix
06ee460e8a
Merge branch 'master' of github.com:thelia/thelia
2013-11-04 16:16:21 +01:00
Etienne Roudeix
969c077f81
admin home stats and information
2013-11-04 16:15:48 +01:00
touffies
2e21713d40
Merge branch 'master' into frontend
2013-11-04 10:10:22 +01:00
Franck Allimant
f3cba323c6
Changed 'template' loop into 'product-template' loop
2013-11-02 19:18:19 +01:00
Franck Allimant
2aefb87db7
Finished log configuration. All loggers are currentrly working
2013-11-01 16:15:19 +01:00
Manuel Raynaud
c1cfc086a1
Merge branch 'master' of github.com:thelia/thelia
2013-10-31 16:52:21 +01:00
Etienne Roudeix
1bcec28841
remove tax js in profiles
2013-10-31 16:24:57 +01:00
Etienne Roudeix
26c7acbeaa
admoin home stats navigation
2013-10-31 16:09:31 +01:00
Etienne Roudeix
95be087b90
review jqplot
2013-10-31 16:09:31 +01:00
Etienne Roudeix
689de106c7
admin home stats
2013-10-31 16:09:31 +01:00
Etienne Roudeix
bc454124f3
admin home stats
2013-10-31 16:09:31 +01:00
Manuel Raynaud
99dc559484
update translation files for admin part
2013-10-31 16:08:54 +01:00
Manuel Raynaud
5110abe207
create translation files for admin part
2013-10-31 15:46:36 +01:00
Manuel Raynaud
bbae85156b
create translation files
2013-10-31 15:44:07 +01:00
Etienne Roudeix
899a154350
Merge branch 'master' of github.com:thelia/thelia
2013-10-31 15:33:30 +01:00
Franck Allimant
3b9f94cec8
Using now templates instead of hard code in AdminUtilities smarty plugin
2013-10-31 12:16:14 +01:00
Etienne Roudeix
07c5dd4a51
admoin home stats navigation
2013-10-31 11:59:25 +01:00
Franck Allimant
a295fee0d3
Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module
2013-10-31 11:36:56 +01:00
Etienne Roudeix
00dab8e7ec
review jqplot
2013-10-31 11:20:51 +01:00
Etienne Roudeix
e5f5570d2b
Merge branch 'master' of github.com:thelia/thelia
2013-10-31 11:20:42 +01:00
Franck Allimant
a06d83bfb4
Fixed exception if module content is empty
2013-10-30 20:10:37 +01:00
Franck Allimant
d1c54ea62a
Merge branch 'catalog'
...
Conflicts:
core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
2013-10-30 19:55:10 +01:00
Franck Allimant
f5828dc18b
added timestamp parameter to format_date sparty plugin
2013-10-30 19:52:47 +01:00
Franck Allimant
3019d36356
Minor adjustements
2013-10-30 17:31:02 +01:00
Etienne Roudeix
f90df03f7d
admin home stats
2013-10-30 17:00:38 +01:00
Franck Allimant
c7835758e5
Minor css tuning, renamed "details" tab of categories edition to
...
associaitons
2013-10-30 16:32:36 +01:00
Etienne Roudeix
083dde5e93
admin home stats
2013-10-30 16:32:24 +01:00
Franck Allimant
9f11f475ee
Typo
2013-10-30 15:47:21 +01:00
Franck Allimant
a11a013eb0
Merge branch 'master' of https://github.com/thelia/thelia
2013-10-30 15:44:57 +01:00
Franck Allimant
0cabe7b9e8
Combination creation management
2013-10-30 15:44:32 +01:00
Etienne Roudeix
a540c50395
fix administrators management bug
2013-10-30 14:51:13 +01:00
Etienne Roudeix
457c0460cf
Merge branch 'master' of github.com:thelia/thelia
2013-10-30 12:28:30 +01:00
Manuel Raynaud
b8dad621fd
remove temporary home carousel
2013-10-30 12:19:14 +01:00
