Mike Ng 30f49bdd35 resolve conflict

2018-01-08 15:57:13 +04:00

..

accept.html.twig

moved thesaurus js files, moved prod dependencies, removed unused pixastic dependency

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

export-text-dialog.html.twig

wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)

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

export-text.html.twig

wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)

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

export-topics-dialog.html.twig

wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)

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

export-topics.html.twig

wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)

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

import-dialog.html.twig

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

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

import.html.twig

Locale simplification

2013-12-03 20:05:20 +01:00

index.html.twig

wip: component reorg, gathering js, css, images, ...

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

link-field-step1.html.twig

wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)

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

link-field-step2.html.twig

wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)

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

link-field-step3.html.twig

wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)

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

load-thesaurus.html.twig

fix label tab thesaurus

2017-08-23 13:48:20 +04:00

new-term.html.twig

Revert "Revert "PHRAS-714_thesaurus_indexation""

2016-10-18 21:17:10 +02:00

presets.html.twig

PHRAS-556 #time 5h

2015-06-30 18:13:42 +02:00

properties.html.twig

wip: stylesheets cleanup

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

thesaurus.html.twig

resolve conflict

2018-01-08 15:57:13 +04:00