Commit graph

61 commits

Author SHA1 Message Date
Diana 72c1fd06ab refactoring 2015-05-22 16:25:21 +00:00
dianafa 4525aea3e5 suppord old img provider 2015-05-22 17:27:20 +02:00
Rodrigo Molinero Gomez 3625507785 Merge pull request #7282 from Wikia/DAT-2829
DAT-2829 Don't treat '0' as an empty value in footer
2015-05-21 14:26:20 +02:00
Rodrigo Molinero Gomez 82d031987a Merge pull request #7261 from Wikia/DAT-2796
DAT-2796 tests for isEmpty()
2015-05-20 17:26:08 +02:00
Diana 3a706ef159 do not treat 0 as empty footer 2015-05-20 14:57:43 +00:00
Rodrigo Molinero Gomez 2f4aa330ed Merge pull request #7231 from Wikia/DAT-2797
handle warnings and log them
2015-05-20 16:21:27 +02:00
jacek 643ac321a2 change function from public to protected 2015-05-20 12:14:48 +02:00
jacek 1215be5e41 formatting 2015-05-20 10:39:31 +02:00
Garth Webb e4afb0c697 SOC-808 Merge part 1 of 2 2015-05-19 11:20:44 -07:00
Diana 1052ed0a2e test isEmpty() 2015-05-19 18:14:39 +00:00
jacek 4eaf7be472 extract logging to external function 2015-05-19 16:01:53 +02:00
jacek 6ab700c853 extract logging to external function 2015-05-19 12:49:35 +02:00
jacek 45918aafc3 logging change 2015-05-18 17:08:53 +02:00
Diana 31e6014faa treat '0' like a non-empty string 2015-05-18 13:54:25 +00:00
jacek 808026dae1 cr 2015-05-18 15:36:04 +02:00
jacek 7ad0c01c19 handle warnings and log them 2015-05-18 14:51:55 +02:00
Sebastian Marzjan 69b9abc0af DAT-2785 and DAT-2784 - Handle InnerXML properly
Remove obsolete test
2015-05-13 13:52:31 +02:00
Jacek Jursza 6fefa10110 Merge pull request #7145 from Wikia/DAT-2770
Dat 2770 - add different thumbnail size for infobox images on mobile
2015-05-12 13:44:58 +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 6b9d0ab239 fix indentation 2015-05-11 17:28:43 +02:00
Rafal Leszczynski 95107e7244 Merge branch 'portable_infobox_mvp' into DAT-2770 2015-05-11 17:24:19 +02:00
Rafal Leszczynski e7fdcbc778 fix issues with image name being passed to template 2015-05-11 17:07:07 +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 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
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
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
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
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
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 440b1e934b overwrite isEmpty method for image node to check for url instead of value 2015-05-06 16:11:04 +02:00
Rafal Leszczynski e1e25d77bb change naming in image data model 2015-05-06 16:02:28 +02:00