jacek
|
bdd107445b
|
Merge branch 'portable_infobox_mvp' into DAT-2762
# Conflicts:
# extensions/wikia/PortableInfobox/tests/XmlParserTest.php
|
2015-05-07 15:29:44 +02:00 |
|
jacek
|
5126ac630d
|
remove isempty checks in render service
|
2015-05-07 15:25:26 +02:00 |
|
Adam Robak
|
f60278a8e3
|
switch to recursive parsing for all elements
|
2015-05-07 15:19:46 +02:00 |
|
jacek
|
a55b473ccb
|
Merge branch 'portable_infobox_mvp' into DAT-2762
|
2015-05-07 15:12:27 +02:00 |
|
jacek
|
e608c3d877
|
Merge branch 'portable_infobox_mvp' into DAT-2762
# Conflicts:
# extensions/wikia/PortableInfobox/tests/XmlParserTest.php
|
2015-05-07 15:10:56 +02:00 |
|
Adam Robak
|
21b2c0fb9b
|
fix missing url
|
2015-05-07 15:09:24 +02:00 |
|
Jacek Jursza
|
61f7c1705f
|
Merge pull request #7138 from Wikia/DAT-2769
tests
|
2015-05-07 15:02:44 +02:00 |
|
jacek
|
0a5908775c
|
typo fix
|
2015-05-07 15:01:48 +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
|
e98d9f372a
|
fix formatting
|
2015-05-07 14:46:17 +02:00 |
|
Adam Robak
|
782847bc31
|
removed unused code
|
2015-05-07 14:38:31 +02:00 |
|
Adam Robak
|
242bada43d
|
external parser approach changed, tests fixed, refactoring
|
2015-05-07 14:37:13 +02:00 |
|
jacek
|
a65ff09246
|
tests
|
2015-05-07 14:36:30 +02:00 |
|
Adam Robak
|
9cd65fa63c
|
remove duplicated test, added TODO comment for resources loading
|
2015-05-07 13:58:21 +02:00 |
|
Adam Robak
|
ce1b842110
|
methods docs added
|
2015-05-07 13:54:26 +02:00 |
|
Adam Robak
|
de8533e1c5
|
wikitext parsing approach changed
|
2015-05-07 13:48:57 +02:00 |
|
jacek
|
2e25be4150
|
comments
|
2015-05-07 11:48:43 +02:00 |
|
jacek
|
a55a6a879e
|
fix xml parser tests
|
2015-05-07 11:46:41 +02:00 |
|
Adam Robak
|
b1e0d76a5d
|
change markertype to general
|
2015-05-07 10:51:03 +02:00 |
|
Adam Robak
|
f2638e8afd
|
add unittest for P wrapping check
|
2015-05-07 10:00:18 +02:00 |
|
Adam Robak
|
ff6c367bc7
|
remove not needed hooks
|
2015-05-07 09:11:05 +02:00 |
|
jacek
|
42a333565c
|
Merge branch 'portable_infobox_mvp' into DAT-2762
|
2015-05-06 18:24:28 +02:00 |
|
Jacek Jursza
|
ce06f16252
|
Merge pull request #7123 from Wikia/DAT-2746
Dat 2746 - add lightbox support for infobox images and move thumbnail creation to php
|
2015-05-06 18:17:21 +02:00 |
|
jacek
|
94ae246c4e
|
check for empty node
|
2015-05-06 17:55:11 +02:00 |
|
Rafal Leszczynski
|
f9cc2ac9e4
|
update test after changing node image data model
|
2015-05-06 17:49:16 +02:00 |
|
Rafal Leszczynski
|
e6113be4f2
|
Merge pull request #7116 from Wikia/DAT-2763
error handling
|
2015-05-06 17:42:59 +02:00 |
|
Rafal Leszczynski
|
24ebb53176
|
Merge branch 'dev' into DAT-2763
|
2015-05-06 17:12:00 +02:00 |
|
Adam Robak
|
a420b6f1e2
|
clean up
|
2015-05-06 17:05:42 +02:00 |
|
Adam Robak
|
17abbcc5ee
|
do only internal parsing
|
2015-05-06 17:04:37 +02:00 |
|
Rafal Leszczynski
|
db745fd097
|
remove unused js logic for portable infobox - moved thumbnail generator to php
|
2015-05-06 16:32:37 +02:00 |
|
Rafal Leszczynski
|
eca796b4ce
|
add todo comment for image render logic
|
2015-05-06 16:31:57 +02:00 |
|
marzjan
|
99b74c85ae
|
DAT-2760 Add tests for two more cases
|
2015-05-06 14:27:58 +00:00 |
|
Rafal Leszczynski
|
fc1db8f15a
|
call proper vignette scaling method
|
2015-05-06 16:21:11 +02:00 |
|
Rafal Leszczynski
|
7b852d80b4
|
add missing thumbnail width cont
|
2015-05-06 16:16:16 +02:00 |
|
Rafal Leszczynski
|
440b1e934b
|
overwrite isEmpty method for image node to check for url instead of value
|
2015-05-06 16:11:04 +02:00 |
|
Rafal Leszczynski
|
f6a05dbfdf
|
modify image templete to use new image data
|
2015-05-06 16:03:07 +02:00 |
|
Rafal Leszczynski
|
7221cfacb9
|
add thumbnail url to image data
|
2015-05-06 16:02:44 +02:00 |
|
Rafal Leszczynski
|
e1e25d77bb
|
change naming in image data model
|
2015-05-06 16:02:28 +02:00 |
|
Rafal Leszczynski
|
3109e908b9
|
Merge branch 'portable_infobox_mvp' into DAT-2746
|
2015-05-06 15:10:08 +02:00 |
|
Rafal Leszczynski
|
07dc91da6e
|
add missing new line
|
2015-05-06 14:56:40 +02:00 |
|
Rafal Leszczynski
|
200d1d491c
|
add missing new line
|
2015-05-06 14:56:19 +02:00 |
|
Adam Robak
|
f9c443432e
|
remove unsued files
|
2015-05-06 14:52:24 +02:00 |
|
jacek
|
29d6dfb155
|
error handling
|
2015-05-06 14:50:10 +02:00 |
|
Adam Robak
|
afda182794
|
DAT-2738 introduce aside tag into parser and infobox extension
|
2015-05-06 14:49:46 +02:00 |
|
Rafal Leszczynski
|
f6e2f258ec
|
Merge branch 'dev' into portable_infobox_mvp
|
2015-05-06 14:44:58 +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 |
|
Rafal Leszczynski
|
ffa214c033
|
modify image template to work with lightbox
|
2015-05-05 12:38:20 +02:00 |
|
Rafal Leszczynski
|
b1f2cabf03
|
add image name to image data model
|
2015-05-05 12:37:47 +02:00 |
|