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

213 commits

Author SHA1 Message Date
dianafa 753e320027 merge with dev 2015-06-11 19:36:28 +02: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 20289950d1 getXmlAttributeFromSupported 2015-06-11 13:36:57 +00:00
idradm 29f713997c DAT-2875 test refactoring 2015-06-11 14:51:54 +02:00
idradm d766b3a003 DAT-2875 source variables name for image node fix, get source for group nodes refactored 2015-06-11 11:48:32 +02:00
idradm ea4aa94511 DAT-2875 nodes refactor 2015-06-11 11:34:28 +02:00
Diana 368d233930 working group layout 2015-06-10 16:07:28 +00:00
idradm 29d977c0af Merge branch 'release-302-dat-2861' into release-303-dat-2861 2015-06-10 17:29:32 +02:00
idradm 495bf0acbc DAT-2876 remove not replaced markers 2015-06-10 17:26:33 +02: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
Rafal Leszczynski 9480964132 validate infobox tag attributes 2015-06-10 14:51:07 +02:00
idradm ed16bffd63 Merge branch 'release-302-dat-2861' into DAT-2875-refactor 2015-06-10 14:44:59 +02:00
idradm 0396b38175 DAT-2876 switch to internal parsing to prevent hooks errors 2015-06-10 13:55:14 +02:00
idradm 7cbfad1d19 Revert "Merge pull request #7403 from Wikia/DAT-2866" 
This reverts commit 131da376095f39b374eaa1d83c2ee734245ca3b8, reversing
changes made to 934ca821fd99f61c53d005568c07f2f9b9afd37d.
 2015-06-10 13:47:28 +02:00
Rafal Leszczynski a421a3ed21 Merge branch 'dev' into DAT-2839 2015-06-10 11:42:15 +02:00
idradm 2ad9f22551 nodes refactoring, nodes factory introduced 2015-06-10 11:28:33 +02:00
Rafal Leszczynski 51e869edaa Merge pull request #7437 from Wikia/DAT-2816 
DAT-2816 introduce source attribute for label tag, tests refactor
 2015-06-09 16:55:58 +02:00
idradm 8d53872cbf DAT-2816 docs comments changed 2015-06-09 15:09:01 +02:00
Adam Robak 40c2fc00b8 Merge pull request #7374 from Wikia/DAT-2861 
DAT-2861 add images to parser output on resolving, use same parser in…
 2015-06-09 11:48:09 +02:00
idradm a6d3f2fd07 DAT-2816 code refactor, double label or default tag test added 2015-06-09 10:41:45 +02:00
dianafa cb72c284ef getXmlAttr theme 2015-06-09 10:16:47 +02:00
idradm 6655e1fc30 DAT-2816 introduce source attribute for label tag, tests refactor 2015-06-08 15:56:08 +02:00
idradm 471bdf7b8d Merge branch 'DAT-2861' into release-302-dat-2861 2015-06-08 11:35:34 +02:00
Sebastian Marzjan 07dfc765d2 Merge pull request #7364 from Wikia/DAT-2845 
DAT-2845 add infobox parser api
 2015-06-08 10:00:38 +02:00
idradm 9c55ef194b DAT-2861 images with whitespace in names will be linked correctly now 2015-06-03 16:53:31 +02:00
idradm 4e6298f881 DAT-2866 citation error wont be showing up when partial parse is run 2015-06-03 13:40:26 +02:00
Adam Robak e476e7c07f DAT-2861 save also non existing images 2015-06-01 16:11:36 +02:00
Adam Robak be69f7146e DAT-2861 add images to parser output on resolving, use same parser instance for all parsing 2015-06-01 15:37:56 +02:00
rafal.kalinski 70482ae609 Merge remote-tracking branch 'origin/dev' into SOC-812 2015-05-29 18:47:59 +00:00
jacek 44cbb9cc95 initial commit 2015-05-29 16:37:35 +02:00
Adam Robak 7978ed0b96 DAT-2845 add infobox parser api 2015-05-29 15:05:08 +02:00
Diana 47994ffdb3 merge with dev 2015-05-26 10:57:00 +00:00
Diana 2085bc69a7 Revert "merge with dev" 
This reverts commit b369971b4cc0d219803eb94382f02f154ac430a6.
 2015-05-26 10:53:38 +00:00
Diana 01ccae3e79 merge with dev 2015-05-26 10:51:41 +00:00
rafal.kalinski 007c60fa22 Merge remote-tracking branch 'origin/dev' into SOC-812 2015-05-25 23:52:33 +00:00
jacek 7fa5668c65 comments 2015-05-25 23:48:21 +00:00
jacek 4ac663f665 simplify 2015-05-25 23:48:20 +00:00
Garth Webb fce26a692d SOC-815 First part of merge from dev 2015-05-25 23:46:40 +00:00
jacek 84de726dbe initial commit; adding access to parent; checking parent type 2015-05-25 23:38:42 +00:00
Rafal Leszczynski d28749eac7 remove html escaping of data values 2015-05-25 23:34:50 +00:00
Rafal Leszczynski a5e7fb7ae0 change logic for getting name and key values to match with default mobile image rendering logic 2015-05-25 23:32:25 +00:00
jacek b95b09c0a8 add caption to the parser 2015-05-25 23:32:24 +00:00
Rafal Leszczynski 0656fc1697 Merge pull request #7307 from Wikia/DAT-2831 
Dat 2831
 2015-05-25 15:43:52 +02:00
jacek e9f1d78a20 comments 2015-05-25 15:03:45 +02:00
Diana 8e1834c810 unify the file creation method 2015-05-25 11:02:35 +00:00
jacek 0f99d95286 simplify 2015-05-25 12:25:14 +02:00
Diana 72c1fd06ab refactoring 2015-05-22 16:25:21 +00:00
dianafa 4525aea3e5 suppord old img provider 2015-05-22 17:27:20 +02:00
Rafal Leszczynski af79107afd Merge branch 'dev' into DAT-2812 2015-05-22 16:32:02 +02:00
jacek bd8ae66ede initial commit; adding access to parent; checking parent type 2015-05-21 18:07:49 +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
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
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 eeb8fd6b87 remove html escaping of data values 2015-05-20 13:56:19 +02:00
jacek 643ac321a2 change function from public to protected 2015-05-20 12:14:48 +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
Rafal Leszczynski 09edb75302 change logic for getting name and key values to match with default mobile image rendering logic 2015-05-19 17:00:28 +02:00
jacek 4eaf7be472 extract logging to external function 2015-05-19 16:01:53 +02:00
jacek 6ab700c853 extract logging to external function 2015-05-19 12:49:35 +02:00
jacek 6405c1050a add caption to the parser 2015-05-19 09:56:57 +02:00
jacek 45918aafc3 logging change 2015-05-18 17:08:53 +02:00
Diana 31e6014faa treat '0' like a non-empty string 2015-05-18 13:54:25 +00:00
jacek 808026dae1 cr 2015-05-18 15:36:04 +02:00
jacek 7ad0c01c19 handle warnings and log them 2015-05-18 14:51:55 +02:00
Sebastian Marzjan 69b9abc0af DAT-2785 and DAT-2784 - Handle InnerXML properly 
Remove obsolete test
 2015-05-13 13:52:31 +02:00
Jacek Jursza 6fefa10110 Merge pull request #7145 from Wikia/DAT-2770 
Dat 2770 - add different thumbnail size for infobox images on mobile
 2015-05-12 13:44:58 +02:00
Adam Robak a7542484ed Merge pull request #7162 from Wikia/portable-infobox-inner-xml 
Portable infobox inner xml
 2015-05-12 08:15:37 +02:00
Rafal Leszczynski 6b9d0ab239 fix indentation 2015-05-11 17:28:43 +02:00
Rafal Leszczynski 95107e7244 Merge branch 'portable_infobox_mvp' into DAT-2770 2015-05-11 17:24:19 +02:00
Rafal Leszczynski e7fdcbc778 fix issues with image name being passed to template 2015-05-11 17:07:07 +02:00
jacek f32f24689a add hook to node image 2015-05-11 14:36:23 +02:00
Rafal Leszczynski 8c25f370db move image name sanitizing to getData method 2015-05-11 13:56:18 +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
jacek 2ea8598165 innerXML different method 2015-05-08 17:23:25 +02:00
jacek 2a9d0193ea getinnerXML 2015-05-08 16:56:44 +02:00
jacek 909d701327 fix tests 2015-05-08 14:28:56 +02:00
jacek 7cb5b79811 reverse if 2015-05-08 14:10:25 +02:00
jacek fe75d4fd69 throw error 2015-05-08 14:04:18 +02:00
jacek a563c0144f xml markup parse error handling 2015-05-08 13:51:31 +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
Adam Robak f60278a8e3 switch to recursive parsing for all elements 2015-05-07 15:19:46 +02:00
jacek a55b473ccb Merge branch 'portable_infobox_mvp' into DAT-2762 2015-05-07 15:12:27 +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
Adam Robak 21b2c0fb9b fix missing url 2015-05-07 15:09:24 +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 782847bc31 removed unused code 2015-05-07 14:38:31 +02:00
Adam Robak 242bada43d external parser approach changed, tests fixed, refactoring 2015-05-07 14:37:13 +02:00
Adam Robak ce1b842110 methods docs added 2015-05-07 13:54:26 +02:00
Adam Robak de8533e1c5 wikitext parsing approach changed 2015-05-07 13:48:57 +02:00
jacek 42a333565c Merge branch 'portable_infobox_mvp' into DAT-2762 2015-05-06 18:24:28 +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
jacek 94ae246c4e check for empty node 2015-05-06 17:55:11 +02:00
Rafal Leszczynski e6113be4f2 Merge pull request #7116 from Wikia/DAT-2763 
error handling
 2015-05-06 17:42:59 +02:00
Adam Robak a420b6f1e2 clean up 2015-05-06 17:05:42 +02:00
Adam Robak 17abbcc5ee do only internal parsing 2015-05-06 17:04:37 +02:00
Rafal Leszczynski 440b1e934b overwrite isEmpty method for image node to check for url instead of value 2015-05-06 16:11:04 +02:00
Rafal Leszczynski e1e25d77bb change naming in image data model 2015-05-06 16:02:28 +02:00
Rafal Leszczynski 3109e908b9 Merge branch 'portable_infobox_mvp' into DAT-2746 2015-05-06 15:10:08 +02:00
jacek 3b6da2a69a error handling 2015-05-06 13:16:55 +02:00
Rafal Leszczynski b1f2cabf03 add image name to image data model 2015-05-05 12:37:47 +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
marzjan 6914257db9 DAT-2760 Initial commit; Streamline files; Add first test 2015-05-04 14:43:53 +00:00
jacek 99ca2eb705 footer 2015-05-04 16:16:35 +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 0017428e6b dont use value tag in header 2015-05-04 13:57:10 +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