Franck Allimant
ead038723f
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Core/Template/Loop/Template.php
2013-11-06 11:16:27 +01:00
Franck Allimant
361e4a9d74
Implementing translations (still in progress)
2013-11-06 10:49:03 +01:00
Manuel Raynaud
9685fa95dc
Merge pull request #94 from thelia/frontend
...
Frontend
2013-11-06 01:41:27 -08:00
Etienne Roudeix
0c687408e4
Merge branch 'master' of github.com:thelia/thelia
2013-11-06 10:28:56 +01:00
Etienne Roudeix
b9babff070
comment
2013-11-06 10:28:29 +01:00
Etienne Roudeix
488ee3e8f4
lil loop refactor
2013-11-06 10:26:29 +01:00
touffies
4c844133fe
Missing single quote for the french translation
2013-11-06 10:25:30 +01:00
touffies
9f26cc3b58
Translation of the remove link
2013-11-06 10:14:28 +01:00
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
0431010a65
Missing class Translator
2013-11-05 15:46:38 +01:00
touffies
542a8c5d20
Allow to update the label address
2013-11-05 14:59:15 +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
Manuel Raynaud
7ca625073d
Merge pull request #93 from superboum/master
...
Correcting some typos
2013-11-04 09:20:06 -08:00
Quentin Dufour
3e1a08dc6c
Correcting some typos
2013-11-04 17:37:23 +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
Manuel Raynaud
e14ce75737
remove documentation, move to dedicated documentation repo
2013-11-04 15:38:02 +01:00
Manuel Raynaud
6d1576faf8
test if request is an active scope in tra nslator
2013-11-04 14:47:18 +01:00
Manuel Raynaud
3e681a7419
fix issue on command line when thelia is still not installed
2013-11-04 12:13:26 +01:00
touffies
2e21713d40
Merge branch 'master' into frontend
2013-11-04 10:10:22 +01:00
Manuel Raynaud
b65044c1be
Merge branch 'master' of github.com:thelia/thelia
2013-11-04 09:28:36 +01:00
Manuel Raynaud
d7012af3e2
add translation files for thelia core system
2013-11-04 09:28:12 +01:00
Franck Allimant
f3cba323c6
Changed 'template' loop into 'product-template' loop
2013-11-02 19:18:19 +01:00
Franck Allimant
069b047801
Added size limitation to the Thelia log file
2013-11-01 16:45:25 +01:00
Franck Allimant
2aefb87db7
Finished log configuration. All loggers are currentrly working
2013-11-01 16:15:19 +01:00
Franck Allimant
1dc6aa52cb
Merge branch 'master' of https://github.com/thelia/thelia
2013-10-31 16:55:30 +01:00
Manuel Raynaud
c1cfc086a1
Merge branch 'master' of github.com:thelia/thelia
2013-10-31 16:52:21 +01:00
Franck Allimant
3368590a86
Merge branch 'master' of https://github.com/thelia/thelia
2013-10-31 16:46:20 +01:00
Franck Allimant
a0855cda4c
Added System Log configuration routes
2013-10-31 16:46:04 +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
