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

..

collection

PORT PHRAS-1555/PHRAS-1568 to 4.1

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

common

wip - refactoring frontend dependency and build tools - removed deprecated features (client interface)

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

databox

PORT PHRAS-1555/PHRAS-1568 to 4.1

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

fields

PORT PHRAS-1555/PHRAS-1568 to 4.1

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

plugins

Update plugin_name translation key.

2016-01-12 20:18:36 +01:00

publications

PORT PHRAS-1555/PHRAS-1568 to 4.1

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

search-engine

Merge branch 4.0

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

statusbit

Add slugified flag name in admin

2016-03-15 18:03:24 +01:00

task-manager

porting PHRAS-1764 to 4.1

2018-01-04 15:01:51 +04:00

user

moved skins/icon to assets/common/images/icons

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

connected-users.html.twig

PHRAS-1084 - fix admin tooltip conflict

2016-05-11 14:51:12 +02:00

dashboard.html.twig

PORT PHRAS-1555/PHRAS-1568 to 4.1

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

databases.html.twig

fix admin reoladTree callback

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

editusers_masks.html.twig

Merge branch '3.8'

2014-02-24 12:27:49 +01:00

editusers_quotas.html.twig

PHRAS-508_acl-cache

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

editusers_timelimit_sbas.html.twig

Fix localization in datepicker - admin

2017-08-14 10:26:52 +04:00

editusers_timelimit.html.twig

Fix localization in datepicker - admin

2017-08-14 10:26:52 +04:00

editusers.html.twig

PHRAS-508_acl-cache

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

index.html.twig

Merge branch 4.0

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

setup.html.twig

PORT PHRAS-1555/PHRAS-1568 to 4.1

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

statusbit.html.twig

moved skins/icon to assets/common/images/icons

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

structure.html.twig

Fix twig tags

2013-12-03 20:02:39 +01:00

subdefs.html.twig

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

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

tree.html.twig

PHRAS-508_acl-cache

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

users.html.twig

PORT PHRAS-1555/PHRAS-1568 to 4.1

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