Commit graph

499 commits

Author SHA1 Message Date
Inez Korczynski 6c4359a9d4 VE-1975: Added support for mobile (ArticleAsJson) and usage of XML parsing
Special handling for mobile is needed because article for mobile is delivered within ArticleAsJson which makes a lot of transformation during the parsing process (instead of for instance postprocessing).
Parsing HTML with XML parser seems to be giving better results than using just regexes and also it gives as ability to handle nested tabbers in a future in a better way.
2015-10-19 23:56:20 +00:00
Inez Korczynski a692e008b3 VE-1975: Modified NodeImage to return array of images instead of one image
Added support for <tabber>
Hero image still works correct
2015-10-16 01:15:52 +00:00
Diana Falkowska dfe25a33df remove newline 2015-10-07 15:12:56 +02:00
Diana 00360174b5 add context to proper field 2015-10-07 09:42:38 +00:00
Nikodem 97623fe9a5 Merge pull request #8614 from Wikia/DAT-3294
DAT-3294 add infobox-hero-image context handling
2015-09-30 12:45:48 +02:00
dianafa 33414c3dbb change hook name and move context to PIRenderService 2015-09-30 10:10:31 +02:00
Diana ff16c2346f change order 2015-09-28 16:42:27 +00:00
dianafa 4536458992 move hook to render service 2015-09-28 17:46:40 +02:00
idradm 13d398bced DAT-3199 purge cache after change is done 2015-09-25 17:19:48 +02:00
idradm d95c9310fc DAT-3199 remove clear state caching 2015-09-25 17:06:09 +02:00
idradm 12120f3cf1 DAT-3199 change memc key to be more distinguishable, add type hinting 2015-09-24 17:17:47 +02:00
idradm 094cd426ae DAT-3199 switch to WikiaDataAccess 2015-09-24 16:25:27 +02:00
idradm 88c886bf09 DAT-3199 add tests for template parsing 2015-09-24 13:48:51 +02:00
idradm bcef561785 DAT-3199 remove debug method 2015-09-23 16:00:07 +02:00
idradm dbef0b9915 DAT-3199 unit tests fixed 2015-09-23 15:51:41 +02:00
idradm 859a0ee81b DAT-3199 use page_props directly instead of through parserOutput, add memcache layer for infoboxes data provider service, introduce hook on backlinks purge 2015-09-22 17:48:38 +02:00
Nikodem ce6aa2431f Merge pull request #8398 from Wikia/DAT-3073
DAT-3073 set max height for infobox images on desktop
2015-09-10 11:42:33 +02:00
Nikodem 9767ef0d50 Merge pull request #8366 from Wikia/DAT-3194
Dat 3194 - for videos in infobox use link to file page instead of link to original image
2015-09-09 17:24:39 +02:00
Diana 222a3c00a8 typo 2015-09-09 16:00:59 +02:00
Diana 4a01b3ed1d fix IDE formatting 2015-09-09 16:00:19 +02:00
dianafa 0c8e2545a9 addd tests 2015-09-09 14:54:26 +02:00
Diana 273b53fafd remmove newline 2015-09-09 13:49:16 +02:00
Rafal Leszczynski a027e8a2c9 get title from file 2015-09-09 13:23:34 +02:00
dianafa e10ab9b7ee change height only for desktop images 2015-09-09 10:16:00 +02:00
dianafa 34bd1c729e restore formatting 2015-09-09 10:01:24 +02:00
Sebastian Marzjan 351d0f94e5 DAT-3200 Adding support for urlencoded image names in infoboxes 2015-09-08 14:12:23 -07:00
dianafa b896faa147 add max height to infobox images 2015-09-08 16:29:41 +02:00
Nikodem f025c91d2d Merge pull request #8368 from Wikia/DAT-3102
DAT-3102 avoid double HTML escaping and do it only in mustache template
2015-09-08 15:15:16 +02:00
Nikodem 95d6bc152b Merge pull request #8370 from Wikia/DAT-3127
DAT-3127 treat 0 as valid value inside <format> tag
2015-09-08 15:07:24 +02:00
Rafal Leszczynski bb7421acb7 treat 0 as valid value inside <format> tag 2015-09-08 11:29:49 +02:00
Rafal Leszczynski 6ecfe30e73 avoid double HTML escaping and do it only in mustache template 2015-09-08 10:32:36 +02:00
idradm 97c8de1842 DAT-3207 add mw namespaces aliases to image filename sanitizer 2015-09-08 10:25:10 +02:00
Rafal Leszczynski d9db65a08f use filepage url instead of image url for videos inside portable infobox 2015-09-07 17:38:17 +02:00
Nikodem e0739c6942 Merge pull request #8351 from Wikia/DAT-3210
DAT-3210 make caption field show the caption not the alt
2015-09-07 16:07:46 +02:00
Nikodem 5d68ec75c8 Merge pull request #8348 from Wikia/DAT-3197
DAT-3197 wrap content tags contents in CDATA before parsing
2015-09-07 14:47:33 +02:00
Diana 625fdf9f7c make caption field show the caption not the alt 2015-09-07 11:42:47 +00:00
Rafal Leszczynski 280a9aa50b skip rendering labels if all labels in horizontal group are empty strings 2015-09-07 13:17:03 +02:00
idradm 2aa83e9e57 DAT-3197 wrap content tags contents in CDATA before parsing 2015-09-07 12:22:56 +02:00
Rafal Leszczynski 96129feb6b add support for horizontal group in mercury 2015-09-04 17:30:54 +02:00
Rafal Leszczynski 3a1eed4a25 Revert "add support for horizontal group on mercury"
This reverts commit 720be436cab4d8a7492913f1b5efd8cd481f4fcf.
2015-09-04 17:29:59 +02:00
Rafal Leszczynski ab579bb0a8 add support for horizontal group on mercury 2015-09-04 17:26:18 +02:00
Sebastian Marzjan b699619caf DAT-3105 Fix saving invalid titles to imagelinks table in PortableInfoboxes
* Use Title::makeTitleSafe instead of Title::newFromTitle
* Add image only if title is valid
2015-08-31 13:53:06 +02:00
idradm 1dd65e803c DAT-3147 change formatting 2015-08-27 10:47:43 +02:00
idradm af0d7821a4 DAT-3147 make render service use getTemplates method 2015-08-27 10:46:38 +02:00
idradm 9b020ee4fb DAT-3147 assets entry point added 2015-08-27 10:30:25 +02:00
Diana 8e6bffbb7f P2 fix handle errors in includeonly tag 2015-08-26 14:49:56 +00:00
Diana 0006d77605 handle nowiki and pre params 2015-08-25 12:27:01 +00:00
Diana c19c4c861c add array values to Node.php 2015-08-25 11:00:04 +00:00
Nikodem 42eed6cf41 Merge pull request #8128 from Wikia/DAT-3082
DAT-3082 show all params used in infoboxes
2015-08-20 16:59:07 +02:00
Diana c2bf3473e1 add isset and if 2015-08-20 14:12:28 +00:00
Diana 6ba32a57d8 fix includeonly issues 2015-08-20 13:52:36 +00:00
Diana 6111779855 add NS_TEMPLATE 2015-08-20 10:37:45 +02:00
Diana ce61857d26 fix check 2015-08-20 10:30:22 +02:00
Diana f4954f2111 add namespace check 2015-08-20 08:24:49 +00:00
Diana bede962a5f move logic to DataService 2015-08-19 20:00:27 +00:00
MariuszCz 0a4c3cad17 Update PortableInfoboxClassification.php
CE-2367 change description
2015-08-18 11:09:26 +02:00
Mariusz Czeszejko 0945d21630 CE-2367 replace method isTitleWithNonportableInfobox 2015-08-13 12:35:42 +00:00
Rafal Leszczynski f59fd6b69f refactor and simplify portable infobox templates and desctip styling 2015-07-29 17:17:20 +02:00
Rafal Leszczynski 07aca42051 Merge branch 'DAT-3003-cleanup-feature-branch' into DAT-3004-simplify-infobox-classes 2015-07-29 15:32:52 +02:00
Rafal Leszczynski a2680407f3 fix error after solving merge conflicts 2015-07-29 15:22:28 +02:00
Rafal Leszczynski 9ecc835603 Merge branch 'dev' into DAT-3003-cleanup-feature-branch 2015-07-29 15:04:51 +02:00
Rafal Leszczynski c773f43c9c address CR comments 2015-07-29 13:51:55 +02:00
Rafal Leszczynski 22371f6bf3 change render service helper fron singleton to instantiable class and refactor tests 2015-07-28 16:13:36 +02:00
Rafal Leszczynski 1324073ccb move helper methods from render service to separate class and refactor tests in progress 2015-07-28 13:51:30 +02:00
Rafal Leszczynski a32bb6831c change the template and styling for horizontal groups 2015-07-28 11:46:41 +02:00
Rafal Leszczynski 74c65d179a fix whitespaces 2015-07-27 12:59:57 +02:00
Rafal Leszczynski bc22980d2a Merge branch 'dev' into DAT-3025 2015-07-27 11:39:40 +02:00
dianafa 654b8da8ce merge with dev 2015-07-22 15:28:39 +02:00
Diana cf22303f9d don't render image inside hero module title 2015-07-21 23:13:28 +00:00
Rafal Leszczynski 13a39b3165 add logic for video rendering in infobox 2015-07-21 16:29:46 +02:00
Rafal Leszczynski ba0a923fd9 add video functionality to image tag 2015-07-21 16:29:14 +02:00
Diana e8bfd73381 change MAIN to PLATFORM ticket 2015-07-21 12:11:36 +00:00
Diana d12cea9be6 add comments TODO 2015-07-21 12:02:51 +00:00
Diana fe85628f0e fix logic & tests 2015-07-21 11:33:24 +00:00
Diana 6425ac0299 move sanitizeInfoboxTitle to renderService 2015-07-20 13:00:35 +00:00
Diana 3bea79bbe9 add NodeTitle test 2015-07-20 12:02:10 +00:00
Diana 92042b5c1b remove all HTML tags from inforbox title 2015-07-20 11:31:53 +00:00
Diana 225321ca8a refactor & test update 2015-07-20 09:52:32 +00:00
Diana 57279eb5da fast fix, test will not pass but works 2015-07-17 16:02:24 +00:00
Diana ece0d06c84 render hero module only for images big enough 2015-07-17 13:43:08 +00:00
Diana 403ff30d2a fix tests after merge 2015-07-16 11:21:20 +00:00
dianafa 2e0e607b73 merge with dev 2015-07-16 13:06:17 +02:00
Diana e0bc6c0087 update returned type 2015-07-11 10:59:56 +02:00
Diana 837b67bbb3 fix functionality of renderImage 2015-07-10 12:10:03 +00:00
Diana b1e13f6a4e add else 2015-07-09 16:06:22 +00:00
Diana 238a28a071 mock methods 2015-07-09 13:50:12 +00:00
dianafa af231a3226 refactor 2015-07-08 18:31:56 +02:00
dianafa d830ded77d refactor and add PHPdoc 2015-07-08 13:22:12 +02:00
dianafa e2aeb56cff add width and height attrs 2015-07-07 16:28:53 +02:00
dianafa bf790b3322 Merge branch 'dev' into DAT-2909 2015-07-06 18:46:02 +02:00
idradm f3c4062db7 DAT-2933 support html entities in infobox templates 2015-07-06 18:15:29 +02:00
idradm 363ba672c4 DAT-2941 make the show attribute check case insensitive 2015-07-03 12:17:53 +02:00
idradm cf22faa0e1 DAT-2941 rename consts for lower code complexity 2015-07-03 12:17:40 +02:00
idradm 1de7ff5275 DAT-2941 revert const name change 2015-07-03 12:17:17 +02:00
Sebastian Marzjan 86bfcc7592 Cherry-picking 9eb06cc 2015-07-03 12:16:18 +02:00
idradm 1ba1378d6b DAT-2909 syntax fix 2015-07-03 12:05:59 +02:00
idradm e065533850 Merge remote-tracking branch 'origin/dev' into DAT-2909
# Conflicts:
#	extensions/wikia/GameGuides/assets/GameGuidesAssets.json
#	extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
2015-07-03 10:51:32 +02:00
Rodrigo Molinero Gomez 7360054705 Merge pull request #7698 from Wikia/DAT-2944
DAT-2944 remove source for label tag functionality
2015-07-02 16:38:03 +02:00
Rodrigo Molinero Gomez d2a069d56d Merge pull request #7714 from Wikia/DAT-2940
DAT-2940 rename footer tag to navigation
2015-07-02 15:27:47 +02:00
idradm 339c7e97f0 DAT-2909 formatting 2015-07-02 13:55:39 +02:00
Rodrigo Molinero Gomez def6be16b8 Merge pull request #7712 from Wikia/DAT-2965
DAT-2965 remove type hinting, to prevent fatal errors
2015-07-02 12:42:15 +02:00
Rodrigo Molinero Gomez 80d94831cb Merge pull request #7710 from Wikia/DAT-2960
DAT-2960 ensure data is an array
2015-07-02 12:27:58 +02:00
idradm 5b0f91af9c DAT-2962 ensure service is always on, move const to file always loaded 2015-07-02 09:54:06 +02:00
Rafal Leszczynski 22b1846820 move image data extend logic to separate method 2015-07-01 18:03:34 +02:00
idradm 26269c9150 DAT-2940 rename footer tag to navigation 2015-07-01 16:19:31 +02:00
Rafal Leszczynski 8afbf3a45d add logic for rendering hero component inside infobox 2015-07-01 15:18:20 +02:00
idradm 9b7a24b6ba DAT-2965 remove type hinting, to prevent fatal errors 2015-07-01 15:17:52 +02:00
idradm 90baa83fd8 DAT-2960 ensure data is an array 2015-07-01 15:03:54 +02:00
idradm 530b4ca61d DAT-2961 check if parser output exists before using 2015-07-01 12:05:08 +02:00
idradm 766f39f75d DAT-2944 remove source for label tag functionality 2015-07-01 10:55:58 +02:00
Rafal Leszczynski f197b3e2ea Merge pull request #7600 from Wikia/DAT-2818
DAT-2818 Infoboxes field mutators
2015-06-26 11:28:37 +02:00
idradm 127dc527ad Merge remote-tracking branch 'origin/dev' into DAT-2917 2015-06-25 13:15:44 +02:00
Rodrigo Molinero Gomez 96a9f8eee4 Merge pull request #7598 from Wikia/DAT-2874
DAT-2874 refactor infoboxes data service, push to top infobox item
2015-06-25 10:51:49 +02:00
Adam Robak 923edbcb31 Merge pull request #7601 from Wikia/DAT-2920
DAT-2920 clean up thumbnail creating logic for portable infoboxes - special ca…
2015-06-25 10:10:28 +02:00
idradm 48072ab3f0 DAT-2917 fix double preprocess breaking inclusion functionality 2015-06-24 14:09:58 +02:00
Diana c63327e68b remove unused const var 2015-06-23 17:35:10 +02:00
Diana 3816c0c88d refactor extractSourceFromNode 2015-06-23 12:25:37 +00:00
idradm 29580c1c9d Merge remote-tracking branch 'origin/dev' into DAT-2874
# Conflicts:
#	extensions/wikia/PortableInfobox/PortableInfoboxHooks.class.php
2015-06-23 13:31:56 +02:00
Diana 42900d2ffd refactor getValueWithDefault() 2015-06-23 11:10:37 +00:00
Diana c46246cd47 add tests for getSource 2015-06-23 11:05:25 +00:00
idradm d7f5995e72 DAT-2874 remove constructor calls in favor of newFrom approach 2015-06-23 10:41:15 +02:00
Diana cfdc27f665 remove empty line 2015-06-22 15:51:59 +00:00
Rafal Leszczynski 26912d1bb6 clean up thumbnail creating logic for portable infoboxes - special case for Vignette no longer needed 2015-06-22 17:45:44 +02:00
Diana da9648461e small testing 2015-06-22 15:38:47 +00:00
idradm 02a2d0c3c1 DAT-2874 refactor infoboxes data service, push to top infobox item 2015-06-22 17:15:26 +02:00
Diana 4a183481c3 works 2015-06-22 13:53:01 +00:00
Sebastian Marzjan 17e82774c9 Address code review remarks 2015-06-19 15:50:25 +02:00
Sebastian Marzjan 1c0b69edee DAT-2895 Fetch gallery data if available for image tag in new infoboxes 2015-06-19 15:36:16 +02:00
Sebastian Marzjan ad12549cb8 DAT-2895 Address CR remarks; Simplify trim call and returning of value 2015-06-19 15:35:35 +02:00
Sebastian Marzjan df3966be4e DAT-2895 Support gallery as image source in new infoboxes 2015-06-19 15:35:35 +02:00
idradm 3e8a665242 Merge remote-tracking branch 'origin/dev' into DAT-2839
# Conflicts:
#	extensions/wikia/PortableInfobox/PortableInfobox.setup.php
#	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
#	extensions/wikia/PortableInfobox/services/Parser/XmlParser.php
#	extensions/wikia/PortableInfobox/styles/PortableInfobox.scss
2015-06-19 14:43:40 +02:00
idradm 545880a804 Merge remote-tracking branch 'origin/dev' into DAT-2792
# Conflicts:
#	includes/wikia/api/InfoboxApiController.class.php
2015-06-18 13:03:51 +02:00
idradm 87e83502b8 DAT-2875 check for empty nodes updated 2015-06-16 13:45:27 +02:00
idradm 81e1754a02 DAT-2875 variables matcher fixed, suitable tests added 2015-06-16 10:52:18 +02:00
idradm b9d4925f52 groups leyout refactor 2015-06-15 14:58:48 +02:00
idradm cae634dfb1 Merge remote-tracking branch 'origin/dev' into DAT-2875-refactor
# Conflicts:
#	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
#	extensions/wikia/PortableInfobox/services/Parser/Nodes/NodeGroup.php
#	extensions/wikia/PortableInfobox/tests/ParserNodesTest.php
2015-06-15 14:57:57 +02:00
idradm 96c1c691b7 DAT-2891 block elements will now be parsed correctly, test added 2015-06-15 12:43:13 +02:00
idradm 70a5a7511c DAT-2875 missing ref element fix 2015-06-12 16:47:37 +02:00
idradm 6d15673e5e DAT-2875 comment added 2015-06-12 15:51:25 +02:00
idradm 197c040d8e DAT-2875 removed isempty and source from render data fields, more tests added, formatting clean up 2015-06-12 15:43:37 +02:00
Rafal Leszczynski f569991469 Merge pull request #7488 from Wikia/DAT-2857
DAT-2857 Horizontal group
2015-06-12 15:23:44 +02:00
Rafal Leszczynski eb3c40a8dc Merge pull request #7430 from Wikia/infobox-tabular-layout
DAT-2856 Infobox tabular layout
2015-06-12 12:51:15 +02:00
Diana f279f1477c call static prop 2015-06-12 01:00:52 +00:00
Diana 3418836533 remove redundant var 2015-06-12 00:11:23 +00:00
Diana 098b1f9b89 fix tests 2015-06-11 17:53:34 +00:00
dianafa 753e320027 merge with dev 2015-06-11 19:36:28 +02:00
idradm e2a0a2273e Merge branch 'dev' into DAT-2875-refactor
# Conflicts:
#	extensions/wikia/PortableInfobox/services/Parser/Nodes/Node.php
#	extensions/wikia/PortableInfobox/services/Parser/Nodes/NodeData.php
#	extensions/wikia/PortableInfobox/tests/ParserNodesTest.php
2015-06-11 19:12:55 +02:00
Diana 20289950d1 getXmlAttributeFromSupported 2015-06-11 13:36:57 +00:00
idradm 29f713997c DAT-2875 test refactoring 2015-06-11 14:51:54 +02:00
Rafal Leszczynski 96ced03f8a add unit tests for params validator 2015-06-11 12:54:10 +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
Rafal Leszczynski d50b2be923 change naming convention 2015-06-11 11:47:22 +02:00
Rafal Leszczynski 1008c875d6 change exception name 2015-06-11 11:39:36 +02:00
idradm ea4aa94511 DAT-2875 nodes refactor 2015-06-11 11:34:28 +02:00
Diana 368d233930 working group layout 2015-06-10 16:07:28 +00:00
idradm 29d977c0af Merge branch 'release-302-dat-2861' into release-303-dat-2861 2015-06-10 17:29:32 +02:00
idradm 495bf0acbc DAT-2876 remove not replaced markers 2015-06-10 17:26:33 +02:00
dianafa 76b4b3fbb7 change theme to layout 2015-06-10 17:24:49 +02:00
idradm 1abbaab514 DAT-2875 nodes refactoring, xmlParser will be used only for parsing 2015-06-10 17:19:40 +02:00
Rafal Leszczynski 9480964132 validate infobox tag attributes 2015-06-10 14:51:07 +02:00
idradm ed16bffd63 Merge branch 'release-302-dat-2861' into DAT-2875-refactor 2015-06-10 14:44:59 +02:00
idradm 0396b38175 DAT-2876 switch to internal parsing to prevent hooks errors 2015-06-10 13:55:14 +02:00
idradm 7cbfad1d19 Revert "Merge pull request #7403 from Wikia/DAT-2866"
This reverts commit 131da376095f39b374eaa1d83c2ee734245ca3b8, reversing
changes made to 934ca821fd99f61c53d005568c07f2f9b9afd37d.
2015-06-10 13:47:28 +02:00
Rafal Leszczynski a421a3ed21 Merge branch 'dev' into DAT-2839 2015-06-10 11:42:15 +02:00
idradm 2ad9f22551 nodes refactoring, nodes factory introduced 2015-06-10 11:28:33 +02:00
Rafal Leszczynski 51e869edaa Merge pull request #7437 from Wikia/DAT-2816
DAT-2816 introduce source attribute for label tag, tests refactor
2015-06-09 16:55:58 +02:00
idradm 8d53872cbf DAT-2816 docs comments changed 2015-06-09 15:09:01 +02:00
jacek 0c7cfe261d PR fix 2015-06-09 14:31:04 +02:00
dianafa 6e8518637c working class assigment 2015-06-09 13:37:03 +02:00
jacek 08bcb2aa36 adding DataService class 2015-06-09 12:14:00 +02:00
Adam Robak 40c2fc00b8 Merge pull request #7374 from Wikia/DAT-2861
DAT-2861 add images to parser output on resolving, use same parser in…
2015-06-09 11:48:09 +02:00
idradm a6d3f2fd07 DAT-2816 code refactor, double label or default tag test added 2015-06-09 10:41:45 +02:00
dianafa cb72c284ef getXmlAttr theme 2015-06-09 10:16:47 +02:00
idradm 6655e1fc30 DAT-2816 introduce source attribute for label tag, tests refactor 2015-06-08 15:56:08 +02:00
dianafa 7d5d42e9f4 merge with dev 2015-06-08 12:11:03 +02:00
idradm 471bdf7b8d Merge branch 'DAT-2861' into release-302-dat-2861 2015-06-08 11:35:34 +02:00
Sebastian Marzjan 07dfc765d2 Merge pull request #7364 from Wikia/DAT-2845
DAT-2845 add infobox parser api
2015-06-08 10:00:38 +02:00
idradm 9c55ef194b DAT-2861 images with whitespace in names will be linked correctly now 2015-06-03 16:53:31 +02:00
Diana 7342ffbeb0 add tests and functionality 2015-06-03 13:48:44 +00:00
jacek a8e11a41bd messages and CR remark 2015-06-03 14:37:12 +02:00
idradm 4e6298f881 DAT-2866 citation error wont be showing up when partial parse is run 2015-06-03 13:40:26 +02:00
jacek a9c01baed5 hide debug content for articles 2015-06-02 13:09:25 +02:00
Adam Robak e476e7c07f DAT-2861 save also non existing images 2015-06-01 16:11:36 +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
jacek e2025721fd translations 2015-06-01 14:11:07 +02:00
rafal.kalinski 70482ae609 Merge remote-tracking branch 'origin/dev' into SOC-812 2015-05-29 18:47:59 +00:00
jacek 44cbb9cc95 initial commit 2015-05-29 16:37:35 +02:00
Adam Robak 7978ed0b96 DAT-2845 add infobox parser api 2015-05-29 15:05:08 +02:00
Diana bcf9f59b0e missing bracket 2015-05-26 11:07:33 +00: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.kalinski 007c60fa22 Merge remote-tracking branch 'origin/dev' into SOC-812 2015-05-25 23:52:33 +00:00
jacek 7fa5668c65 comments 2015-05-25 23:48:21 +00:00
jacek 4ac663f665 simplify 2015-05-25 23:48:20 +00:00
Garth Webb fce26a692d SOC-815 First part of merge from dev 2015-05-25 23:46:40 +00:00
jacek 84de726dbe initial commit; adding access to parent; checking parent type 2015-05-25 23:38:42 +00:00
Rafal Leszczynski e9da3f52f3 add htnl escaping before rendering + add additional tests for render service 2015-05-25 23:38:40 +00:00
Rafal Leszczynski d28749eac7 remove html escaping of data values 2015-05-25 23:34:50 +00:00
Adam Robak 644b5e22e2 DAT-2812 add custom theming 2015-05-25 23:32:27 +00:00
Rafal Leszczynski a5e7fb7ae0 change logic for getting name and key values to match with default mobile image rendering logic 2015-05-25 23:32:25 +00:00
jacek b95b09c0a8 add caption to the parser 2015-05-25 23:32:24 +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 ff623260e7 refactoring 2015-05-22 16:30:33 +00:00
Diana 72c1fd06ab refactoring 2015-05-22 16:25:21 +00:00
Diana 9d1c6031cd whitespaces2 2015-05-22 15:46:54 +00:00
dianafa c3073c0b17 whitespaces 2015-05-22 17:34:12 +02: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
Rafal Leszczynski 8c0edf4b16 Merge pull request #7253 from Wikia/DAT-2811
DAT-2812 add custom theming
2015-05-22 12:31:31 +02:00
jacek bd8ae66ede initial commit; adding access to parent; checking parent type 2015-05-21 18:07:49 +02: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 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
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
Rafal Leszczynski 861dcf833b add htnl escaping before rendering + add additional tests for render service 2015-05-20 13:56:56 +02:00
Rafal Leszczynski eeb8fd6b87 remove html escaping of data values 2015-05-20 13:56:19 +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
Adam Robak 77679f2b9f DAT-2812 add custom theming 2015-05-19 17:20:15 +02: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
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
jacek 6405c1050a add caption to the parser 2015-05-19 09:56:57 +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
Rafal Leszczynski 7331f2640f add mobile image template 2015-05-12 13:32:42 +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