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

..

custom

Added some empty dirs

2011-12-07 18:10:57 +01:00

include

add autoplay option for caption preview, removed useless audio and video libs

2015-12-14 15:21:28 +01:00

scripts

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

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

thumbnails

Makes static thumbnails delivery as default delivery && set symlink dir in www directory

2015-02-16 15:01:44 +01:00

.htaccess

Revert apache htaccess

2013-05-24 16:27:23 +02:00

api_dev.php

Add dev entry point for API

2016-05-24 15:58:16 +02:00

api.php

bump copyright year

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

favicon.ico

Porting PHRAS-1586/PHRAS-1602 to 4.1

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

index_dev.php

Make Api routes uses same flow as web

2016-04-13 12:00:51 +02:00

index.php

Application bootstrap refactor

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