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 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 |
|
jacek
|
0f99d95286
|
simplify
|
2015-05-25 12:25:14 +02: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 |
|
Rafal Leszczynski
|
8c0edf4b16
|
Merge pull request #7253 from Wikia/DAT-2811
DAT-2812 add custom theming
|
2015-05-22 12:31:31 +02: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
|
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 |
|
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 |
|
Rafal Leszczynski
|
eeb8fd6b87
|
remove html escaping of data values
|
2015-05-20 13:56:19 +02:00 |
|
jacek
|
643ac321a2
|
change function from public to protected
|
2015-05-20 12:14:48 +02:00 |
|
jacek
|
1215be5e41
|
formatting
|
2015-05-20 10:39:31 +02: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 |
|
Adam Robak
|
77679f2b9f
|
DAT-2812 add custom theming
|
2015-05-19 17:20:15 +02:00 |
|
Rafal Leszczynski
|
09edb75302
|
change logic for getting name and key values to match with default mobile image rendering logic
|
2015-05-19 17:00:28 +02:00 |
|
marzjan
|
9d37137680
|
DAT-2824 Use better child node checking
|
2015-05-19 14:15:06 +00:00 |
|
jacek
|
4eaf7be472
|
extract logging to external function
|
2015-05-19 16:01:53 +02:00 |
|
Sebastian Marzjan
|
1576d2160c
|
Rename to a more appropriate name
|
2015-05-19 15:31:56 +02:00 |
|
marzjan
|
025bd86a12
|
DAT-2824 Fix warnings when node has no child nodes
|
2015-05-19 12:35:50 +00:00 |
|
jacek
|
6ab700c853
|
extract logging to external function
|
2015-05-19 12:49:35 +02:00 |
|
jacek
|
6405c1050a
|
add caption to the parser
|
2015-05-19 09:56:57 +02:00 |
|
jacek
|
45918aafc3
|
logging change
|
2015-05-18 17:08:53 +02:00 |
|
Diana
|
31e6014faa
|
treat '0' like a non-empty string
|
2015-05-18 13:54:25 +00:00 |
|
jacek
|
808026dae1
|
cr
|
2015-05-18 15:36:04 +02:00 |
|
jacek
|
7ad0c01c19
|
handle warnings and log them
|
2015-05-18 14:51:55 +02:00 |
|
Sebastian Marzjan
|
69b9abc0af
|
DAT-2785 and DAT-2784 - Handle InnerXML properly
Remove obsolete test
|
2015-05-13 13:52:31 +02:00 |
|
Jacek Jursza
|
6fefa10110
|
Merge pull request #7145 from Wikia/DAT-2770
Dat 2770 - add different thumbnail size for infobox images on mobile
|
2015-05-12 13:44:58 +02:00 |
|
Rafal Leszczynski
|
7331f2640f
|
add mobile image template
|
2015-05-12 13:32:42 +02:00 |
|
Adam Robak
|
a7542484ed
|
Merge pull request #7162 from Wikia/portable-infobox-inner-xml
Portable infobox inner xml
|
2015-05-12 08:15:37 +02:00 |
|
Rafal Leszczynski
|
6b9d0ab239
|
fix indentation
|
2015-05-11 17:28:43 +02:00 |
|
Rafal Leszczynski
|
95107e7244
|
Merge branch 'portable_infobox_mvp' into DAT-2770
|
2015-05-11 17:24:19 +02:00 |
|
Rafal Leszczynski
|
e7fdcbc778
|
fix issues with image name being passed to template
|
2015-05-11 17:07:07 +02:00 |
|
jacek
|
f32f24689a
|
add hook to node image
|
2015-05-11 14:36:23 +02:00 |
|