Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-12-20 04:00:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
949 commits 7 branches 4 tags 32 MiB
Commit graph

949 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Rafal Leszczynski bd9dc38966 Merge branch 'dev' into DAT-2880 2015-06-19 12:15:28 +02:00
Rafal Leszczynski a29b1fb160 fix comparison and group bottom border issues 2015-06-19 12:13:30 +02:00
Diana bec30303e2 merge with dev 2015-06-18 15:18:35 +00:00
Diana 216dc462f5 take care of lists 2015-06-18 14:47:38 +00: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
Rodrigo Molinero Gomez 9b4d70899e Merge pull request #7545 from Wikia/DAT-2902 
DAT-2902 fix label font size in horizontal group
 2015-06-18 12:46:29 +02:00
Diana 75fefe3a87 refactor 2015-06-17 18:24:28 +00:00
Diana 89e8474bcc add bottom border 2015-06-17 15:15:18 +00:00
Diana 3dedee922f fix line height 2015-06-17 13:42:04 +00:00
Rafal Leszczynski 404b0c5897 fix label font size in horizontal group 2015-06-17 14:34:20 +02:00
Rafal Leszczynski d0e518beae remove tabular layout inside horizontal group 2015-06-17 13:51:05 +02:00
dianafa d3638ddc9a fix line height 2015-06-17 12:00:10 +02:00
Rodrigo Molinero Gomez 39fbaef3cb Merge pull request #7467 from Wikia/DAT-2875-refactor 
Dat 2875 + refactor
 2015-06-16 16:44:34 +02:00
Diana 6e11102386 update bad padding 2015-06-16 15:49:15 +02:00
Rafal Leszczynski cac92dab95 Merge pull request #7465 from Wikia/DAT-2871 
validate infobox tag attributes
 2015-06-16 14:29:03 +02:00
idradm 87e83502b8 DAT-2875 check for empty nodes updated 2015-06-16 13:45:27 +02:00
Sebastian Marzjan 46d7894ae2 Merge pull request #7498 from Wikia/DAT-2885 
Dat 2885 - change portable infobox default theme colors
 2015-06-16 13:24:48 +02:00
idradm 6ab4e92781 DAT-2875 add comparison without set 2015-06-16 12:59:00 +02:00
idradm c73ff55883 DAT-2875 remove generator functionality 2015-06-16 11:00:39 +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 70a5a7511c DAT-2875 missing ref element fix 2015-06-12 16:47:37 +02:00
idradm 6d15673e5e DAT-2875 comment added 2015-06-12 15:51:25 +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 f1d77bcf70 reset headers font color to default 2015-06-12 15:36:24 +02:00
Rafal Leszczynski 581f5458be change infobox default color theme calulation 2015-06-12 15:32:25 +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 a3e9b2b92a fix linting issues 2015-06-12 12:56:28 +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
Rafal Leszczynski c82a5cd05e Merge branch 'infobox-tabular-layout' of https://github.com/Wikia/app into infobox-tabular-layout 2015-06-12 12:39:32 +02:00
Rafal Leszczynski 24d23698aa fix linting issues 2015-06-12 12:38:17 +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 f279f1477c call static prop 2015-06-12 01:00:52 +00:00
Diana 3418836533 remove redundant var 2015-06-12 00:11:23 +00: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 e2a0a2273e Merge branch 'dev' into DAT-2875-refactor 
# Conflicts:
#	extensions/wikia/PortableInfobox/services/Parser/Nodes/Node.php
#	extensions/wikia/PortableInfobox/services/Parser/Nodes/NodeData.php
#	extensions/wikia/PortableInfobox/tests/ParserNodesTest.php
 2015-06-11 19:12:55 +02:00
Diana b698b32170 styles 2015-06-11 17:03:57 +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 c86e795f48 DAT-2875 infobox api change, action query prop for infobox introduced 2015-06-11 18:08:51 +02:00
Diana 20289950d1 getXmlAttributeFromSupported 2015-06-11 13:36:57 +00:00
idradm 29f713997c DAT-2875 test refactoring 2015-06-11 14:51:54 +02:00