Mike Ng 4f518c605d Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 ...

# Conflicts:
#	resources/locales/messages.de.xlf
#	resources/locales/messages.en.xlf
#	resources/locales/messages.fr.xlf
#	resources/locales/messages.nl.xlf
#	resources/locales/validators.de.xlf
#	resources/locales/validators.en.xlf
#	resources/locales/validators.fr.xlf
#	resources/locales/validators.nl.xlf
#	resources/www/admin/styles/main.scss

2018-01-09 11:00:03 +04:00

..

Admin

porting PHRAS-1578/PHRAS-1579/PHRAS-1621/PHRAS-1675/PHRAS-1404/PHRAS-1336 to 4.1

2018-01-03 15:26:43 +04:00

Api

PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)

2017-02-06 18:26:56 +01:00

Client

bump copyright year

2016-01-05 13:38:14 +01:00

Prod

resolve conflict

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

Report

bump copyright year

2016-01-05 13:38:14 +01:00

Root

PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)

2017-02-06 18:26:56 +01:00

Thesaurus

add search to candidate tab

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

User

bump copyright year

2016-01-05 13:38:14 +01:00

ControllerProviderServiceProvider.php

Application bootstrap refactor

2016-01-22 17:12:21 +01:00

ControllerProviderTrait.php

bump copyright year

2016-01-05 13:38:14 +01:00

Datafiles.php

PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)

2017-02-06 18:26:56 +01:00

Lightbox.php

bump copyright year

2016-01-05 13:38:14 +01:00

MediaAccessor.php

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

Minifier.php

bump copyright year

2016-01-05 13:38:14 +01:00

Permalink.php

PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)

2017-02-06 18:26:56 +01:00

Setup.php

bump copyright year

2016-01-05 13:38:14 +01:00