Commit graph

1189 commits

Author SHA1 Message Date
Rafal Leszczynski 0571834145 Merge branch 'dev' into DAT-3770 2016-02-19 14:54:39 +01:00
Rafal Leszczynski f3d501e8cd DAt-3770, move common portable infobox styles to mixins 2016-02-19 13:56:08 +01:00
Rafal Leszczynski 11e56f6f97 DAt-3770, move common portable infobox styles to mixins 2016-02-18 15:31:53 +01:00
Mateusz Rybarski 5637f4d6ed fetching infobox markup, checking if there is only one infobox 2016-02-16 13:37:48 +01:00
Bogna Knychała 4cc019aecb Merge pull request #9597 from Wikia/XW-41
XW-41 | Use new format of Ember component placeholder for single images
2016-02-15 19:06:44 +01:00
Bogna Knychala 402d4e3c8c XW-41 add template to experimental image collection 2016-02-15 18:44:02 +01:00
Bogna Knychala ba822f6176 XW-41 add comment to method and fix the log message format 2016-02-15 15:48:42 +01:00
Bogna Knychala 46683ca8e4 XW-41 fix xpath to media in hero image in infobox 2016-02-12 18:20:14 +01:00
Bogna Knychala c6aa0fb787 XW-41 handle experimental content 2016-02-12 17:13:48 +01:00
idradm 20d6a46421 DAT-3707 create infobox builder extension 2016-02-12 11:38:47 +01:00
idradm 6e60746d0f DAT-3707 refactor save 2016-02-12 10:53:22 +01:00
idradm 41ef2d5266 DAT-3707 refactor save 2016-02-12 10:52:46 +01:00
idradm 5bbad66ec0 DAT-3707 remove unused entry point code 2016-02-12 10:05:16 +01:00
idradm 50ba0311ef glue infobox builder viewport 2016-02-11 10:45:25 +01:00
idradm 45aaaa5ecd make infobox builder viewport bigger 2016-02-11 10:34:09 +01:00
idradm 490ae75d53 DAT-3735 load builder only 2016-02-10 16:20:36 +01:00
idradm dbbfabceda change mercury route 2016-02-09 12:20:20 +01:00
idradm d4953f7680 Merge branch 'dev' into infobox-builder-feature-branch
# Conflicts:
#	extensions/wikia/AdminDashboard/AdminDashboardLogic.class.php
#	extensions/wikia/AssetsManager/config.php
#	extensions/wikia/EditPageLayout/templates/EditPageLayout_EditPage.php
2016-02-09 11:46:56 +01:00
Warkot 3026d6ce41 Merge remote-tracking branch 'origin/dev' into XW-41 2016-02-08 18:39:59 +01:00
Tomasz Napieralski 2e5f90f543 hide changes after flag 2016-02-08 15:57:57 +01:00
Tomasz Napieralski 1b2a5bb417 use SEO friendly images for mobile in infoboxes 2016-02-05 18:02:02 +01:00
Nikodem Hynek 37f07b8f11 Merge pull request #9659 from Wikia/DAT-3624
DAT-3624 Fix for broken references in infobox image captions
2016-02-05 15:25:10 +01:00
idradm b9af596dbc DAT-3622 always pass array to custom frame on api call 2016-02-04 16:52:51 +01:00
Sebastian Marzjan c5d17f315e DAT-3624 Rename 'Infobo' to 'Infobox' 2016-02-03 12:06:44 +01:00
Rafal Leszczynski 6a40c864e6 Merge branch 'dev' into DAT-3613 2016-01-12 13:40:32 +01:00
dianafa 6406fb53d5 move helper to an independent place 2016-01-12 10:50:24 +01:00
dianafa ebfb01d73d use createDOMDocumentFromText helper 2016-01-12 10:08:37 +01:00
Sebastian Marzjan 168bf09348 DAT-3621 Unified tests for hero image and regular caption
* Disable sanitization on Oasis
* Handle previously unsupported case of nested tag ( <b><a></a></b> )
* Unify test formatting
* Change list handling (yes, I am not proud of that)
2016-01-12 09:21:21 +01:00
dianafa 96192e1fc2 silence libxml errro 2016-01-11 18:01:04 +01:00
Diana Falkowska e68ce57c7a Merge pull request #9396 from Wikia/DAT-3615
Provide explicitly encoded XML to loadHTML (libxml issues ;-) )
2016-01-08 15:42:05 +01:00
Sebastian Marzjan 531fc700e6 Provide explicitly encoded XML to loadHTML (libxml issues ;-) ) 2016-01-08 08:24:09 +01:00
Sebastian Marzjan dc561a4157 DAT-3614 Always pass an *ARRAY* of params to the infobox NodeFactory 2016-01-08 07:44:30 +01:00
Sebastian Marzjan 2171b5c02c Merge pull request #9366 from Wikia/DAT-3331
make infoboxes use params same way as mediawiki, enable 0 param
2016-01-05 17:18:33 +01:00
Adam Robak f1a8f2490a Merge pull request #9358 from Wikia/DAT-3465
DAT-3465 add infobox image caption sanitization
2016-01-05 10:27:44 +01:00
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
marzjan a5ad283fca Further code reorg 2016-01-04 12:09:39 +00:00
marzjan 7dfc5a828f Small code reorganization and cleanup 2016-01-04 11:09:50 +00:00
Sebastian Marzjan 2fdebcdffb DAT-3465 Change approach to sanitization; use XML parsing 2015-12-30 11:00:10 +01:00
Sebastian Marzjan a0569a829b Move the implements statement to base Sanitizer class 2015-12-29 08:13:02 +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
Adam Robak 5bd3cd3db6 Merge pull request #9227 from Wikia/DAT-3372
DAT-3372 Correctly decode '+' sign in infobox image
2015-12-23 15:33:39 +01:00
dianafa ed73d4f525 move sanitizing to PortableInfoboxRenderService 2015-12-23 13:20:55 +01:00
dianafa 0de509246f add caption sanitization in getImageData 2015-12-23 11:20:39 +01:00
dianafa a6aeaec4ac Merge branch 'dev' into DAT-3372 2015-12-22 13:08:51 +01:00
dianafa 1b1de67f22 fix data-image-key param 2015-12-22 13:06:50 +01:00