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
|
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 |
|
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
|
ef4488bd4a
|
add horizontal group styling
|
2015-06-10 17:13:45 +00: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 |
|
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 |
|
Diana
|
de8c80334d
|
remove too big padding
|
2015-06-10 12:49:21 +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 |
|
idradm
|
8d53872cbf
|
DAT-2816 docs comments changed
|
2015-06-09 15:09:01 +02:00 |
|
dianafa
|
6e8518637c
|
working class assigment
|
2015-06-09 13:37:03 +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 |
|