Samuel Georges 1db67af8e8 Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade ... Conflicts: modules/system/lang/en/lang.php		2017-07-11 10:48:54 +10:00
..
importexportcontroller	Code dusting (#2826)	2017-04-24 21:38:19 +10:00
listcontroller/partials	Support for overriding list views	2016-10-29 14:10:21 +11:00
relationcontroller	Fix inflexible relation toolbar (#2760)	2017-07-04 18:56:38 -06:00
reordercontroller	Respect custom sort_order column value	2017-01-30 19:05:16 -06:00
FormController.php	Code dusting (#2826)	2017-04-24 21:38:19 +10:00
ImportExportController.php	Code dusting (#2826)	2017-04-24 21:38:19 +10:00
ListController.php	filterExtendScopes -> listFilterExtendScopes	2017-05-14 14:47:17 +10:00
RelationController.php	getPlainForeignKey -> getForeignKeyName	2017-05-20 20:03:48 +10:00
ReorderController.php	Code dusting (#2826)	2017-04-24 21:38:19 +10:00
UserPreferencesModel.php	API docs progress	2017-03-16 17:08:20 +11:00