Commit graph

56 commits

Author SHA1 Message Date
Rafal Leszczynski 9ecc835603 Merge branch 'dev' into DAT-3003-cleanup-feature-branch 2015-07-29 15:04:51 +02:00
Rafal Leszczynski c92bce20cd finish test refactoring 2015-07-29 10:58:39 +02:00
Rafal Leszczynski a32bb6831c change the template and styling for horizontal groups 2015-07-28 11:46:41 +02:00
Rafal Leszczynski bc22980d2a Merge branch 'dev' into DAT-3025 2015-07-27 11:39:40 +02:00
Rafal Leszczynski c3d81dd456 add tests for rendering video thumbnail 2015-07-22 12:11:19 +02:00
Rafal Leszczynski f57ab7c737 modify image template for video support 2015-07-21 16:30:05 +02:00
dianafa 2e0e607b73 merge with dev 2015-07-16 13:06:17 +02:00
Diana 238a28a071 mock methods 2015-07-09 13:50:12 +00:00
dianafa af231a3226 refactor 2015-07-08 18:31:56 +02:00
dianafa e2aeb56cff add width and height attrs 2015-07-07 16:28:53 +02:00
dianafa bf790b3322 Merge branch 'dev' into DAT-2909 2015-07-06 18:46:02 +02:00
Sebastian Marzjan 86bfcc7592 Cherry-picking 9eb06cc 2015-07-03 12:16:18 +02:00
idradm e065533850 Merge remote-tracking branch 'origin/dev' into DAT-2909
# Conflicts:
#	extensions/wikia/GameGuides/assets/GameGuidesAssets.json
#	extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
2015-07-03 10:51:32 +02:00
idradm edda7bebbd DAT-2940 rename css selectors 2015-07-02 10:22:37 +02:00
idradm 26269c9150 DAT-2940 rename footer tag to navigation 2015-07-01 16:19:31 +02:00
Rafal Leszczynski 08bf993708 add infobox hero mobile template 2015-07-01 15:17:43 +02:00
idradm 3e8a665242 Merge remote-tracking branch 'origin/dev' into DAT-2839
# Conflicts:
#	extensions/wikia/PortableInfobox/PortableInfobox.setup.php
#	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
#	extensions/wikia/PortableInfobox/services/Parser/XmlParser.php
#	extensions/wikia/PortableInfobox/styles/PortableInfobox.scss
2015-06-19 14:43:40 +02:00
Rafal Leszczynski f569991469 Merge pull request #7488 from Wikia/DAT-2857
DAT-2857 Horizontal group
2015-06-12 15:23:44 +02:00
Diana ef4488bd4a add horizontal group styling 2015-06-10 17:13:45 +00:00
dianafa 76b4b3fbb7 change theme to layout 2015-06-10 17:24:49 +02:00
Rafal Leszczynski 18ca190c0d style infobox markup errors 2015-06-10 17:16:46 +02:00
dianafa 6e8518637c working class assigment 2015-06-09 13:37:03 +02:00
Diana a38d25d0e3 styling 2015-06-03 15:12:43 +00:00
Diana 7342ffbeb0 add tests and functionality 2015-06-03 13:48:44 +00:00
jacek a9c01baed5 hide debug content for articles 2015-06-02 13:09:25 +02:00
jacek e2025721fd translations 2015-06-01 14:11:07 +02:00
jacek 44cbb9cc95 initial commit 2015-05-29 16:37:35 +02:00
grunny d8349fbc0c (MAIN-4620) Sanitize custom theme class in PortableInfobox
Sanitize the custom theme class users can provide in Portable Infoboxes.
Sanitizer::escapeClass only allows valid characters in a class name
through.
2015-05-25 23:48:22 +00:00
Adam Robak 746a010e2c DAT-2811 make theme class appear only when set, theme class will be prefixed instead of suffixed 2015-05-25 23:34:51 +00:00
Rafal Leszczynski 0ad49267af styling image captions inside infobox 2015-05-25 23:34:49 +00:00
Adam Robak 644b5e22e2 DAT-2812 add custom theming 2015-05-25 23:32:27 +00:00
Rafal Leszczynski 9aeef8670e add caption to image template 2015-05-25 23:32:25 +00:00
grunny 9567ba1a5d (MAIN-4620) Sanitize custom theme class in PortableInfobox
Sanitize the custom theme class users can provide in Portable Infoboxes.
Sanitizer::escapeClass only allows valid characters in a class name
through.
2015-05-26 02:01:00 +10:00
Rafal Leszczynski af79107afd Merge branch 'dev' into DAT-2812 2015-05-22 16:32:02 +02:00
Rafal Leszczynski 8c0edf4b16 Merge pull request #7253 from Wikia/DAT-2811
DAT-2812 add custom theming
2015-05-22 12:31:31 +02:00
Rafal Leszczynski abb9f4499a prevent image upsampling in infobox 2015-05-21 12:07:40 +02:00
Adam Robak ccd32f1b76 DAT-2811 make theme class appear only when set, theme class will be prefixed instead of suffixed 2015-05-20 13:56:24 +02:00
Rafal Leszczynski 4cc5ea1446 styling image captions inside infobox 2015-05-19 17:31:09 +02:00
Adam Robak 77679f2b9f DAT-2812 add custom theming 2015-05-19 17:20:15 +02:00
Rafal Leszczynski 6e7b050b37 add caption to image template 2015-05-19 16:59:41 +02:00
Rafal Leszczynski 7331f2640f add mobile image template 2015-05-12 13:32:42 +02:00
Rafal Leszczynski 95c9027f02 fix image template 2015-05-11 17:56:11 +02:00
jacek 3780dafc8c mod template 2015-05-11 17:12:02 +02:00
jacek 0de4edcd04 remove check 2015-05-11 16:19:36 +02:00
Rafal Leszczynski e41f6af21e remove unneeded new line 2015-05-07 17:15:47 +02:00
Adam Robak 8a080d1a15 Merge branch 'portable_infobox_mvp' into DAT-2738
Conflicts:
	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
2015-05-07 14:58:52 +02:00
Rafal Leszczynski f6a05dbfdf modify image templete to use new image data 2015-05-06 16:03:07 +02:00
Rafal Leszczynski 3109e908b9 Merge branch 'portable_infobox_mvp' into DAT-2746 2015-05-06 15:10:08 +02:00
Adam Robak afda182794 DAT-2738 introduce aside tag into parser and infobox extension 2015-05-06 14:49:46 +02:00
Rafal Leszczynski f6e2f258ec Merge branch 'dev' into portable_infobox_mvp 2015-05-06 14:44:58 +02:00