Commit graph

1050 commits

Author SHA1 Message Date
idradm 47adca6ea1 Restore "Merge pull request #12220 from Wikia/XW-2448"
This reverts commit 50d81602c84b9474e070d6c1a8e2995cd9b8d91b.

# Conflicts:
#	extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
2017-01-25 12:18:20 +01:00
Damian Jozwiak e853a8c887 XW-2620 | PortableInfoboxes - fix image width 2017-01-18 09:06:11 +01:00
macbre 66c995a659 Revert "Merge pull request #12220 from Wikia/XW-2448"
It causes https://wikia-inc.atlassian.net/browse/SUS-1483

Notice: Array to string conversion in /usr/wikia/source/app/includes/parser/StripState.php on line 98

"Array" string is displayed on blog posts listing.

This reverts commit 37d1519605836c8144ea36c9951577e65ce71d9e, reversing
changes made to 0eb38a5cb2fced6e7f3dd1853150ab950d7dffe8.

Conflicts:
	extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
2017-01-17 12:31:06 +01:00
idradm d9158f0925 XW-2473 remove no longer valid comments, add missing params to input value 2017-01-13 16:23:21 +01:00
idradm 3c1d61dbcb Merge branch 'dev' into XW-2473 2017-01-13 16:18:53 +01:00
idradm 35ddb454af XW-2569 fix tests, close html tag correctly 2017-01-13 16:17:01 +01:00
Mateusz Rybarski ffdf4f3f62 Merge branch 'dev' into XW-2591 2017-01-13 15:57:38 +01:00
Mateusz Rybarski 5af2d8df31 XW-2448: removing unused const 2017-01-13 15:37:16 +01:00
Mateusz Rybarski d53e54d83e XW-2448: || instead of array_merge 2017-01-13 15:34:02 +01:00
Karol Tatala 29e2d8b25d XW-2591 | change assignment to imgTagDimensions 2017-01-13 15:27:48 +01:00
Mateusz Rybarski a28b14ac94 XW-2448: checking if infobox contains tabber or gallery using markers 2017-01-13 15:18:05 +01:00
Karol Tatala b89b4b4620 XW-2591 | fix variable name in ratio calculation 2017-01-13 14:19:30 +01:00
Karol Tatala ce5cbe1da9 Merge branch 'dev' of https://github.com/Wikia/app into XW-2591 2017-01-13 14:05:04 +01:00
Karol Tatala c3e60959c9 XW-2591 | fix jumping images in PI, image tag size different than image file size 2017-01-13 13:57:17 +01:00
idradm 76cdfad2ec Merge branch 'dev' into XW-2448 2017-01-13 13:17:05 +01:00
Karol Tatala 5b78b1404a XW-2569 | override stacked layout padding for labels in europa 2017-01-13 12:11:23 +01:00
Karol Tatala 7b23eedbef XW-2569 | remove display flex from labels 2017-01-13 11:57:31 +01:00
idradm 27cbf6c901 XW-2569 fix monobook label paddings, top align horizontal group labels 2017-01-13 11:21:55 +01:00
idradm ab6e587806 XW-2569 fix classic skin borders, align horizontal labels properly for europa skin 2017-01-13 11:04:10 +01:00
Mateusz Rybarski 900652b3a7 XW-2448: reducing returns from method 2017-01-13 10:49:05 +01:00
Mateusz Rybarski a5e6896f5f XW-2448: not changing array items while iterating, changing methods order 2017-01-13 10:47:10 +01:00
Karol Tatala c57f039935 XW-2569 | fix label height 2017-01-13 10:07:32 +01:00
idradm 4041ecf2be XW-2569 fix ordering 2017-01-13 09:40:17 +01:00
Mateusz Rybarski 359006fc46 XW-2448: unittests 2017-01-13 09:37:27 +01:00
idradm bc9d42d234 Merge branch 'XW-2569' into XW-2569-wrapper-styling 2017-01-13 09:34:51 +01:00
idradm 9f0b77f69e XW-2473 fix tests after class changes 2017-01-13 09:30:53 +01:00
idradm 66f131e2ba XW-2473 move file width method to image helper 2017-01-13 09:25:46 +01:00
Mateusz Rybarski 1723811417 XW-2448: cleanup 2017-01-13 08:51:14 +01:00
Karol Tatala f10c0e232d XW-2569 | new line at EOF 2017-01-12 16:30:25 +01:00
Mateusz Rybarski e6edafb61c XW-2448: rendering images with caption or first one 2017-01-12 16:29:14 +01:00
Karol Tatala 786d00f8d0 XW-2569 | styling PI smart groups 2017-01-12 15:55:37 +01:00
idradm 34a876a862 XW-2473 fix hero data calculation 2017-01-12 15:32:07 +01:00
Mateusz Rybarski 182de59c7b XW-2448: using foreach loops 2017-01-12 15:05:11 +01:00
Mateusz Rybarski ce18ff7649 XW-2448: get rid of regexps while processing gallery tag in PI 2017-01-12 14:55:30 +01:00
idradm d3bbbe4832 XW-2569 move spacing class to inner element 2017-01-12 14:31:58 +01:00
idradm 07944c1ab3 XW-2569 fix message 2017-01-12 14:15:48 +01:00
idradm 577d693383 XW-2569 add test for labels rendering 2017-01-12 14:14:58 +01:00
idradm 507d7cf754 XW-2569 restructure smart groups 2017-01-12 14:11:46 +01:00
Mateusz Rybarski 2bc43b1c26 XW-2448: hook for storing gallery data (after gallery parsing) 2017-01-12 13:54:32 +01:00
idradm a2d081b230 XW-2569 introduce smart group wrapper 2017-01-12 12:40:56 +01:00
Karol Tatala c9ea033e29 XW-2569 | fix tests for calc 2017-01-11 16:55:32 +01:00
Karol Tatala 522cd0290a XW-2569 | use css calc for calculate data width 2017-01-11 16:37:49 +01:00
idradm bedf1188b4 XW-2569 increase items width calculation precision 2017-01-11 15:58:23 +01:00
Adam Robak ddb8f5141e Merge pull request #12206 from Wikia/XW-2586
XW-2586 | styling PI flex (smart) groups
2017-01-11 15:06:38 +01:00
Karol Tatala d58fd1495e XW-2586 | refactor after code review 2017-01-11 15:04:09 +01:00
idradm de6599083b XW-2569 fix multiple header collapsing 2017-01-11 14:43:45 +01:00
Karol Tatala 15a38e73a2 XW-2586 | move monobook styles to skin scss file 2017-01-11 14:30:33 +01:00
Karol Tatala e59608b9e1 XW-2586 | changes after code review 2017-01-11 14:19:25 +01:00
Karol Tatala 968af2a0b2 XW-2586 | fix for empty rowItems array 2017-01-11 13:41:25 +01:00
Karol Tatala a84fe119a5 XW-2586 | fixing tests after styling PI smart groups 2017-01-11 13:40:50 +01:00