Commit graph

37 commits

Author SHA1 Message Date
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 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 eb3c40a8dc Merge pull request #7430 from Wikia/infobox-tabular-layout
DAT-2856 Infobox tabular layout
2015-06-12 12:51:15 +02:00
idradm c86e795f48 DAT-2875 infobox api change, action query prop for infobox introduced 2015-06-11 18:08:51 +02:00
idradm ea4aa94511 DAT-2875 nodes refactor 2015-06-11 11:34:28 +02:00
idradm 1abbaab514 DAT-2875 nodes refactoring, xmlParser will be used only for parsing 2015-06-10 17:19:40 +02:00
idradm 2ad9f22551 nodes refactoring, nodes factory introduced 2015-06-10 11:28:33 +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
dianafa acff223c0e refactor tests and css selectors 2015-06-09 11:40:32 +02:00
Diana c3dcfb9d66 refactor tests 2015-06-08 15:25:48 +00:00
Diana 99914ace85 newlines 2015-06-08 10:22:20 +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 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
Adam Robak 369209b5f7 DAT-2845 ensure params are correctly acquired 2015-06-01 10:59:20 +02:00
Adam Robak 7978ed0b96 DAT-2845 add infobox parser api 2015-05-29 15:05:08 +02:00
grunny d8349fbc0c (MAIN-4620) Sanitize custom theme class in PortableInfobox
Sanitize the custom theme class users can provide in Portable Infoboxes.
Sanitizer::escapeClass only allows valid characters in a class name
through.
2015-05-25 23:48:22 +00:00
Adam Robak e5ca491c07 DAT-2811 make sure there are no whitespaces in class name 2015-05-25 23:48:17 +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
grunny 9567ba1a5d (MAIN-4620) Sanitize custom theme class in PortableInfobox
Sanitize the custom theme class users can provide in Portable Infoboxes.
Sanitizer::escapeClass only allows valid characters in a class name
through.
2015-05-26 02:01:00 +10:00
Adam Robak 19e353e881 DAT-2811 make sure there are no whitespaces in class name 2015-05-22 12:18:54 +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
Adam Robak 77679f2b9f DAT-2812 add custom theming 2015-05-19 17:20:15 +02:00
jacek bb3814d318 encode output for use inside JSON format 2015-05-12 12:29:26 +02:00
Jacek Jursza 748518f8a1 Merge pull request #7157 from Wikia/portable_infoboxes_xml_parse_error
xml markup parse error handling
2015-05-08 14:33:06 +02:00
jacek fe75d4fd69 throw error 2015-05-08 14:04:18 +02:00
jacek a563c0144f xml markup parse error handling 2015-05-08 13:51:31 +02:00
Adam Robak 721f474381 marker number name changed 2015-05-08 11:57:08 +02:00
Adam Robak df4d460202 render infobox as marker 2015-05-08 11:48:23 +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
Adam Robak b1e0d76a5d change markertype to general 2015-05-07 10:51:03 +02:00
Adam Robak afda182794 DAT-2738 introduce aside tag into parser and infobox extension 2015-05-06 14:49:46 +02:00
jacek 179387bfda error handling 2015-05-06 14:32:36 +02:00
jacek 3b6da2a69a error handling 2015-05-06 13:16:55 +02:00
Sebastian Marzjan d8eb7391d3 Portable Infoboxes - initial release behind WF flag 2015-04-28 09:00:26 +02:00