Nicolas Maillat 7b4dcec274 Merge pull request #2383 from mike-esokia/PHRAS-1736_PORT-165_and_1593 ...

PHRAS-1736 port PHRAS-165 and PHRAS-1593

2018-01-08 12:12:20 +01:00

..

actions

Merge 4.0 branch

2016-12-05 17:04:54 +01:00

Baskets

Merge branch 4.0

2016-12-05 15:26:48 +01:00

orders

wip - porting BDC

2017-11-21 10:06:10 +04:00

preview

Port PHRAS-1574

2017-11-23 13:16:55 +04:00

results

Merge 4.0 branch

2016-12-05 17:04:54 +01:00

Share

Port PHRAS-1593

2017-11-24 16:22:31 +04:00

Story

Merge 4.0 branch

2016-12-05 17:04:54 +01:00

templates

PHRAS-450 - fix captured images dimension issue

2015-12-03 15:24:29 +01:00

Tooltip

moved skins/icon to assets/common/images/icons

2015-12-02 17:35:37 +01:00

upload

Merge 4.0 branch

2016-12-05 17:04:54 +01:00

User

Merge branch 4.0

2016-12-05 15:26:48 +01:00

WorkZone

Port PHRAS-1577 to 4.1

2017-11-23 16:40:20 +04:00

index.html.twig

Porting PHRAS-1542 to 4.1

2017-11-17 11:32:37 +04:00

notifications.html.twig

Merge branch 4.0

2016-12-05 15:26:48 +01:00

tab_headers.html.twig

fix plugins image path

2016-01-08 11:18:06 +01:00

tab_thesaurus.html.twig

add search to candidate tab

2017-08-15 12:54:16 +04:00

toolbar.html.twig

Port PHRAS-1577 to 4.1

2017-11-23 16:40:20 +04:00

TOU_ajax.html.twig

Fix CS

2012-10-26 12:20:16 +02:00

TOU_base.html.twig

Fix CS

2012-10-26 12:20:16 +02:00

TOU.html.twig

Merge branch '3.7'

2012-12-17 15:30:05 +01:00