Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-11-15 11:59:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
961 commits 8 branches 4 tags 31 MiB
Commit graph

491 commits

Author SHA1 Message Date
idradm 6b3488ffaa XW-2656 | make sure caption is set 2017-02-24 17:01:02 +01:00
idradm bd2a9cd159 XW-2656 | make sure gallery captions are escaped as well 2017-02-24 16:57:29 +01:00
idradm e6f2637ca4 XW-2771 | make sure the data is present 2017-02-22 16:56:13 +01:00
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 3c1d61dbcb Merge branch 'dev' into XW-2473 2017-01-13 16:18:53 +01:00
Mateusz Rybarski ffdf4f3f62 Merge branch 'dev' into XW-2591 2017-01-13 15:57:38 +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
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
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
Mateusz Rybarski e6edafb61c XW-2448: rendering images with caption or first one 2017-01-12 16:29:14 +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 507d7cf754 XW-2569 restructure smart groups 2017-01-12 14:11:46 +01:00
idradm a2d081b230 XW-2569 introduce smart group wrapper 2017-01-12 12:40:56 +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
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 beb6b8158f XW-2586 | set default value to false for isLastRow 2017-01-11 12:52:19 +01:00
Mateusz Rybarski 1e39fece7f Merge branch 'dev' into XW-2569 2017-01-11 12:51:13 +01:00
Karol Tatala bc917838f7 XW-2586 | add index param 2017-01-11 12:51:09 +01:00
Karol Tatala 49e121c26a XW-2586 | styling PI flex (smart) groups 2017-01-11 12:48:26 +01:00
idradm a57cc9aeaa XW-2569 rename variables 2017-01-11 12:39:02 +01:00
idradm 9ea6d19b94 Merge remote-tracking branch 'origin/XW-2587' into XW-2415-2587-release 2017-01-11 10:31:49 +01:00
idradm 28d2adbb5e Merge branch 'dev' into XW-2415 2017-01-11 10:30:14 +01:00
Mateusz Rybarski 4d9c103a86 MAIN-9507: fixing image tabs on desktop 2017-01-11 09:14:59 +01:00
idradm 36315538f4 Merge remote-tracking branch 'origin/XW-2569' into XW-2573 2017-01-10 15:33:37 +01:00
idradm 22bfec0f57 XW-2569 render smart wrapped items 2017-01-10 15:24:39 +01:00
Mateusz Rybarski 43d8db55ab XW-2572: casting row-items and span to ints 2017-01-10 14:28:24 +01:00
Mateusz Rybarski 9ac5d0b17f XW-2572: span and layout attributes for data tag 2017-01-10 13:59:46 +01:00
Karol Tatala 53304d253f XW-2351 | change image thumbnail width 2017-01-10 13:20:13 +01:00
Mateusz Rybarski 8a081b273e XW-2572: row-items attribute for group node 2017-01-10 13:05:22 +01:00
idradm 8b1289b291 Merge branch 'dev' into XW-2415 
# Conflicts:
#	extensions/VisualEditor/wikia/VisualEditor.i18n.php
#	extensions/wikia/PortableInfobox/PortableInfobox.setup.php
#	extensions/wikia/PortableInfobox/tests/PortableInfoboxParserTagControllerTest.php
#	extensions/wikia/PortableInfobox/tests/PortableInfoboxRenderServiceTest.php
 2017-01-05 12:37:59 +01:00
idradm 98954ea5b8 reformat file 2017-01-02 10:58:45 +01:00
idradm 5a9663d46a refactor metadata tag 2017-01-02 10:58:02 +01:00
idradm f517fa43cc XW-2444 reformat files 2016-12-29 14:17:48 +01:00
idradm 98f4b8d2ff XW-2444 render helper refactored 2016-12-29 11:58:27 +01:00