Commit graph

40 commits

Author SHA1 Message Date
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 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 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 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 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
jacek 94ae246c4e check for empty node 2015-05-06 17:55:11 +02:00
Rafal Leszczynski e6113be4f2 Merge pull request #7116 from Wikia/DAT-2763
error handling
2015-05-06 17:42:59 +02:00
Rafal Leszczynski 24ebb53176 Merge branch 'dev' into DAT-2763 2015-05-06 17:12:00 +02:00
Adam Robak a420b6f1e2 clean up 2015-05-06 17:05:42 +02:00
Adam Robak 17abbcc5ee do only internal parsing 2015-05-06 17:04:37 +02:00
Rafal Leszczynski eca796b4ce add todo comment for image render logic 2015-05-06 16:31:57 +02:00
Rafal Leszczynski fc1db8f15a call proper vignette scaling method 2015-05-06 16:21:11 +02:00
Rafal Leszczynski 7b852d80b4 add missing thumbnail width cont 2015-05-06 16:16:16 +02:00
Rafal Leszczynski 440b1e934b overwrite isEmpty method for image node to check for url instead of value 2015-05-06 16:11:04 +02:00
Rafal Leszczynski 7221cfacb9 add thumbnail url to image data 2015-05-06 16:02:44 +02:00
Rafal Leszczynski e1e25d77bb change naming in image data model 2015-05-06 16:02:28 +02:00
Rafal Leszczynski 3109e908b9 Merge branch 'portable_infobox_mvp' into DAT-2746 2015-05-06 15:10:08 +02:00
Rafal Leszczynski f6e2f258ec Merge branch 'dev' into portable_infobox_mvp 2015-05-06 14:44:58 +02:00
jacek 3b6da2a69a error handling 2015-05-06 13:16:55 +02:00
Rafal Leszczynski b1f2cabf03 add image name to image data model 2015-05-05 12:37:47 +02:00
Sebastian Marzjan 958e073d8a Merge pull request #7103 from Wikia/DAT-2760
DAT-2760 Backwards compatibility in <image> tag for portable infoboxes
2015-05-05 12:25:37 +02:00
marzjan fe390a9f53 DAT-2760 Implement cases for backwards compatibility of infobox markup (image tag) 2015-05-05 07:32:16 +00:00
marzjan 6914257db9 DAT-2760 Initial commit; Streamline files; Add first test 2015-05-04 14:43:53 +00:00
Rafal Leszczynski c56d3ebdaf add additional renderService tests 2015-05-04 16:30:40 +02:00
jacek 99ca2eb705 footer 2015-05-04 16:16:35 +02:00
jacek 32545e8f66 Merge branch 'portable_infobox_mvp' into DAT-2757
# Conflicts:
#	extensions/wikia/PortableInfobox/tests/ParserNodesTest.php
2015-05-04 14:36:37 +02:00
jacek 0017428e6b dont use value tag in header 2015-05-04 13:57:10 +02:00
marzjan 4de71fec0f DAT-2757 Based on initial feedback, rename <pair> to <data> 2015-05-04 10:48:57 +00:00
Sebastian Marzjan d8eb7391d3 Portable Infoboxes - initial release behind WF flag 2015-04-28 09:00:26 +02:00