Commit graph

828 commits

Author SHA1 Message Date
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
Diana c9fb544423 style according to designs 2015-06-09 22:23:51 +02:00
Diana 41f0870480 style according to designs 2015-06-09 22:22:46 +02:00
dianafa fb681591e0 prototype test 2015-06-09 19:35:19 +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
jacek 62aea4d08d PR fix 2015-06-09 16:16:48 +02:00
idradm 8d53872cbf DAT-2816 docs comments changed 2015-06-09 15:09:01 +02:00
jacek 51e19100e1 PR fix 2015-06-09 14:33:49 +02:00
jacek 0c7cfe261d PR fix 2015-06-09 14:31:04 +02:00
dianafa 6e8518637c working class assigment 2015-06-09 13:37:03 +02:00
jacek 395ed5a148 using ImageServingHook is PortableInfobox ext 2015-06-09 12:14:49 +02:00
jacek 08bcb2aa36 adding DataService class 2015-06-09 12:14:00 +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
dianafa f9dd19bbc3 remove unnecesary selector 2015-06-09 11:45:49 +02:00
dianafa acff223c0e refactor tests and css selectors 2015-06-09 11:40:32 +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
dianafa abd771d4cc tabular layout only for not nested elements 2015-06-08 21:17:47 +02:00
Diana c3dcfb9d66 refactor tests 2015-06-08 15:25:48 +00:00
Diana ec41b3ae6c change selectors 2015-06-08 15:13:25 +00:00
Diana 1ce89defbf refactor test 2015-06-08 16:35:02 +02:00
Diana c51ea2888e flex css 2015-06-08 14:32:17 +00:00
idradm 6655e1fc30 DAT-2816 introduce source attribute for label tag, tests refactor 2015-06-08 15:56:08 +02:00
Diana 85ade87f25 test1 2015-06-08 12:49:23 +00:00
Diana 99914ace85 newlines 2015-06-08 10:22:20 +00:00
dianafa 7d5d42e9f4 merge with dev 2015-06-08 12:11:03 +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
Diana 1bfeb9ebb0 clean styling 2015-06-03 17:09:58 +00:00
Diana a38d25d0e3 styling 2015-06-03 15:12:43 +00:00
idradm 9c55ef194b DAT-2861 images with whitespace in names will be linked correctly now 2015-06-03 16:53:31 +02:00
Diana 7342ffbeb0 add tests and functionality 2015-06-03 13:48:44 +00:00
jacek a8e11a41bd messages and CR remark 2015-06-03 14:37:12 +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
jacek c7b5e9345c translation change 2015-06-02 15:50:25 +02:00
jacek 1c1c61d52c translation change 2015-06-02 15:19:25 +02:00
jacek b386d40858 css 2015-06-02 13:18:41 +02:00
jacek a9c01baed5 hide debug content for articles 2015-06-02 13:09:25 +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
jacek e2025721fd translations 2015-06-01 14:11:07 +02:00
Adam Robak 3d3d682e69 DAT-2845 missing space in comment 2015-06-01 11:40:06 +02:00
Adam Robak 369209b5f7 DAT-2845 ensure params are correctly acquired 2015-06-01 10:59:20 +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
Piotr Gabryjeluk 91b21f5b73 Merge pull request #7297 from Wikia/aden-1960-improve-playwire-placement
ADEN-1960 Improve playwire placement
2015-05-26 18:07:21 +02:00
nAndy 75e60c8bcc ADEN-1960 manually merged origin/dev
Resolved conflicts in:
* AdEngine/js/AdLogicPageDimensions.js,
* AdEngine/js/provider/directGpt.js
2015-05-26 12:01:16 +00:00
nAndy 0fee93ec6d ADEN-1960 manually merged origin/dev
And resolved conflicts in:
* AdEngine/js/AdLogicPageDimensions.js,
* AdEngine/js/provider/directGpt.js,
* AdEngine/js/run/desktop.run.js.
2015-05-26 11:21:46 +00:00