Commit graph

199 commits

Author SHA1 Message Date
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
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 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
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
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
idradm 4e6298f881 DAT-2866 citation error wont be showing up when partial parse is run 2015-06-03 13:40:26 +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
Adam Robak 3d3d682e69 DAT-2845 missing space in comment 2015-06-01 11:40:06 +02:00
Adam Robak 369209b5f7 DAT-2845 ensure params are correctly acquired 2015-06-01 10:59:20 +02:00
rafal.kalinski 70482ae609 Merge remote-tracking branch 'origin/dev' into SOC-812 2015-05-29 18:47:59 +00:00
Adam Robak 7978ed0b96 DAT-2845 add infobox parser api 2015-05-29 15:05:08 +02:00
Piotr Gabryjeluk 91b21f5b73 Merge pull request #7297 from Wikia/aden-1960-improve-playwire-placement
ADEN-1960 Improve playwire placement
2015-05-26 18:07:21 +02:00
nAndy 75e60c8bcc ADEN-1960 manually merged origin/dev
Resolved conflicts in:
* AdEngine/js/AdLogicPageDimensions.js,
* AdEngine/js/provider/directGpt.js
2015-05-26 12:01:16 +00:00
nAndy 0fee93ec6d ADEN-1960 manually merged origin/dev
And resolved conflicts in:
* AdEngine/js/AdLogicPageDimensions.js,
* AdEngine/js/provider/directGpt.js,
* AdEngine/js/run/desktop.run.js.
2015-05-26 11:21:46 +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
rafal.kalinski 007c60fa22 Merge remote-tracking branch 'origin/dev' into SOC-812 2015-05-25 23:52:33 +00: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
Rafal Leszczynski b523ab5083 fix portable infobox render service tests 2015-05-25 23:48:22 +00:00
jacek 7fa5668c65 comments 2015-05-25 23:48:21 +00:00
jacek 4ac663f665 simplify 2015-05-25 23:48:20 +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
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
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
Rafal Leszczynski d28749eac7 remove html escaping of data values 2015-05-25 23:34:50 +00:00
Rafal Leszczynski 0ad49267af styling image captions inside infobox 2015-05-25 23:34:49 +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
Rafal Leszczynski 9aeef8670e add caption to image template 2015-05-25 23:32:25 +00:00
jacek e789c6d242 extend tests 2015-05-25 23:32:24 +00:00
jacek b95b09c0a8 add caption to the parser 2015-05-25 23:32:24 +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
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
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
Rodrigo Molinero Gomez 1053a8bf21 Merge pull request #7255 from Wikia/DAT-2812
Dat 2812 add support for image caption to portable infoboxes
2015-05-25 12:40:19 +02:00
jacek 0f99d95286 simplify 2015-05-25 12:25:14 +02:00