Mike Ng bddc3781ba resolve conflict

2018-01-08 15:54:47 +04:00

..

_shared/styles

PORT PHRAS-1555/PHRAS-1568 to 4.1

2017-11-22 15:48:36 +04:00

account

Porting PHRAS-1586/PHRAS-1602 to 4.1

2017-12-22 11:15:17 +04:00

admin

resolve conflict

2018-01-08 15:54:47 +04:00

authentication

fix fontAwesome variable name, remove unused npm dependencies

2015-12-02 18:15:32 +01:00

common

resolve conflict

2018-01-08 15:54:47 +04:00

lightbox

Merge branch 'master-alchemy' into PHRAS-1512_PORT_PDFJS_TO_4.1

2017-11-17 08:44:45 +04:00

oauth

fix tooltip in record editor

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

permaview/styles

integration of embed player in permaview, added frontend script for embed bundle, dumped translation keys

2015-12-07 16:59:34 +01:00

prod

modify js and css files for PDFJS

2017-08-07 17:24:47 +04:00

report

Merge branch 4.0

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

setup/styles

fix tooltip in record editor

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

thesaurus

Merge branch 4.0

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

vendors

Merge branch 4.0

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