676 Commits

Author	SHA1	Message	Date
Daniel Hensby	1ae07ac2a3	TEST Prove LastEdited is updated when no changes are made	2017-08-16 22:26:47 +01:00
Daniel Hensby	7b6aad8a65	Revert "TreeDropDown performance boost."	2017-07-19 12:44:43 +01:00
Roman Schmid	a6db16b229	Fix OS X issue with Convert::html2raw, HTMLText::FirstSentence, HTMLText::Summary and Text::FirstSentence. ... Use unicode modifier for regular expressions that deal with whitespace. Added unit-tests to ensure no invalud utf-8 gets generated by these methods.	2017-07-10 09:49:55 +02:00
Mojmir Fendek	5b6a39e71a	TreeDropDown performance boost.	2017-06-19 15:10:23 +12:00
Loz Calver	2afe018dc7	FIX: Ensure HasManyList foreign ID filter includes table name (fixes #7023)	2017-06-15 12:06:30 +01:00
Daniel Hensby	24a768ae14	Merge branch '3.4' into 3.5	2017-05-26 14:57:15 +01:00
Daniel Hensby	85f0650796	Remove unnecessary nesting of config/injector in tests	2017-05-24 16:05:39 +01:00
Daniel Hensby	8aaa3e3a86	Merge branch '3.4' into 3.5	2017-03-03 14:54:29 +00:00
Daniel Hensby	7f194a917d	Merge pull request #6351 from steve-silverstripe/patch-2	2017-03-03 14:05:53 +00:00
Daniel Hensby	62e301bdba	Merge pull request #6529 from timezoneone/3.5 ... Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns	2017-03-03 12:45:05 +00:00
Shawn	72b6fb49b6	Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns	2017-03-03 14:11:53 +13:00
Damian Mooyman	c25c443d95	BUG Fix minor mysql 5.7 warning in SQLQueryTest (#6608) ... Fixes #5451	2017-02-08 15:44:55 +13:00
Daniel Hensby	c8a40605ec	Merge pull request #6413 from volkerloew/1400-text-contextsummary ... search term highlighting without altering case (fixes #1400)	2016-12-28 13:36:08 +00:00
Volker Löw	5e581eace7	search term highlighting without altering case (fixes #1400)	2016-12-28 13:03:35 +00:00
Damian Mooyman	b1b3a6ee13	Merge 3.4 into 3.5	2016-12-22 13:18:37 +13:00
Daniel Hensby	273a06d47d	TEST Duplicated DataObjects dont keep Created date value	2016-12-19 14:23:39 +00:00
Daniel Hensby	17108ff50c	Merge branch '3.4' into 3.5.0	2016-11-10 14:23:38 +00:00
Damian Mooyman	ebae480c66	BUG Fix regression in aggregate column lookup from #6199	2016-11-10 11:13:02 +13:00
Daniel Hensby	3859a1d7e7	Merge branch '3.4' into 3	2016-10-27 16:16:04 +01:00
Jonathon Menz	b0445f72e4	FIX Ambiguous column SQL error ... Specify the table for the field we’re fetching, in case a joined table has a field with the same name	2016-10-18 21:35:37 -07:00
Daniel Hensby	9a6121c867	Merge branch '3.4' into 3	2016-10-16 22:56:37 +01:00
Jonathon Menz	797be6ac82	FIX Revert natural sort ... More backwards compatible and more consistent with ORM sorting (fixes #6124)	2016-10-04 13:56:12 -07:00
Stephan van Diepen	95b66d19b2	Added MySQL support for Bigint. ... Conflicts: model/MySQLDatabase.php	2016-09-30 16:38:25 +01:00
Daniel Hensby	3fd9fe3aa0	Merge branch '3.4' into 3	2016-09-07 09:22:06 +01:00
Daniel Hensby	060bf6b327	Merge branch '3.3' into 3.4	2016-08-22 16:22:37 +01:00
Daniel Hensby	088d88e978	Merge branch '3.2' into 3.3	2016-08-22 16:22:02 +01:00
Daniel Hensby	4998b80445	FIX ArrayList sorting now caseinsensitive	2016-08-22 11:21:50 +01:00
Damian Mooyman	d88516203c	Merge 3.4 into 3	2016-08-15 19:05:20 +12:00
Jonathon Menz	d4114b3dce	FIX include related fields on canFilter() check ... closes #5576	2016-08-11 10:26:18 -07:00
Daniel Hensby	340a48306b	Merge branch '3.4' into 3	2016-07-20 19:48:17 +01:00
Daniel Hensby	cf247534d5	Merge branch '3.3' into 3.4	2016-07-20 19:43:41 +01:00
Daniel Hensby	96b061ffff	Merge branch '3.2' into 3.3	2016-07-20 19:41:46 +01:00
madmatt	43dcde5197	FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded	2016-07-19 11:22:36 +12:00
Daniel Hensby	4c40cf8dbb	Merge branch '3.4' into 3	2016-07-14 12:01:19 +01:00
Daniel Hensby	d766c8559b	Merge branch '3.3' into 3.4	2016-07-14 11:57:15 +01:00
Damian Mooyman	24efc7edf8	BUG Fix sorting ArrayList with sql-like syntax ... Replaces #5726	2016-07-12 17:00:17 +12:00
Daniel Hensby	a449045b09	Merge branch '3.4' into 3	2016-07-04 23:54:27 +01:00
Daniel Hensby	c35dc508cb	Merge branch '3.3' into 3.4	2016-07-04 23:53:55 +01:00
Daniel Hensby	dfc557afd4	Merge branch '3.2' into 3.3	2016-07-04 23:43:44 +01:00
Daniel Hensby	2cdfe6cc21	FIX Use RAW for DBField template helpers	2016-07-04 14:39:56 +01:00
Daniel Hensby	b0f237bb3a	FIX Use RAW instead of Value for parsing shortcodes	2016-07-04 13:53:56 +01:00
Damian Mooyman	4dadc276b5	Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt ... NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color	2016-07-04 17:35:47 +12:00
Daniel Hensby	0d36899afa	Merge branch '3.4' into 3	2016-06-13 12:30:33 +01:00
Daniel Hensby	4e392a4d43	Merge branch '3.3' into 3.4	2016-06-13 12:30:16 +01:00
Nick	dae2295e16	NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color	2016-06-05 00:05:37 +01:00
Damian Mooyman	decd7e5c57	BUG Fix getFinalisedQuery not including all queried columns ... Fixes #1669	2016-05-23 08:41:58 +12:00
Daniel Hensby	be7e0db26e	Merge pull request #3835 from dnadesign/hideFromHierachy3	2016-05-19 11:52:47 +01:00
Damian Mooyman	b634b1a67d	Merge pull request #5537 from IgorNadj/patch-niceformats ... ENH: moving hardcoded nice date/time formats to config	2016-05-19 14:12:22 +12:00
Damian Mooyman	6035be7e57	Merge pull request #5548 from kinglozzer/4661-extrafields-casting ... FIX: castingHelper failed to find many_many_extraFields data (fixes #4661)	2016-05-19 14:10:37 +12:00
Damian Mooyman	8ed25ae482	BUG Fix DataObject::isChanged() detecting non saveable changes (#5545)	2016-05-18 09:00:04 +10:00