Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1' ... Conflicts: docs/en/misc/contributing/issues.md docs/en/reference/uploadfield.md forms/HtmlEditorField.php i18n/i18n.php javascript/HtmlEditorField.js model/DB.php model/Image.php model/SQLQuery.php		2014-08-14 09:08:26 +12:00
..
cache-control.md	API Marked statics private, use Config API instead (#8317)	2013-03-24 17:20:53 +01:00
cms-alternating-button.md	API Marked statics private, use Config API instead (#8317)	2013-03-24 17:20:53 +01:00
cms-formfield-help-text.md	Fix "cms-description-tooltip" reference in code	2013-09-20 21:12:59 +08:00
csv-import.md	Update remove extra ); from relation callback function	2014-04-18 14:36:03 -05:00
customize-cms-menu.md	Update customize-cms-menu.md	2014-08-07 21:05:08 +10:00
customize-cms-pages-list.md	Fixed _config.php references and usage in docs	2013-03-27 12:06:57 +01:00
customize-cms-tree.md	Update customize-cms-tree.md	2014-08-07 20:16:11 +10:00
dynamic-default-fields.md	Fixed references to deprecated APIs in docs	2012-06-28 14:49:55 +02:00
extend-cms-interface.md	Removed trailing : from yml example causing error	2014-07-15 09:59:43 +01:00
gridfield-rowaction.md	more docs for GridField & ModelAdmin customization	2014-03-16 08:40:50 +00:00
grouping-dataobjectsets.md	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-05-09 10:34:20 +02:00
index.md	Add how to for custom GridField row actions.	2013-09-19 23:38:35 +12:00
navigation-menu.md	Consistently used dollar notation in template docs (see #1794)	2013-04-26 11:48:59 +02:00
pagination.md	Update pagination.md	2014-05-08 21:46:30 +01:00
phpunit-configuration.md	Rewrote usages of error suppression operator	2014-03-05 15:48:55 +13:00
simple-contact-form.md	Update simple-contact-form.md	2014-05-26 14:27:44 +05:30
track-member-logins.md	API Removed Member.LastVisited and Member.NumVisits	2013-10-10 12:35:07 +02:00