Phraseanet

mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00

Files

Mike Ng 8908a6b23f Merge branch 'master-alchemy' into PHRAS-1735_add_git_log

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

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

analytics.html.twig

2013-12-20 16:44:22 +01:00

caption.html.twig

PHRAS-508_acl-cache

2016-10-26 16:13:47 +02:00

dialog_export.html.twig

Merge branch 4.0

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

HTML5Video.html.twig

2015-07-02 12:33:18 +02:00

index_bootstrap.html.twig

updating code

2017-11-17 14:21:11 +04:00

indexfloat.html.twig

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

macros.html.twig

2016-09-28 13:16:10 +02:00

menubar.html.twig

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

password_strength_widget.html.twig

2013-06-14 16:55:29 +02:00

preview.html.twig

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

technical_datas.html.twig

2016-11-03 15:27:57 +01:00

templates.html.twig

2013-07-17 13:38:30 +02:00

thumbnail.html.twig

wip - porting BDC

2017-11-21 10:06:10 +04:00