Merge branch 'master' into loops

Browse Source

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php

...

This commit is contained in:

Etienne Roudeix

2013-08-21 09:19:56 +02:00

parent 6a14bef3de a0b82879f5

commit 86b11096ba

3275 changed files with 929970 additions and 274940 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css vendored Normal file → Executable file

0

templates/admin/default/assets/bootstrap-editable/img/clear.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 509 B After Width:  |  Height:  |  Size: 509 B

0

templates/admin/default/assets/bootstrap-editable/img/loading.gif Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.8 KiB

0

templates/admin/default/assets/bootstrap-editable/js/bootstrap-editable.js vendored Normal file → Executable file

0

templates/admin/default/assets/bootstrap-editable/js/bootstrap-editable.min.js vendored Normal file → Executable file

0

templates/admin/default/assets/css/img/logout.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 3.6 KiB

0

templates/admin/default/assets/css/img/search-icon.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

templates/admin/default/assets/css/img/search.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 3.8 KiB

0

templates/admin/default/assets/css/img/title-header.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

0

templates/admin/default/assets/css/img/top-bar-logo.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.6 KiB After Width:  |  Height:  |  Size: 5.6 KiB

0

templates/admin/default/assets/css/img/top.jpg Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 13 KiB

0

templates/admin/default/assets/img/flags/en.gif Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

templates/admin/default/assets/img/flags/es.gif Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

templates/admin/default/assets/img/flags/fr.gif Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

templates/admin/default/assets/img/flags/it.gif Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB