Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-11-24 00:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
1339 commits 8 branches 4 tags 31 MiB
Commit graph

372 commits

Author SHA1 Message Date
Sebastian Marzjan 72392d0edd Normalize whitespace when processing infobox contents 2016-01-05 09:05:50 +01:00
idradm c477600b9d DAT-3331 update comment, reformat 2016-01-04 15:57:25 +01:00
idradm 5f42ce9742 make infoboxes use params same way as mediawiki, enable 0 param 2016-01-04 14:34:10 +01:00
Sebastian Marzjan 2fdebcdffb DAT-3465 Change approach to sanitization; use XML parsing 2015-12-30 11:00:10 +01:00
Sebastian Marzjan 0ce0b500fe Use the Builder for Sanitizers. 
Cover the sanitizer build step in tests too
 2015-12-28 12:04:36 +01:00
Sebastian Marzjan 8f437fb1e7 DAT-3465 Update the caption behavior 2015-12-28 10:21:32 +01:00
dianafa a4e03f9147 add sanitizer tests 2015-12-23 16:08:43 +01:00
dianafa 8afcb73d10 move sanitizers to a separate folder 2015-12-23 15:54:03 +01:00
dianafa ed73d4f525 move sanitizing to PortableInfoboxRenderService 2015-12-23 13:20:55 +01:00
Rafal Leszczynski f154200a97 DAT-3576, add test for thin portrait image edge case 2015-12-11 16:34:03 -08:00
marzjan 46fbb2b9c3 Make test cases make sense :) 2015-12-11 10:40:40 -08:00
Sebastian Marzjan f1896da8ab Add tests 2015-12-11 10:01:23 -08:00
dianafa 33af8b75e9 rename getAdjustedImageSize to getImageSizesForThumbnailer 2015-12-11 12:02:00 +01:00
dianafa cc54d4478d move logic to other place & add tests 2015-12-11 11:56:41 +01:00
Inez Korczynski b1efc457c3 VE-2069: Adjust tests to data that ImageNode is returning 2015-12-07 22:11:19 +00:00
dianafa 6e8091ec4d move ImageFilenameSanitizer logic to FileNamespaceSanitizeHelper 2015-11-25 11:00:39 +01:00
Diana 15a00b4d4e sanitize horizontal group items as well 2015-11-05 17:57:53 +00:00
Diana 91804e99c3 add test for sole image in label 2015-11-05 13:29:42 +00:00
Diana 49feb54689 change method name to sanitizeInfoboxFields and refactor 2015-11-05 13:21:20 +00:00
dianafa 649895d4cf change variable names and add missing PHPdocs 2015-11-03 17:19:29 +01:00
dianafa 79a0bf14fa DAT-3329 add more tests and clean identation 2015-11-03 16:36:52 +01:00
dianafa 569ef4ae4c add tests 2015-11-03 16:11:08 +01:00
Inez Korczynski 70d18e11ea VE-2003: Remove unncecessary empty lines 2015-10-28 17:57:00 +00:00
Inez Korczynski d46955d8ee VE-2003: Created unit tests to "collapse" attribute of PI groups 2015-10-28 17:55:03 +00:00
Inez Korczynski 2faa1bd633 VE-1994: Fix unit tests 2015-10-26 22:06:10 +00:00
Inez Korczynski 8fc355ecea VE-1982: Basic unit test coverage for backward compatibility added to <image> 2015-10-20 22:42:36 +00:00
Inez Korczynski b93c9607a2 VE-1982: Make sourceProvider content more readable and easier to understand 2015-10-20 21:30:07 +00:00
Inez Korczynski f693207998 VE-1982: Make dataProvider content more readable and easier to understand 2015-10-20 21:28:27 +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
dianafa e658aed5ca Merge branch 'dev' into infobox-builder-feature-branch 2015-10-05 18:39:29 +02: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
Diana 2565999c3d remove inaccuracy between image data and image data mocks 2015-09-28 16:15:49 +00:00
idradm c940d474d3 DAT-3199 unit test fix for changed default return value 2015-09-28 10:30:19 +02:00
idradm 88c886bf09 DAT-3199 add tests for template parsing 2015-09-24 13:48:51 +02:00
idradm 357efeee9c DAT-3199 test will extend WikiaBaseTest now, fix tests global scope pollution 2015-09-24 12:41:48 +02:00
idradm dbef0b9915 DAT-3199 unit tests fixed 2015-09-23 15:51:41 +02:00
Rafal Leszczynski 35fd8d87a4 Merge branch 'DAT-3153' into infobox-builder-feature-branch 2015-09-11 12:48:37 +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 b29d6099a0 add comment 2015-09-09 17:04:06 +02:00
dianafa 0c8e2545a9 addd tests 2015-09-09 14:54:26 +02:00
Rafal Leszczynski a027e8a2c9 get title from file 2015-09-09 13:23:34 +02:00
Sebastian Marzjan 351d0f94e5 DAT-3200 Adding support for urlencoded image names in infoboxes 2015-09-08 14:12:23 -07: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
idradm c5adee4ff7 DAT-3207 tests update 2015-09-08 10:26:48 +02:00
idradm 97c8de1842 DAT-3207 add mw namespaces aliases to image filename sanitizer 2015-09-08 10:25:10 +02:00
Rafal Leszczynski 66b286c427 fix unit tests after changing URL generation for video item 2015-09-07 18:21:17 +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
Rafal Leszczynski 837d0ec171 update test after adding check for not rendering labels row if all labels in horizontal group are empty strings 2015-09-07 13:26:07 +02:00
idradm 2aa83e9e57 DAT-3197 wrap content tags contents in CDATA before parsing 2015-09-07 12:22:56 +02:00
idradm bfef593cc0 DAT-3153 map defaultValue to default, publish will work only in template namespace 2015-09-04 12:54:07 +02:00
idradm 6f70123af7 DAT-3153 test renamed 2015-09-01 09:42:51 +02:00
idradm 69ee848c1b DAT-3153 infobox builder publish added 2015-08-31 17:42:38 +02:00
Rafal Leszczynski 91b490c05a unify portable infobox item side spacing 2015-08-04 12:06:14 +02:00
Rafal Leszczynski 61ffd930f1 add additional class name for easy access to overwrite border color in custom theming 2015-07-31 14:54:10 +02:00
Rafal Leszczynski 5618734513 fix tests after refactoring 2015-07-29 17:40:21 +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 ec7369d378 remove return from doc block 2015-07-29 14:16:58 +02:00
Rafal Leszczynski c773f43c9c address CR comments 2015-07-29 13:51:55 +02:00
Rafal Leszczynski c92bce20cd finish test refactoring 2015-07-29 10:58:39 +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
marzjan f5b26aac82 Fixing File mocking 2015-07-28 12:15:27 +00: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 0b44c38814 fix test after default layout change 2015-07-27 16:49:15 +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
marzjan bdee8bab34 Fix the test 2015-07-22 13:24:18 +00:00
Rafal Leszczynski 07fbcc4f18 add test to image node for video 2015-07-22 13:04:41 +02:00
Rafal Leszczynski c3d81dd456 add tests for rendering video thumbnail 2015-07-22 12:11:19 +02:00
Diana cf22303f9d don't render image inside hero module title 2015-07-21 23:13:28 +00:00
Diana ccfd342a3d update comment 2015-07-21 14:30:13 +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 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 4bfe7cf215 rename functions 2015-07-13 08:56:19 +00:00
Diana eb7be6fcb4 refactor test functions 2015-07-10 14:57:57 +00:00
Diana ecc7caf1ef git add descrs 2015-07-10 12:31:43 +00:00
Diana 837b67bbb3 fix functionality of renderImage 2015-07-10 12:10:03 +00:00
Diana cc01be9176 refactor tests 2015-07-10 11:19:08 +00:00
Diana 286617ac8b typo 2015-07-09 19:08:25 +02:00
Diana 8ff4d4c491 add invalid thumb case 2015-07-09 17:07:10 +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
Diana e56afa7f84 update tests 2015-07-09 07:03:41 +00:00
Diana 7ddf7b4782 fix tests 2015-07-07 10:49:05 +00:00
idradm 597503b643 DAT-2933 add more test cases 2015-07-07 09:06:37 +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 e33a0b77f2 DAT-2941 fix setUp method 2015-07-03 12:17:24 +02:00
Sebastian Marzjan 86bfcc7592 Cherry-picking 9eb06cc 2015-07-03 12:16:18 +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 edda7bebbd DAT-2940 rename css selectors 2015-07-02 10:22:37 +02:00
Rafal Leszczynski 04e268d57a add hero tests plus general render test refactor 2015-07-01 18:03:57 +02:00
Rafal Leszczynski 57e5d5f59f add render tests for hero component 2015-07-01 16:34:34 +02:00
idradm 26269c9150 DAT-2940 rename footer tag to navigation 2015-07-01 16:19:31 +02:00
idradm 9b7a24b6ba DAT-2965 remove type hinting, to prevent fatal errors 2015-07-01 15:17:52 +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 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 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
idradm 26b3f2c545 DAT-2874 test fixes 2015-06-22 18:29:27 +02:00
Diana da9648461e small testing 2015-06-22 15:38:47 +00: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 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 6ab4e92781 DAT-2875 add comparison without set 2015-06-16 12:59:00 +02:00
idradm 81e1754a02 DAT-2875 variables matcher fixed, suitable tests added 2015-06-16 10:52:18 +02:00
idradm 864327b5f3 DAT-2875 add duplicate source test 2015-06-15 15:34:54 +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 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
idradm 31e403d6d4 DAT-2875 switch to protected 2015-06-12 10:59:25 +02:00
idradm 1bcae301b1 DAT-2875 clean up libxml errors after tests 2015-06-12 10:58:38 +02: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
Diana 4ab9e94270 add renderservicetest case 2015-06-11 17:28:49 +00:00
idradm dbe46fbd90 change revert 2015-06-11 18:38:08 +02:00
idradm 01a9e2cc13 test change 2015-06-11 18:31:15 +02:00
idradm 29f713997c DAT-2875 test refactoring 2015-06-11 14:51:54 +02:00
Rafal Leszczynski 45aa4f847d fix typo in var name 2015-06-11 13:19:05 +02:00
Rafal Leszczynski 96ced03f8a add unit tests for params validator 2015-06-11 12:54:10 +02:00
Diana 368d233930 working group layout 2015-06-10 16:07:28 +00: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
dianafa fb681591e0 prototype test 2015-06-09 19:35:19 +02:00
jacek 62aea4d08d PR fix 2015-06-09 16:16:48 +02:00
jacek 0c7cfe261d PR fix 2015-06-09 14:31:04 +02:00
dianafa acff223c0e refactor tests and css selectors 2015-06-09 11:40:32 +02:00
idradm a6d3f2fd07 DAT-2816 code refactor, double label or default tag test added 2015-06-09 10:41:45 +02:00
Diana c3dcfb9d66 refactor tests 2015-06-08 15:25:48 +00:00
Diana 1ce89defbf refactor test 2015-06-08 16:35:02 +02:00
idradm 6655e1fc30 DAT-2816 introduce source attribute for label tag, tests refactor 2015-06-08 15:56:08 +02:00
Diana 85ade87f25 test1 2015-06-08 12:49:23 +00:00
dianafa 7d5d42e9f4 merge with dev 2015-06-08 12:11:03 +02:00
Diana 7342ffbeb0 add tests and functionality 2015-06-03 13:48:44 +00:00
Adam Robak 7978ed0b96 DAT-2845 add infobox parser api 2015-05-29 15:05:08 +02:00
Rafal Leszczynski b523ab5083 fix portable infobox render service tests 2015-05-25 23:48:22 +00:00
jacek b7f417ab62 tests 2015-05-25 23:48:18 +00:00
Adam Robak e5ca491c07 DAT-2811 make sure there are no whitespaces in class name 2015-05-25 23:48:17 +00:00
Rafal Leszczynski e9da3f52f3 add htnl escaping before rendering + add additional tests for render service 2015-05-25 23:38:40 +00:00
Adam Robak 746a010e2c DAT-2811 make theme class appear only when set, theme class will be prefixed instead of suffixed 2015-05-25 23:34:51 +00:00
Adam Robak 644b5e22e2 DAT-2812 add custom theming 2015-05-25 23:32:27 +00:00
jacek e789c6d242 extend tests 2015-05-25 23:32:24 +00:00
Rafal Leszczynski 16d8be48e6 fix portable infobox render service tests 2015-05-25 17:02:02 +02:00
Rafal Leszczynski 0656fc1697 Merge pull request #7307 from Wikia/DAT-2831 
Dat 2831
 2015-05-25 15:43:52 +02:00
Rafal Leszczynski af79107afd Merge branch 'dev' into DAT-2812 2015-05-22 16:32:02 +02:00
jacek a2062232f5 tests 2015-05-22 14:34:33 +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
Adam Robak 19e353e881 DAT-2811 make sure there are no whitespaces in class name 2015-05-22 12:18:54 +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 f9c31ad797 fix tests for render service 2015-05-21 13:06:54 +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
Rafal Leszczynski 861dcf833b add htnl escaping before rendering + add additional tests for render service 2015-05-20 13:56:56 +02:00
Adam Robak ccd32f1b76 DAT-2811 make theme class appear only when set, theme class will be prefixed instead of suffixed 2015-05-20 13:56:24 +02:00
jacek 091ce6ef03 do not assume the order of errors 2015-05-20 12:15:22 +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
jacek 4e95de59d8 constants 2015-05-19 16:43:55 +02:00
jacek 4eaf7be472 extract logging to external function 2015-05-19 16:01:53 +02:00
Diana f8bcf4f2a8 fix tests 2015-05-19 10:01:09 +00:00
jacek 03aea58681 extend tests 2015-05-19 10:26:41 +02: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
Sebastian Marzjan 69b9abc0af DAT-2785 and DAT-2784 - Handle InnerXML properly 
Remove obsolete test
 2015-05-13 13:52:31 +02:00
Rafal Leszczynski f4f42d4147 remove var_dump from tests 2015-05-11 17:25:09 +02:00
Rafal Leszczynski e7fdcbc778 fix issues with image name being passed to template 2015-05-11 17:07:07 +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
Adam Robak 4be7113588 unit test changes to match marker introduction 2015-05-08 11:54:31 +02:00
jacek fe837daac5 tests 2015-05-07 15:52:29 +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
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 e608c3d877 Merge branch 'portable_infobox_mvp' into DAT-2762 
# Conflicts:
#	extensions/wikia/PortableInfobox/tests/XmlParserTest.php
 2015-05-07 15:10:56 +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 8a080d1a15 Merge branch 'portable_infobox_mvp' into DAT-2738 
Conflicts:
	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
 2015-05-07 14:58:52 +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