Samuel Georges d76863a3ec Merge branch 'develop' into stable ...

Conflicts:
	composer.json

2016-02-27 14:55:52 +11:00

..

importexportcontroller

Update fields_export.yaml

2015-11-11 16:08:50 +01:00

relationcontroller

Add relation-inset class, fixes relation-flush

2015-12-19 09:53:12 +11:00

reordercontroller

Allow the model attribute name to be specified from config

2015-08-22 16:39:09 +10:00

FormController.php

create_onSave() forgot to extend model

2016-02-23 14:36:00 +11:00

ImportExportController.php

Protected properties were once [incorrectly] available

2015-08-29 20:12:55 +10:00

ListController.php

Merge branch 'develop' into stable

2016-02-27 14:55:52 +11:00

RelationController.php

Merge branch 'develop' into stable

2016-02-27 14:55:52 +11:00

ReorderController.php

Add support to extend query on 'nested' sortMode - refs #1519

2015-10-17 12:44:16 +11:00

UserPreferencesModel.php

Include user id in cache key

2016-02-20 09:39:18 +11:00