Commit graph

70 commits

Author SHA1 Message Date
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
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 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
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
idradm 339c7e97f0 DAT-2909 formatting 2015-07-02 13:55:39 +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
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
Rafal Leszczynski f569991469 Merge pull request #7488 from Wikia/DAT-2857
DAT-2857 Horizontal group
2015-06-12 15:23:44 +02:00
dianafa 76b4b3fbb7 change theme to layout 2015-06-10 17:24:49 +02:00
dianafa 6e8518637c working class assigment 2015-06-09 13:37:03 +02:00
Diana 7342ffbeb0 add tests and functionality 2015-06-03 13:48:44 +00: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
Diana 8e1834c810 unify the file creation method 2015-05-25 11:02:35 +00: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