Mike Ng 3dd4c50350 Merge branch 'master-alchemy' into PHRAS-1735_add_git_log ...

# Conflicts:
#	resources/www/common/js/components/common.js

2018-01-08 16:26:28 +04:00

..

Admin

PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)

2017-02-06 18:26:56 +01: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

Merge branch 'master-alchemy' into PHRAS-1735_add_git_log

2018-01-08 16:26:28 +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