Commit graph

140 commits

Author SHA1 Message Date
jacek bb3814d318 encode output for use inside JSON format 2015-05-12 12:29:26 +02:00
Adam Robak a7542484ed Merge pull request #7162 from Wikia/portable-infobox-inner-xml
Portable infobox inner xml
2015-05-12 08:15:37 +02:00
Rafal Leszczynski 95c9027f02 fix image template 2015-05-11 17:56:11 +02:00
Rafal Leszczynski 6b9d0ab239 fix indentation 2015-05-11 17:28:43 +02:00
Rafal Leszczynski f4f42d4147 remove var_dump from tests 2015-05-11 17:25:09 +02:00
Rafal Leszczynski 95107e7244 Merge branch 'portable_infobox_mvp' into DAT-2770 2015-05-11 17:24:19 +02:00
jacek 3780dafc8c mod template 2015-05-11 17:12:02 +02:00
Rafal Leszczynski e7fdcbc778 fix issues with image name being passed to template 2015-05-11 17:07:07 +02:00
jacek 0de4edcd04 remove check 2015-05-11 16:19:36 +02:00
jacek f32f24689a add hook to node image 2015-05-11 14:36:23 +02:00
Rafal Leszczynski 8c25f370db move image name sanitizing to getData method 2015-05-11 13:56:18 +02:00
marzjan 501ab60b1c DAT-2760 Add test, address CR remarks 2015-05-11 08:44:24 +00:00
marzjan a12689378d DAT-2760 Support images in diffent formats
* replace variables in image tag
* remove obsolete test
2015-05-08 15:59:00 +00:00
jacek 2ea8598165 innerXML different method 2015-05-08 17:23:25 +02:00
jacek 2a9d0193ea getinnerXML 2015-05-08 16:56:44 +02:00
Jacek Jursza 748518f8a1 Merge pull request #7157 from Wikia/portable_infoboxes_xml_parse_error
xml markup parse error handling
2015-05-08 14:33:06 +02:00
jacek 909d701327 fix tests 2015-05-08 14:28:56 +02:00
jacek 7cb5b79811 reverse if 2015-05-08 14:10:25 +02:00
jacek fe75d4fd69 throw error 2015-05-08 14:04:18 +02:00
jacek a563c0144f xml markup parse error handling 2015-05-08 13:51:31 +02:00
Adam Robak 721f474381 marker number name changed 2015-05-08 11:57:08 +02:00
Adam Robak 4be7113588 unit test changes to match marker introduction 2015-05-08 11:54:31 +02:00
Adam Robak df4d460202 render infobox as marker 2015-05-08 11:48:23 +02:00
Rafal Leszczynski e97750a3bc add different size of thumbnail for mobile 2015-05-07 17:16:07 +02:00
Rafal Leszczynski e41f6af21e remove unneeded new line 2015-05-07 17:15:47 +02:00
jacek fe837daac5 tests 2015-05-07 15:52:29 +02:00
jacek bdd107445b Merge branch 'portable_infobox_mvp' into DAT-2762
# Conflicts:
#	extensions/wikia/PortableInfobox/tests/XmlParserTest.php
2015-05-07 15:29:44 +02:00
jacek 5126ac630d remove isempty checks in render service 2015-05-07 15:25:26 +02:00
Adam Robak f60278a8e3 switch to recursive parsing for all elements 2015-05-07 15:19:46 +02:00
jacek a55b473ccb Merge branch 'portable_infobox_mvp' into DAT-2762 2015-05-07 15:12:27 +02:00
jacek e608c3d877 Merge branch 'portable_infobox_mvp' into DAT-2762
# Conflicts:
#	extensions/wikia/PortableInfobox/tests/XmlParserTest.php
2015-05-07 15:10:56 +02:00
Adam Robak 21b2c0fb9b fix missing url 2015-05-07 15:09:24 +02:00
Jacek Jursza 61f7c1705f Merge pull request #7138 from Wikia/DAT-2769
tests
2015-05-07 15:02:44 +02:00
jacek 0a5908775c typo fix 2015-05-07 15:01:48 +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
Adam Robak d14e824151 Merge branch 'portable_infobox_mvp' into DAT-2745
Conflicts:
	extensions/wikia/PortableInfobox/services/Parser/Nodes/NodeImage.php
2015-05-07 14:54:23 +02:00
Adam Robak e98d9f372a fix formatting 2015-05-07 14:46:17 +02:00
Adam Robak 782847bc31 removed unused code 2015-05-07 14:38:31 +02:00
Adam Robak 242bada43d external parser approach changed, tests fixed, refactoring 2015-05-07 14:37:13 +02:00
jacek a65ff09246 tests 2015-05-07 14:36:30 +02:00
Adam Robak 9cd65fa63c remove duplicated test, added TODO comment for resources loading 2015-05-07 13:58:21 +02:00
Adam Robak ce1b842110 methods docs added 2015-05-07 13:54:26 +02:00
Adam Robak de8533e1c5 wikitext parsing approach changed 2015-05-07 13:48:57 +02:00
jacek 2e25be4150 comments 2015-05-07 11:48:43 +02:00
jacek a55a6a879e fix xml parser tests 2015-05-07 11:46:41 +02:00
Adam Robak b1e0d76a5d change markertype to general 2015-05-07 10:51:03 +02:00
Adam Robak f2638e8afd add unittest for P wrapping check 2015-05-07 10:00:18 +02:00
Adam Robak ff6c367bc7 remove not needed hooks 2015-05-07 09:11:05 +02:00
jacek 42a333565c Merge branch 'portable_infobox_mvp' into DAT-2762 2015-05-06 18:24:28 +02:00
Jacek Jursza ce06f16252 Merge pull request #7123 from Wikia/DAT-2746
Dat 2746 - add lightbox support for infobox images and move thumbnail creation to php
2015-05-06 18:17:21 +02:00