idradm
|
e065533850
|
Merge remote-tracking branch 'origin/dev' into DAT-2909
# Conflicts:
# extensions/wikia/GameGuides/assets/GameGuidesAssets.json
# extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
|
2015-07-03 10:51:32 +02:00 |
|
Rodrigo Molinero Gomez
|
7360054705
|
Merge pull request #7698 from Wikia/DAT-2944
DAT-2944 remove source for label tag functionality
|
2015-07-02 16:38:03 +02:00 |
|
Rodrigo Molinero Gomez
|
d2a069d56d
|
Merge pull request #7714 from Wikia/DAT-2940
DAT-2940 rename footer tag to navigation
|
2015-07-02 15:27:47 +02:00 |
|
idradm
|
edda7bebbd
|
DAT-2940 rename css selectors
|
2015-07-02 10:22:37 +02:00 |
|
Rafal Leszczynski
|
04e268d57a
|
add hero tests plus general render test refactor
|
2015-07-01 18:03:57 +02:00 |
|
Rafal Leszczynski
|
57e5d5f59f
|
add render tests for hero component
|
2015-07-01 16:34:34 +02:00 |
|
idradm
|
26269c9150
|
DAT-2940 rename footer tag to navigation
|
2015-07-01 16:19:31 +02:00 |
|
idradm
|
9b7a24b6ba
|
DAT-2965 remove type hinting, to prevent fatal errors
|
2015-07-01 15:17:52 +02:00 |
|
idradm
|
766f39f75d
|
DAT-2944 remove source for label tag functionality
|
2015-07-01 10:55:58 +02:00 |
|
Rafal Leszczynski
|
f197b3e2ea
|
Merge pull request #7600 from Wikia/DAT-2818
DAT-2818 Infoboxes field mutators
|
2015-06-26 11:28:37 +02:00 |
|
idradm
|
29580c1c9d
|
Merge remote-tracking branch 'origin/dev' into DAT-2874
# Conflicts:
# extensions/wikia/PortableInfobox/PortableInfoboxHooks.class.php
|
2015-06-23 13:31:56 +02:00 |
|
Diana
|
c46246cd47
|
add tests for getSource
|
2015-06-23 11:05:25 +00:00 |
|
idradm
|
d7f5995e72
|
DAT-2874 remove constructor calls in favor of newFrom approach
|
2015-06-23 10:41:15 +02:00 |
|
idradm
|
26b3f2c545
|
DAT-2874 test fixes
|
2015-06-22 18:29:27 +02:00 |
|
Diana
|
da9648461e
|
small testing
|
2015-06-22 15:38:47 +00:00 |
|
Sebastian Marzjan
|
1c0b69edee
|
DAT-2895 Fetch gallery data if available for image tag in new infoboxes
|
2015-06-19 15:36:16 +02:00 |
|
Sebastian Marzjan
|
df3966be4e
|
DAT-2895 Support gallery as image source in new infoboxes
|
2015-06-19 15:35:35 +02:00 |
|
idradm
|
3e8a665242
|
Merge remote-tracking branch 'origin/dev' into DAT-2839
# Conflicts:
# extensions/wikia/PortableInfobox/PortableInfobox.setup.php
# extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
# extensions/wikia/PortableInfobox/services/Parser/XmlParser.php
# extensions/wikia/PortableInfobox/styles/PortableInfobox.scss
|
2015-06-19 14:43:40 +02:00 |
|
idradm
|
545880a804
|
Merge remote-tracking branch 'origin/dev' into DAT-2792
# Conflicts:
# includes/wikia/api/InfoboxApiController.class.php
|
2015-06-18 13:03:51 +02:00 |
|
idradm
|
6ab4e92781
|
DAT-2875 add comparison without set
|
2015-06-16 12:59:00 +02:00 |
|
idradm
|
81e1754a02
|
DAT-2875 variables matcher fixed, suitable tests added
|
2015-06-16 10:52:18 +02:00 |
|
idradm
|
864327b5f3
|
DAT-2875 add duplicate source test
|
2015-06-15 15:34:54 +02:00 |
|
idradm
|
b9d4925f52
|
groups leyout refactor
|
2015-06-15 14:58:48 +02:00 |
|
idradm
|
cae634dfb1
|
Merge remote-tracking branch 'origin/dev' into DAT-2875-refactor
# Conflicts:
# extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
# extensions/wikia/PortableInfobox/services/Parser/Nodes/NodeGroup.php
# extensions/wikia/PortableInfobox/tests/ParserNodesTest.php
|
2015-06-15 14:57:57 +02:00 |
|
idradm
|
96c1c691b7
|
DAT-2891 block elements will now be parsed correctly, test added
|
2015-06-15 12:43:13 +02:00 |
|
idradm
|
197c040d8e
|
DAT-2875 removed isempty and source from render data fields, more tests added, formatting clean up
|
2015-06-12 15:43:37 +02:00 |
|
Rafal Leszczynski
|
f569991469
|
Merge pull request #7488 from Wikia/DAT-2857
DAT-2857 Horizontal group
|
2015-06-12 15:23:44 +02:00 |
|
Rafal Leszczynski
|
eb3c40a8dc
|
Merge pull request #7430 from Wikia/infobox-tabular-layout
DAT-2856 Infobox tabular layout
|
2015-06-12 12:51:15 +02:00 |
|
idradm
|
31e403d6d4
|
DAT-2875 switch to protected
|
2015-06-12 10:59:25 +02:00 |
|
idradm
|
1bcae301b1
|
DAT-2875 clean up libxml errors after tests
|
2015-06-12 10:58:38 +02:00 |
|
Diana
|
098b1f9b89
|
fix tests
|
2015-06-11 17:53:34 +00:00 |
|
dianafa
|
753e320027
|
merge with dev
|
2015-06-11 19:36:28 +02:00 |
|
Diana
|
4ab9e94270
|
add renderservicetest case
|
2015-06-11 17:28:49 +00:00 |
|
idradm
|
dbe46fbd90
|
change revert
|
2015-06-11 18:38:08 +02:00 |
|
idradm
|
01a9e2cc13
|
test change
|
2015-06-11 18:31:15 +02:00 |
|
idradm
|
29f713997c
|
DAT-2875 test refactoring
|
2015-06-11 14:51:54 +02:00 |
|
Rafal Leszczynski
|
45aa4f847d
|
fix typo in var name
|
2015-06-11 13:19:05 +02:00 |
|
Rafal Leszczynski
|
96ced03f8a
|
add unit tests for params validator
|
2015-06-11 12:54:10 +02:00 |
|
Diana
|
368d233930
|
working group layout
|
2015-06-10 16:07:28 +00:00 |
|
dianafa
|
76b4b3fbb7
|
change theme to layout
|
2015-06-10 17:24:49 +02:00 |
|
idradm
|
1abbaab514
|
DAT-2875 nodes refactoring, xmlParser will be used only for parsing
|
2015-06-10 17:19:40 +02:00 |
|
dianafa
|
fb681591e0
|
prototype test
|
2015-06-09 19:35:19 +02:00 |
|
jacek
|
62aea4d08d
|
PR fix
|
2015-06-09 16:16:48 +02:00 |
|
jacek
|
0c7cfe261d
|
PR fix
|
2015-06-09 14:31:04 +02:00 |
|
dianafa
|
acff223c0e
|
refactor tests and css selectors
|
2015-06-09 11:40:32 +02:00 |
|
idradm
|
a6d3f2fd07
|
DAT-2816 code refactor, double label or default tag test added
|
2015-06-09 10:41:45 +02:00 |
|
Diana
|
c3dcfb9d66
|
refactor tests
|
2015-06-08 15:25:48 +00:00 |
|
Diana
|
1ce89defbf
|
refactor test
|
2015-06-08 16:35:02 +02:00 |
|
idradm
|
6655e1fc30
|
DAT-2816 introduce source attribute for label tag, tests refactor
|
2015-06-08 15:56:08 +02:00 |
|
Diana
|
85ade87f25
|
test1
|
2015-06-08 12:49:23 +00:00 |
|
dianafa
|
7d5d42e9f4
|
merge with dev
|
2015-06-08 12:11:03 +02:00 |
|
Diana
|
7342ffbeb0
|
add tests and functionality
|
2015-06-03 13:48:44 +00:00 |
|
Adam Robak
|
7978ed0b96
|
DAT-2845 add infobox parser api
|
2015-05-29 15:05:08 +02:00 |
|
Rafal Leszczynski
|
b523ab5083
|
fix portable infobox render service tests
|
2015-05-25 23:48:22 +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 |
|
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 |
|
Adam Robak
|
644b5e22e2
|
DAT-2812 add custom theming
|
2015-05-25 23:32:27 +00:00 |
|
jacek
|
e789c6d242
|
extend tests
|
2015-05-25 23:32:24 +00: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 |
|
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 |
|
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
|
f9c31ad797
|
fix tests for render service
|
2015-05-21 13:06:54 +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 |
|
jacek
|
091ce6ef03
|
do not assume the order of errors
|
2015-05-20 12:15:22 +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 |
|
jacek
|
4e95de59d8
|
constants
|
2015-05-19 16:43:55 +02:00 |
|
jacek
|
4eaf7be472
|
extract logging to external function
|
2015-05-19 16:01:53 +02:00 |
|
Diana
|
f8bcf4f2a8
|
fix tests
|
2015-05-19 10:01:09 +00:00 |
|
jacek
|
03aea58681
|
extend tests
|
2015-05-19 10:26:41 +02:00 |
|
Diana
|
0de06cdc14
|
whitespaces
|
2015-05-18 16:29:30 +00:00 |
|
Diana
|
469815c703
|
add unit test
|
2015-05-18 16:26:34 +00:00 |
|
Sebastian Marzjan
|
69b9abc0af
|
DAT-2785 and DAT-2784 - Handle InnerXML properly
Remove obsolete test
|
2015-05-13 13:52:31 +02:00 |
|
Rafal Leszczynski
|
f4f42d4147
|
remove var_dump from tests
|
2015-05-11 17:25:09 +02:00 |
|
Rafal Leszczynski
|
e7fdcbc778
|
fix issues with image name being passed to template
|
2015-05-11 17:07:07 +02:00 |
|
marzjan
|
501ab60b1c
|
DAT-2760 Add test, address CR remarks
|
2015-05-11 08:44:24 +00:00 |
|
marzjan
|
a12689378d
|
DAT-2760 Support images in diffent formats
* replace variables in image tag
* remove obsolete test
|
2015-05-08 15:59:00 +00:00 |
|
Adam Robak
|
4be7113588
|
unit test changes to match marker introduction
|
2015-05-08 11:54:31 +02:00 |
|
jacek
|
fe837daac5
|
tests
|
2015-05-07 15:52:29 +02:00 |
|
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
|
e608c3d877
|
Merge branch 'portable_infobox_mvp' into DAT-2762
# Conflicts:
# extensions/wikia/PortableInfobox/tests/XmlParserTest.php
|
2015-05-07 15:10:56 +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
|
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 |
|
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
|
f2638e8afd
|
add unittest for P wrapping check
|
2015-05-07 10:00:18 +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 |
|
Rafal Leszczynski
|
f9cc2ac9e4
|
update test after changing node image data model
|
2015-05-06 17:49:16 +02:00 |
|
marzjan
|
99b74c85ae
|
DAT-2760 Add tests for two more cases
|
2015-05-06 14:27:58 +00:00 |
|
Rafal Leszczynski
|
f6e2f258ec
|
Merge branch 'dev' into portable_infobox_mvp
|
2015-05-06 14:44:58 +02:00 |
|
Sebastian Marzjan
|
958e073d8a
|
Merge pull request #7103 from Wikia/DAT-2760
DAT-2760 Backwards compatibility in <image> tag for portable infoboxes
|
2015-05-05 12:25:37 +02:00 |
|
marzjan
|
fe390a9f53
|
DAT-2760 Implement cases for backwards compatibility of infobox markup (image tag)
|
2015-05-05 07:32:16 +00:00 |
|
jacek
|
e90b441f43
|
footer
|
2015-05-04 16:56:39 +02:00 |
|
marzjan
|
6914257db9
|
DAT-2760 Initial commit; Streamline files; Add first test
|
2015-05-04 14:43:53 +00:00 |
|
Rafal Leszczynski
|
c56d3ebdaf
|
add additional renderService tests
|
2015-05-04 16:30:40 +02:00 |
|
jacek
|
99ca2eb705
|
footer
|
2015-05-04 16:16:35 +02:00 |
|
jacek
|
87d1005f1b
|
test fix
|
2015-05-04 14:45:06 +02:00 |
|
jacek
|
32545e8f66
|
Merge branch 'portable_infobox_mvp' into DAT-2757
# Conflicts:
# extensions/wikia/PortableInfobox/tests/ParserNodesTest.php
|
2015-05-04 14:36:37 +02:00 |
|
jacek
|
70309c5ed3
|
modify tests
|
2015-05-04 13:55:52 +02:00 |
|
marzjan
|
4de71fec0f
|
DAT-2757 Based on initial feedback, rename <pair> to <data>
|
2015-05-04 10:48:57 +00:00 |
|
Sebastian Marzjan
|
d8eb7391d3
|
Portable Infoboxes - initial release behind WF flag
|
2015-04-28 09:00:26 +02:00 |
|