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
|
339c7e97f0
|
DAT-2909 formatting
|
2015-07-02 13:55:39 +02:00 |
|
Rodrigo Molinero Gomez
|
def6be16b8
|
Merge pull request #7712 from Wikia/DAT-2965
DAT-2965 remove type hinting, to prevent fatal errors
|
2015-07-02 12:42:15 +02:00 |
|
Rodrigo Molinero Gomez
|
80d94831cb
|
Merge pull request #7710 from Wikia/DAT-2960
DAT-2960 ensure data is an array
|
2015-07-02 12:27:58 +02:00 |
|
idradm
|
edda7bebbd
|
DAT-2940 rename css selectors
|
2015-07-02 10:22:37 +02:00 |
|
idradm
|
5b0f91af9c
|
DAT-2962 ensure service is always on, move const to file always loaded
|
2015-07-02 09:54:06 +02:00 |
|
Rafal Leszczynski
|
04e268d57a
|
add hero tests plus general render test refactor
|
2015-07-01 18:03:57 +02:00 |
|
Rafal Leszczynski
|
22b1846820
|
move image data extend logic to separate method
|
2015-07-01 18:03:34 +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 |
|
Rafal Leszczynski
|
8afbf3a45d
|
add logic for rendering hero component inside infobox
|
2015-07-01 15:18:20 +02:00 |
|
idradm
|
9b7a24b6ba
|
DAT-2965 remove type hinting, to prevent fatal errors
|
2015-07-01 15:17:52 +02:00 |
|
Rafal Leszczynski
|
08bf993708
|
add infobox hero mobile template
|
2015-07-01 15:17:43 +02:00 |
|
idradm
|
90baa83fd8
|
DAT-2960 ensure data is an array
|
2015-07-01 15:03:54 +02:00 |
|
idradm
|
530b4ca61d
|
DAT-2961 check if parser output exists before using
|
2015-07-01 12:05:08 +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
|
127dc527ad
|
Merge remote-tracking branch 'origin/dev' into DAT-2917
|
2015-06-25 13:15:44 +02:00 |
|
Rodrigo Molinero Gomez
|
96a9f8eee4
|
Merge pull request #7598 from Wikia/DAT-2874
DAT-2874 refactor infoboxes data service, push to top infobox item
|
2015-06-25 10:51:49 +02:00 |
|
Adam Robak
|
923edbcb31
|
Merge pull request #7601 from Wikia/DAT-2920
DAT-2920 clean up thumbnail creating logic for portable infoboxes - special ca…
|
2015-06-25 10:10:28 +02:00 |
|
idradm
|
48072ab3f0
|
DAT-2917 fix double preprocess breaking inclusion functionality
|
2015-06-24 14:09:58 +02:00 |
|
Diana
|
c63327e68b
|
remove unused const var
|
2015-06-23 17:35:10 +02:00 |
|
Rafal Leszczynski
|
3e3a0acc44
|
hardcode infobox item-value font size + reduce this size for tabular layout
|
2015-06-23 16:12:30 +02:00 |
|
Diana
|
3816c0c88d
|
refactor extractSourceFromNode
|
2015-06-23 12:25:37 +00: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
|
42900d2ffd
|
refactor getValueWithDefault()
|
2015-06-23 11:10:37 +00: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 |
|
Adam Robak
|
1d7e00224a
|
Merge pull request #7533 from Wikia/DAT-2895
DAT-2895 Support gallery as image source in new infoboxes
|
2015-06-22 18:49:33 +02:00 |
|
idradm
|
26b3f2c545
|
DAT-2874 test fixes
|
2015-06-22 18:29:27 +02:00 |
|
Diana
|
cfdc27f665
|
remove empty line
|
2015-06-22 15:51:59 +00:00 |
|
Rafal Leszczynski
|
26912d1bb6
|
clean up thumbnail creating logic for portable infoboxes - special case for Vignette no longer needed
|
2015-06-22 17:45:44 +02:00 |
|
Diana
|
da9648461e
|
small testing
|
2015-06-22 15:38:47 +00:00 |
|
idradm
|
366b296314
|
Merge branch 'dev' into DAT-2874
|
2015-06-22 17:25:17 +02:00 |
|
idradm
|
02a2d0c3c1
|
DAT-2874 refactor infoboxes data service, push to top infobox item
|
2015-06-22 17:15:26 +02:00 |
|
Diana
|
4a183481c3
|
works
|
2015-06-22 13:53:01 +00:00 |
|
Diana
|
9127516300
|
tabs
|
2015-06-21 18:05:19 +00:00 |
|
Diana
|
f88ef0fbb0
|
fix flex-basis for labelless fields
|
2015-06-21 18:01:37 +00:00 |
|
Sebastian Marzjan
|
aa0b067f96
|
Merge branch 'DAT-2895' of github.com:Wikia/app into DAT-2895
|
2015-06-19 16:11:32 +02:00 |
|
Diana
|
dfb202ab32
|
Merge pull request #7549 from Wikia/DAT-2880
DAT-2880 add bottom border
|
2015-06-19 15:55:00 +02:00 |
|
Sebastian Marzjan
|
17e82774c9
|
Address code review remarks
|
2015-06-19 15:50:25 +02:00 |
|
Sebastian Marzjan
|
5375ae8541
|
Address code review remarks
|
2015-06-19 15:36:16 +02: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
|
ad12549cb8
|
DAT-2895 Address CR remarks; Simplify trim call and returning of value
|
2015-06-19 15:35:35 +02:00 |
|
Sebastian Marzjan
|
df3966be4e
|
DAT-2895 Support gallery as image source in new infoboxes
|
2015-06-19 15:35:35 +02:00 |
|
idradm
|
2b6d2f60e6
|
fix scss formatting
|
2015-06-19 15:03:11 +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 |
|
Rafal Leszczynski
|
f0082834e9
|
fix infobox item element border bottom issues
|
2015-06-19 14:37:45 +02:00 |
|