1.
rTADV16099
Actions

Description

Merge of "themes/advanced/releases/1.2.1@16063" to "themes/advanced/branches/1.3.x@15978".

Details

Committed

alex	Dec 7 2014, 3:46 AM

Parents

rTADV16083: Bug INP-1388 - Make CKEditor stylesheet within theme editable

Branches

Unknown

Tags

Unknown

Event Timeline

alex committed rTADV16099: Merge of "themes/advanced/releases/1.2.1@16063" to "themes/advanced/branches/1..Dec 7 2014, 3:46 AM

Changes (38)

		Path
M	(dir)	themes/advanced/branches/1.3.x/
M		themes/advanced/branches/1.3.x/in-bulletin/elements/topics.elm.tpl
M		themes/advanced/branches/1.3.x/in-bulletin/inc/styles.css
M		themes/advanced/branches/1.3.x/in-commerce/elements/order_preview.elm.tpl
M		themes/advanced/branches/1.3.x/in-commerce/inc/styles.css
M		themes/advanced/branches/1.3.x/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl
M		themes/advanced/branches/1.3.x/in-commerce/products/search_results.tpl
M		themes/advanced/branches/1.3.x/in-link/links/search_results.tpl
M		themes/advanced/branches/1.3.x/in-news/articles/search_results.tpl
M		themes/advanced/branches/1.3.x/platform/elements/forms.elm.tpl
P		themes/advanced/branches/1.3.x/platform/img/file_icons/ai.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/ai.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/bmp.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/bmp.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/cs.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/cs.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/default.icon.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/default.icon.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/dll.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/dll.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/exe.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/exe.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/fla.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/fla.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/gif.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/gif.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/htm.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/htm.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/html.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/html.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/jpg.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/jpg.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/js.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/js.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/mdb.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/mdb.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/png.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/png.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/rdp.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/rdp.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/swf.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/swf.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/swt.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/swt.gif
P		themes/advanced/branches/1.3.x/platform/img/file_icons/vsd.gif Copied from themes/advanced/branches/1.2.x/platform/img/file_icons/vsd.gif
P		themes/advanced/branches/1.3.x/platform/img/progress_done.gif Copied from themes/advanced/branches/1.2.x/platform/img/progress_done.gif
P		themes/advanced/branches/1.3.x/platform/img/progress_left.gif Copied from themes/advanced/branches/1.2.x/platform/img/progress_left.gif
P		themes/advanced/branches/1.3.x/platform/img/upload.png Copied from themes/advanced/branches/1.2.x/platform/img/upload.png
M		themes/advanced/branches/1.3.x/platform/inc/script.js
M		themes/advanced/branches/1.3.x/platform/inc/styles.css
P		themes/advanced/branches/1.3.x/platform/inc/swfobject.js Copied from themes/advanced/branches/1.2.x/platform/inc/swfobject.js
P		themes/advanced/branches/1.3.x/platform/inc/swfupload.swf Copied from themes/advanced/branches/1.2.x/platform/inc/swfupload.swf
P	(dir)	themes/advanced/branches/1.3.x/platform/inc/uploader/ Copied from themes/advanced/branches/1.2.x/platform/inc/uploader
P		themes/advanced/branches/1.3.x/platform/inc/uploader/upload_manager.js Copied from themes/advanced/branches/1.2.x/platform/inc/uploader/upload_manager.js
P		themes/advanced/branches/1.3.x/platform/inc/uploader/uploader.js Copied from themes/advanced/branches/1.2.x/platform/inc/uploader/uploader.js