Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-12-24 05:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
1332 commits 7 branches 4 tags 32 MiB
Commit graph

1332 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Aga Serowiec 8c36f04fde Merge pull request #7238 from Wikia/SOC-815 
SOC-815 Added cache busting and cleaned up the function slightly.
 2015-05-22 17:21:39 -07: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
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
Garth Webb 32e85bc786 Merge branch 'dev' into SOC-815 2015-05-21 11:40:06 -07:00
Garth Webb 3508baa071 SOC-815 First part of merge from dev 2015-05-21 11:38:33 -07:00
jacek bd8ae66ede initial commit; adding access to parent; checking parent type 2015-05-21 18:07:49 +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 8cb897bb00 add todo comment about generating thumbnail 2015-05-21 13:20:57 +02:00
Rafal Leszczynski f9c31ad797 fix tests for render service 2015-05-21 13:06:54 +02:00