Commit graph

129 commits

Author SHA1 Message Date
Garth Webb 32e85bc786 Merge branch 'dev' into SOC-815 2015-05-21 11:40:06 -07:00
Garth Webb 3508baa071 SOC-815 First part of merge from dev 2015-05-21 11:38:33 -07:00
Rodrigo Molinero Gomez c8ffb7ea02 Merge pull request #7292 from Wikia/DAT-2828
Dat 2828 -prevent image upsampling in portable infoboxes
2015-05-21 15:38:09 +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
Rafal Leszczynski 8cb897bb00 add todo comment about generating thumbnail 2015-05-21 13:20:57 +02:00
Rafal Leszczynski f9c31ad797 fix tests for render service 2015-05-21 13:06:54 +02:00
Rafal Leszczynski 4a61928991 remove issues after cherry-picking 2015-05-21 12:13:34 +02:00
Rafal Leszczynski abb9f4499a prevent image upsampling in infobox 2015-05-21 12:07:40 +02:00
Rodrigo Molinero Gomez cbaa447894 Merge pull request #7251 from Wikia/DAT-2824
DAT-2824 Fix warnings when node has no child nodes
2015-05-21 10:53:55 +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
Diana 68b9b27a93 test isEmpty for infobox footer 2015-05-20 14:38:23 +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 091ce6ef03 do not assume the order of errors 2015-05-20 12:15:22 +02:00
jacek 643ac321a2 change function from public to protected 2015-05-20 12:14:48 +02:00
Sebastian Marzjan ea136e203c Merge pull request #7233 from Wikia/DAT-2814
Dat 2814 - portable infobox fix styling issues on monobook
2015-05-20 11:47:28 +02:00
jacek 1215be5e41 formatting 2015-05-20 10:39:31 +02:00
Garth Webb 3f05f90cfe SOC-808 Merge branch 'dev' into SOC-808 2015-05-19 11:21:15 -07: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 4e95de59d8 constants 2015-05-19 16:43:55 +02:00
marzjan 9d37137680 DAT-2824 Use better child node checking 2015-05-19 14:15:06 +00:00
jacek 4eaf7be472 extract logging to external function 2015-05-19 16:01:53 +02:00
Sebastian Marzjan 1576d2160c Rename to a more appropriate name 2015-05-19 15:31:56 +02:00
marzjan 025bd86a12 DAT-2824 Fix warnings when node has no child nodes 2015-05-19 12:35:50 +00:00
jacek 6ab700c853 extract logging to external function 2015-05-19 12:49:35 +02:00
Diana f8bcf4f2a8 fix tests 2015-05-19 10:01:09 +00:00
Diana 0de06cdc14 whitespaces 2015-05-18 16:29:30 +00:00
Diana 469815c703 add unit test 2015-05-18 16:26:34 +00:00
jacek 45918aafc3 logging change 2015-05-18 17:08:53 +02:00
Rafal Leszczynski 5eac224cc5 simplify scss for monobook 2015-05-18 16:16:36 +02:00
Rafal Leszczynski 9b22e6003f fix typo in stylesheet 2015-05-18 16:02:17 +02:00
Rafal Leszczynski dea47524de fix issues with default infobox styles on monobook 2015-05-18 15:56:45 +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
Rafal Leszczynski 7331f2640f add mobile image template 2015-05-12 13:32:42 +02:00
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