Franck Allimant
542c4d1641
Improved the translatable text recognition regex
2013-11-06 22:56:00 +01:00
Franck Allimant
907802b5cb
Merge branch 'master' of https://github.com/thelia/thelia
2013-11-06 20:02:13 +01:00
Franck Allimant
f8f68eb59b
Fixed minor internationalizable string error in admin templates.
2013-11-06 20:01:26 +01:00
Manuel Raynaud
14aa93a32d
Merge branch 'master' of github.com:thelia/thelia
2013-11-06 16:05:57 +01:00
Manuel Raynaud
7c897c758d
fiw method calling default front tempalte
2013-11-06 15:50:37 +01:00
Franck Allimant
8d40605091
Continued on translations
2013-11-06 14:40:33 +01:00
Manuel Raynaud
b1517945f4
Merge branch 'modules'
...
Conflicts:
core/lib/Thelia/Controller/Admin/BaseAdminController.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Thelia.php
2013-11-06 14:37:31 +01:00
Manuel Raynaud
6e5ae0f634
refactor render template process
2013-11-06 13:48:32 +01:00
Franck Allimant
f3b13163f0
Merge branch 'master' of https://github.com/thelia/thelia
2013-11-06 11:16:46 +01:00
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
Manuel Raynaud
2d291cf5a0
refactor how to assign template to parser
2013-11-06 11:12:39 +01:00
Etienne Roudeix
61e34a1383
Merge branch 'master' of github.com:thelia/thelia
2013-11-06 11:07:59 +01:00
Etienne Roudeix
3db7344373
fix tests
2013-11-06 11:07:31 +01:00
Manuel Raynaud
792ad9c646
Merge pull request #95 from thelia/frontend
...
Frontend
2013-11-06 02:03:26 -08:00
touffies
1471a8ed21
Remove duplicate icon error
2013-11-06 10:57:12 +01:00
touffies
3f8a68802b
Add language strings for the toolbar
2013-11-06 10:49:27 +01:00
Franck Allimant
361e4a9d74
Implementing translations (still in progress)
2013-11-06 10:49:03 +01:00
Etienne Roudeix
48502e04e4
phpdoc
2013-11-06 10:42:34 +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
