15924 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Hensby	250a4672fb	Merge pull request #6237 from Zauberfisch/modeladmin-showImportForm ... Added $showSearchForm to ModelAdmin	2016-11-07 13:42:34 +00:00
Daniel Hensby	d5402d9dce	Merge pull request #6186 from ntd/pr5 ... BUG Use simplexml_load_string instead of simplexml_load_file	2016-11-07 12:16:32 +00:00
Damian Mooyman	df1354238a	Merge pull request #6276 from dhensby/pulls/3.4/versioned-phpdoc ... DOCS Fix up some PHPDoc on Versioned	2016-11-07 08:56:46 +13:00
Daniel Hensby	5f99c4aa5f	Merge branch '3.3' into 3.4	2016-11-03 13:27:11 +00:00
Daniel Hensby	fad53ae33e	Merge branch '3.2' into 3.3	2016-11-03 13:26:30 +00:00
Daniel Hensby	6eebf07a8e	Merge branch '3.1' into 3.2	2016-11-03 13:20:11 +00:00
Daniel Hensby	c914dde7d1	Update travis build to use target branch as core release	2016-11-03 13:17:41 +00:00
Damian Mooyman	91f51a6783	Merge branch '3.4' into pulls/3.4/versioned-phpdoc	2016-11-03 17:41:02 +13:00
Damian Mooyman	182c9fb70f	Merge pull request #6282 from sminnee/fix-32 ... FIX: Ensure that builds use the 3.2 dependencies.	2016-11-03 17:40:30 +13:00
Sam Minnee	edfe514540	FIX: Ensure that builds use the 3.4 dependencies. ... This fix does it in a way that doesn’t need manual maintenance per-branch	2016-11-03 16:38:38 +13:00
Damian Mooyman	a633b01c7c	Merge pull request #6283 from sminnee/fix-34-builds ... FIX: Ensure that builds use the 3.4 dependencies.	2016-11-03 16:28:44 +13:00
Sam Minnee	135a64761f	FIX: Ensure that builds use the 3.4 dependencies. ... This fix does it in a way that doesn’t need manual maintenance per-branch	2016-11-03 14:56:51 +13:00
Daniel Hensby	567b125fbc	DOCS Fix up some PHPDoc on Versioned	2016-11-02 14:08:35 +00:00
Jono Menz	fdfd0c4fc3	DOCS Remove duped content (#6214) ... D.R.Y.	2016-11-01 17:56:32 +13:00
Damian Mooyman	2a9138aa14	Merge pull request #6264 from dhensby/pulls/3.4/validation-docblock-fix ... DOCS Docblock fixes for ValidationResult	2016-11-01 10:38:33 +13:00
Daniel Hensby	0b850e0819	DOCS Docblock fixes for ValidationResult	2016-10-31 13:33:59 +00:00
Loz Calver	b6bbed8de0	Merge pull request #6249 from dhensby/pulls/3.4/fix-error-message ... FIX filterAny error message now refers to correct method name	2016-10-31 09:02:49 +00:00
Nicola Fontana	fe816076fc	BUG Make simplexml_load_file work on shared php-fpm ... PHP #62577 [1] together with PHP #64938 [2] make simplexml_load_file() fails when the "disable load external entities" flag is set. As a workaround, manually enable the entity loader in the bootstrap code. We are loading internal XML files after all, so no security implications should arise. [1] https://bugs.php.net/bug.php?id=62577 [2] https://bugs.php.net/bug.php?id=64938 Fix #6174.	2016-10-31 06:21:04 +01:00
Daniel Hensby	747bd4cac0	FIX filterAny error message now refers to correct method name	2016-10-30 12:04:07 +00:00
Daniel Hensby	2a3768266e	Merge branch '3.3' into 3.4	2016-10-27 16:15:43 +01:00
Daniel Hensby	a97ebf93de	Merge branch '3.2' into 3.3	2016-10-27 16:15:10 +01:00
Daniel Hensby	5f4f07a256	Merge branch '3.1' into 3.2	2016-10-27 16:14:01 +01:00
Loz Calver	68866ad31f	Merge pull request #6238 from nfauchelle/patch-2 ... Remove double quotes so example is not parsed.	2016-10-27 09:05:36 +01:00
Nick	d1c29d6595	Remove double quotes so example is not parsed. ... [Notice] Undefined variable: map Since it's using double quotes it tries to process $map, $key and $value	2016-10-27 09:06:11 +13:00
zauberfisch	c4aed0c081	Added $showSearchForm to ModelAdmin	2016-10-26 11:35:52 +00:00
Matthew Hailwood	7778357b03	Switch Mandrill recommendation to sparkpost. (#6196) ... Now that Mandrill has become a paid part of Campaign Monitor it makes sense for us to recommend the free alternative SparkPost. The package I've linked to is by the same author as the original Mandrill package.	2016-10-25 13:26:56 +13:00
Nicola Fontana	4d327f81fd	DOCS Specify that the selectors change the scope (#6213) ... Follow up of issue #4015.	2016-10-21 09:15:27 -07:00
Damian Mooyman	0f8f9f2732	Merge pull request #6199 from jonom/fix-ambiguous-field ... FIX Ambiguous column SQL error	2016-10-19 17:57:32 +13: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	4c7ba731be	Merge branch 'open-sausages/pulls/3.4/fix-checkbox-datalist' into 3.4	2016-10-11 20:16:33 +01:00
Damian Mooyman	7368deca8f	BUG Fix issue with SS_List as datasource for dropdown field ... BUG Fix validation issue with CheckboxSetField Fixes #6166	2016-10-11 14:58:48 +13:00
Daniel Hensby	5580100ade	Merge pull request #6157 from madmatt/patch-2 ... Make __call() clearer that a method may be non-public	2016-10-07 12:40:48 +01:00
Matt Peel	5a2591ec7d	Make __call() clearer that a method may be non-public ... Resolves #6151	2016-10-06 14:01:38 +13:00
Daniel Hensby	420cbadaac	Merge pull request #6149 from jonom/sort-fix-2 ... FIX Revert natural sort	2016-10-04 23:43:10 +01:00
Damian Mooyman	17c6580d3a	Merge pull request #6138 from dhensby/pulls/3.4/fix-sessions-on-alternate-base-urls ... FIX Absolute alternate_base_url no longer breaks session cookies	2016-10-05 11:26:27 +13: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
Daniel Hensby	6dde5ce571	FIX Absolute alternate_base_url no longer breaks session cookies	2016-10-04 14:21:32 +01:00
Daniel Hensby	111ab5f0af	Merge pull request #6137 from lekoala/patch-4 ... Have a clear error message	2016-10-04 14:13:00 +01:00
Thomas Portelange	3d8db488d4	Have a clear error message ... Because it's really annoying not knowing which field causes the error	2016-10-04 12:24:29 +02:00
Daniel Hensby	f2d3026e93	Merge pull request #3628 from JeremyRoundill/3.1	2016-09-30 17:16:47 +01:00
Anton Smith	ae4108bf00	BUG Content-Disposition header breaks in Firefox (#4087)	2016-09-29 13:25:14 +13:00
Will Rossiter	796ca2171d	Merge pull request #6044 from jsirish/patch-1 ... Docs - sort by random instructions	2016-09-21 07:46:18 +12:00
Jason Irish	dcc51ec479	Docs - sort by random instructions ... Added instructions for sorting per database type. `RAND()` throws errors in PostgreSQL and SQLite	2016-09-20 14:16:22 -05:00
Daniel Hensby	32d1856d40	FIX Debug::caller() will now handle errors from outside function calls (#6029)	2016-09-20 09:03:22 +12:00
Daniel Hensby	e93a376332	Merge pull request #6025 from tony13tv/patch-3 ... FIX: Frontend UploadField wouldn't call ssdialog	2016-09-19 11:31:01 +01:00
Cristian Torres	d2d770c6fb	FIX: Frontend UploadField wouldn't call ssdialog ... As in front end jQuery would be redefined by users custom version. Also the script should use the scope variable ```$``` as it represents the instance of jQuery with all the requirements loaded.	2016-09-18 19:37:44 -06:00
Daniel Hensby	71cc5d83e6	Revert "Merge remote-tracking branch '3Dgoo/patch-1' into 3.4" ... This reverts commit e617042422, reversing changes made to 995d07756d.	2016-09-16 14:21:16 +01:00
Daniel Hensby	e617042422	Merge remote-tracking branch '3Dgoo/patch-1' into 3.4	2016-09-16 11:50:24 +01:00
Thomas Portelange	995d07756d	cache currentUser query (#6007) ... * cache currentUser query Various modules can call a lot of time Member::currentUser(). We can avoid querying the database multiple times. Cache is implemented as a static array inside the method and store the data byID, in case the currentUserID changes within the same request (not very likely, but..)	2016-09-15 15:45:40 +01:00
3Dgoo	cd8904e045	Fixing button destroy bug ... When you want to add a button to the CMS but don't want LeftAndMain to apply jQuery UI button to it we add the `data-button="true"` attribute to our button. The `onadd` function checks that this attribute does not exist before calling `this.button()`. The `onremove` incorrectly checks that this attribute does exist before calling `this.button('destroy')`. This should be checking that this attribute does not exist, just like the `onadd` function. What this causes is when you have a button with the `data-button` attribute a button is not created, but when you leave the page `destory` gets called on an item which doesn't exist. We end up with the following error: > Uncaught Error: cannot call methods on button prior to initialization; attempted to call method 'destroy' The other issue with this logic is buttons are never getting destroyed when `onremove` is called. The whole issue is caused by a missing `!` in the if statement. This change adds it in to fix the problem.	2016-09-15 08:23:22 +09:30