Commit graph

156 commits

Author SHA1 Message Date
idradm 47adca6ea1 Restore "Merge pull request #12220 from Wikia/XW-2448"
This reverts commit 50d81602c84b9474e070d6c1a8e2995cd9b8d91b.

# Conflicts:
#	extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
2017-01-25 12:18:20 +01:00
macbre 66c995a659 Revert "Merge pull request #12220 from Wikia/XW-2448"
It causes https://wikia-inc.atlassian.net/browse/SUS-1483

Notice: Array to string conversion in /usr/wikia/source/app/includes/parser/StripState.php on line 98

"Array" string is displayed on blog posts listing.

This reverts commit 37d1519605836c8144ea36c9951577e65ce71d9e, reversing
changes made to 0eb38a5cb2fced6e7f3dd1853150ab950d7dffe8.

Conflicts:
	extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
2017-01-17 12:31:06 +01:00
Mateusz Rybarski d53e54d83e XW-2448: || instead of array_merge 2017-01-13 15:34:02 +01:00
Mateusz Rybarski a28b14ac94 XW-2448: checking if infobox contains tabber or gallery using markers 2017-01-13 15:18:05 +01:00
idradm 76cdfad2ec Merge branch 'dev' into XW-2448 2017-01-13 13:17:05 +01:00
Mateusz Rybarski 1723811417 XW-2448: cleanup 2017-01-13 08:51:14 +01:00
Mateusz Rybarski 182de59c7b XW-2448: using foreach loops 2017-01-12 15:05:11 +01:00
Mateusz Rybarski ce18ff7649 XW-2448: get rid of regexps while processing gallery tag in PI 2017-01-12 14:55:30 +01:00
Mateusz Rybarski 1e39fece7f Merge branch 'dev' into XW-2569 2017-01-11 12:51:13 +01:00
Mateusz Rybarski 43d8db55ab XW-2572: casting row-items and span to ints 2017-01-10 14:28:24 +01:00
Mateusz Rybarski 9ac5d0b17f XW-2572: span and layout attributes for data tag 2017-01-10 13:59:46 +01:00
Mateusz Rybarski 8a081b273e XW-2572: row-items attribute for group node 2017-01-10 13:05:22 +01:00
idradm 8b1289b291 Merge branch 'dev' into XW-2415
# Conflicts:
#	extensions/VisualEditor/wikia/VisualEditor.i18n.php
#	extensions/wikia/PortableInfobox/PortableInfobox.setup.php
#	extensions/wikia/PortableInfobox/tests/PortableInfoboxParserTagControllerTest.php
#	extensions/wikia/PortableInfobox/tests/PortableInfoboxRenderServiceTest.php
2017-01-05 12:37:59 +01:00
idradm 98954ea5b8 reformat file 2017-01-02 10:58:45 +01:00
idradm 5a9663d46a refactor metadata tag 2017-01-02 10:58:02 +01:00
Mateusz Rybarski 52d85ec2a1 XW-2444: reducing number of notices and warnings in tests 2016-12-29 10:16:53 +01:00
idradm 7166ca0470 XW-2415 make sure render data is an array 2016-12-19 15:17:40 +01:00
Igor Rogatty 4705117c83 XW-2415 | test getSourcesMetadata method and fix an issue that was found 2016-12-14 15:46:17 +01:00
Igor Rogatty c599b34595 XW-2415 | simplify logic in getSourcesMetadata() 2016-12-13 17:56:33 +01:00
Igor Rogatty 7ad06f684a XW-2415 | handle images inside groups 2016-12-09 15:56:57 +01:00
Igor Rogatty 5712de9f05 XW-2415 | save infobox metadata, not just labels 2016-12-09 14:01:49 +01:00
Igor Rogatty 3b704769ff XW-2415 | infobox dialog in VE knows the source types 2016-12-07 19:02:00 +01:00
grunny 8186618eb9 (DAT-4494) Fix galleries and tabber in PortableInfoboxes 2016-06-16 16:59:48 +00:00
idradm 9ceba1d2d0 DAT-3942 make sure isVideo param is always set, update tests 2016-04-20 10:38:44 +02:00
Lukasz Konieczny 9f7c54012b CE-3554: Combine two lines to one 2016-04-05 09:58:19 +00:00
Lukasz Konieczny d340841e17 CE-3554: Improve code after CR 2016-04-05 07:27:18 +00:00
Lukasz Konieczny 06fad58042 CE-3554: Support more sources 2016-04-01 12:54:43 +00:00
Lukasz Konieczny 4f11b96e48 CE-3554: Changes after CR 2016-04-01 11:07:30 +00:00
Lukasz Konieczny a773ee1a49 CE-3554: Extract labels from infobox markup and save them in page props 2016-03-31 09:58:34 +00:00
dianafa 6406fb53d5 move helper to an independent place 2016-01-12 10:50:24 +01:00
Sebastian Marzjan 2171b5c02c Merge pull request #9366 from Wikia/DAT-3331
make infoboxes use params same way as mediawiki, enable 0 param
2016-01-05 17:18:33 +01:00
idradm 5f42ce9742 make infoboxes use params same way as mediawiki, enable 0 param 2016-01-04 14:34:10 +01:00
dianafa ed73d4f525 move sanitizing to PortableInfoboxRenderService 2015-12-23 13:20:55 +01:00
dianafa 0de509246f add caption sanitization in getImageData 2015-12-23 11:20:39 +01:00
dianafa 6e8091ec4d move ImageFilenameSanitizer logic to FileNamespaceSanitizeHelper 2015-11-25 11:00:39 +01:00
Inez Korczyński 6b78b8a3ae Merge pull request #8943 from Wikia/PI-Collapsible-Groups
Collapsible Groups for Portable Infoboxes
2015-10-30 10:46:00 -07:00
Inez Korczynski f901a1642e VE-2004: Silencing loadHTML warning
I carefully researched the topic and it seems that there is no way to instruct DOMDocument to accept "lower" quality HTML. Specifically in HTML <div> or <figure> (block elements) are not allowed inside <p> (which accepts only inline elements) - hence it's complaining about.

Based on comments from stackoverflow it seems that such practice (silencing it) is commong practice in this situation.
2015-10-27 20:02:58 +00:00
Inez Korczynski 3d05ec1758 VE-1994: Add appropriately pi-collapse and pi-collapse-[open|closed] CSS classes to PI groups wrappers 2015-10-26 21:59:34 +00:00
Inez Korczynski 2424103f76 VE-2000: Modify regex to match all markers (hexadecimal instead of decimal only) 2015-10-23 21:24:26 +00:00
Inez Korczynski d280c32dfc VE-1990: Added support for video in PIMC 2015-10-22 20:56:32 +00:00
Inez Korczynski b2e7b644f4 VE-1985: Added support for video passed to tabber 2015-10-21 00:48:37 +00:00
Inez Korczynski 394db2a0ba Merge branch 'PI-Media-Collections-MVP' into VE-1982 2015-10-21 00:38:23 +00:00
Inez Korczynski ec856513e8 VE-1982: Removed not needed global 2015-10-21 00:04:29 +00:00
Inez Korczynski 720900abb5 VE-1982: Added missing global 2015-10-21 00:03:06 +00:00
Paul Oslund d097426242 VE-1960: Template for mobile image collections 2015-10-20 23:09:23 +00:00
Inez Korczynski 8fc355ecea VE-1982: Basic unit test coverage for backward compatibility added to <image> 2015-10-20 22:42:36 +00:00
Inez Korczynski c9da5425a7 VE-1979: Added support for <gallery> tag passed to <image> 2015-10-20 01:19:49 +00:00
Inez Korczynski 6c4359a9d4 VE-1975: Added support for mobile (ArticleAsJson) and usage of XML parsing
Special handling for mobile is needed because article for mobile is delivered within ArticleAsJson which makes a lot of transformation during the parsing process (instead of for instance postprocessing).
Parsing HTML with XML parser seems to be giving better results than using just regexes and also it gives as ability to handle nested tabbers in a future in a better way.
2015-10-19 23:56:20 +00:00
Inez Korczynski a692e008b3 VE-1975: Modified NodeImage to return array of images instead of one image
Added support for <tabber>
Hero image still works correct
2015-10-16 01:15:52 +00:00
dianafa 4536458992 move hook to render service 2015-09-28 17:46:40 +02:00