jacek
|
e2025721fd
|
translations
|
2015-06-01 14:11:07 +02:00 |
|
jacek
|
44cbb9cc95
|
initial commit
|
2015-05-29 16:37:35 +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 |
|
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 |
|
Rafal Leszczynski
|
4a61928991
|
remove issues after cherry-picking
|
2015-05-21 12:13:34 +02:00 |
|
Rafal Leszczynski
|
abb9f4499a
|
prevent image upsampling in infobox
|
2015-05-21 12:07:40 +02:00 |
|
Rodrigo Molinero Gomez
|
cbaa447894
|
Merge pull request #7251 from Wikia/DAT-2824
DAT-2824 Fix warnings when node has no child nodes
|
2015-05-21 10:53:55 +02:00 |
|
Rodrigo Molinero Gomez
|
82d031987a
|
Merge pull request #7261 from Wikia/DAT-2796
DAT-2796 tests for isEmpty()
|
2015-05-20 17:26:08 +02:00 |
|
Diana
|
3a706ef159
|
do not treat 0 as empty footer
|
2015-05-20 14:57:43 +00:00 |
|
Diana
|
68b9b27a93
|
test isEmpty for infobox footer
|
2015-05-20 14:38:23 +00:00 |
|
Rodrigo Molinero Gomez
|
2f4aa330ed
|
Merge pull request #7231 from Wikia/DAT-2797
handle warnings and log them
|
2015-05-20 16:21:27 +02:00 |
|
Rafal Leszczynski
|
861dcf833b
|
add htnl escaping before rendering + add additional tests for render service
|
2015-05-20 13:56:56 +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 |
|
Rafal Leszczynski
|
eeb8fd6b87
|
remove html escaping of data values
|
2015-05-20 13:56:19 +02:00 |
|
jacek
|
091ce6ef03
|
do not assume the order of errors
|
2015-05-20 12:15:22 +02:00 |
|
jacek
|
643ac321a2
|
change function from public to protected
|
2015-05-20 12:14:48 +02:00 |
|
Sebastian Marzjan
|
ea136e203c
|
Merge pull request #7233 from Wikia/DAT-2814
Dat 2814 - portable infobox fix styling issues on monobook
|
2015-05-20 11:47:28 +02:00 |
|
jacek
|
1215be5e41
|
formatting
|
2015-05-20 10:39:31 +02:00 |
|
Garth Webb
|
3f05f90cfe
|
SOC-808 Merge branch 'dev' into SOC-808
|
2015-05-19 11:21:15 -07:00 |
|
Garth Webb
|
e4afb0c697
|
SOC-808 Merge part 1 of 2
|
2015-05-19 11:20:44 -07:00 |
|
Diana
|
1052ed0a2e
|
test isEmpty()
|
2015-05-19 18:14:39 +00:00 |
|