Commit graph

57 commits

Author SHA1 Message Date
idradm 29f713997c DAT-2875 test refactoring 2015-06-11 14:51:54 +02:00
idradm d766b3a003 DAT-2875 source variables name for image node fix, get source for group nodes refactored 2015-06-11 11:48:32 +02:00
idradm ea4aa94511 DAT-2875 nodes refactor 2015-06-11 11:34:28 +02:00
idradm 1abbaab514 DAT-2875 nodes refactoring, xmlParser will be used only for parsing 2015-06-10 17:19:40 +02:00
idradm 2ad9f22551 nodes refactoring, nodes factory introduced 2015-06-10 11:28:33 +02:00
idradm 9c55ef194b DAT-2861 images with whitespace in names will be linked correctly now 2015-06-03 16:53:31 +02:00
Adam Robak be69f7146e DAT-2861 add images to parser output on resolving, use same parser instance for all parsing 2015-06-01 15:37:56 +02:00
Diana 47994ffdb3 merge with dev 2015-05-26 10:57:00 +00:00
Diana 2085bc69a7 Revert "merge with dev"
This reverts commit b369971b4cc0d219803eb94382f02f154ac430a6.
2015-05-26 10:53:38 +00:00
Diana 01ccae3e79 merge with dev 2015-05-26 10:51:41 +00:00
Rafal Leszczynski 0656fc1697 Merge pull request #7307 from Wikia/DAT-2831
Dat 2831
2015-05-25 15:43:52 +02:00
jacek e9f1d78a20 comments 2015-05-25 15:03:45 +02:00
Diana 8e1834c810 unify the file creation method 2015-05-25 11:02:35 +00:00
jacek 0f99d95286 simplify 2015-05-25 12:25:14 +02:00
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
Rafal Leszczynski af79107afd Merge branch 'dev' into DAT-2812 2015-05-22 16:32:02 +02:00
jacek bd8ae66ede initial commit; adding access to parent; checking parent type 2015-05-21 18:07:49 +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
Diana 3a706ef159 do not treat 0 as empty footer 2015-05-20 14:57:43 +00:00
Rafal Leszczynski eeb8fd6b87 remove html escaping of data values 2015-05-20 13:56:19 +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
Rafal Leszczynski 09edb75302 change logic for getting name and key values to match with default mobile image rendering logic 2015-05-19 17:00:28 +02:00
jacek 6405c1050a add caption to the parser 2015-05-19 09:56:57 +02:00
Diana 31e6014faa treat '0' like a non-empty string 2015-05-18 13:54:25 +00: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
Adam Robak f60278a8e3 switch to recursive parsing for all elements 2015-05-07 15:19:46 +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 242bada43d external parser approach changed, tests fixed, refactoring 2015-05-07 14:37:13 +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
Rafal Leszczynski e6113be4f2 Merge pull request #7116 from Wikia/DAT-2763
error handling
2015-05-06 17:42:59 +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
Rafal Leszczynski 3109e908b9 Merge branch 'portable_infobox_mvp' into DAT-2746 2015-05-06 15:10:08 +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