15984 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Daniel Hensby	8c23b67b9f	Merge branch '3.3' into 3.4	2016-09-14 11:39:49 +01:00
Daniel Hensby	64de2223f8	Merge branch '3.2' into 3.3	2016-09-14 11:39:28 +01:00
Daniel Hensby	90a01870ea	Merge branch '3.1' into 3.2	2016-09-14 11:39:00 +01:00
Damian Mooyman	014d6db8d8	Merge pull request #5989 from dhensby/pulls/3.1/fix-sake-lf ... FIX Force line endings to LF on sake file	2016-09-14 10:21:41 +12:00
Damian Mooyman	360d3bc331	Merge pull request #5988 from dhensby/pulls/many-many-fixture-fix ... API Allow has_many fixtures to be declared with array format as well …	2016-09-14 09:57:56 +12:00
Ingo Schommer	23f764f8b0	Merge pull request #5991 from dhensby/docs/3.4/composer-install-docs ... Docs/3.4/composer install docs	2016-09-13 07:50:24 +12:00
Daniel Hensby	e3ac75febd	DOCS Reference composer docs for installation instructions	2016-09-12 17:04:20 +01:00
Daniel Hensby	a14df0bc2d	FIX Force line endings to LF on sake file	2016-09-12 14:15:07 +01:00
Damian Mooyman	c6457c50e9	API Allow has_many fixtures to be declared with array format as well as many_many (#5944) ... BUG Fix issue with parsing of extrafields in fixtures BUG Fix issue in duplicate relation name, and ensure FixtureBlueprint fails on these	2016-09-12 14:01:08 +01:00
Daniel Hensby	5959419645	Merge branch '3.3' into 3.4	2016-09-07 09:21:50 +01:00
Daniel Hensby	b80dc6450a	Merge branch '3.2' into 3.3	2016-09-07 09:21:21 +01:00
Damian Mooyman	9455ced41a	Merge pull request #5959 from dhensby/pulls/3.2/bad-strpos-fix ... FIX Bad strpos call in HTTP::register_etag()	2016-09-07 12:05:57 +12:00
Daniel Hensby	e7ecf6cf15	FIX Bad strpos call in HTTP::register_etag()	2016-09-06 23:32:57 +01:00
Damian Mooyman	a68dfd1016	Merge pull request #5937 from dhensby/pulls/3.4/fix-empty-dmyfields-validation ... FIX Empty dmyfields on DateField now validate as true	2016-09-02 09:01:39 +12:00
Daniel Hensby	f2ed59e185	FIX Empty dmyfields on DateField now validate as true	2016-09-01 11:55:17 +01:00
Ingo Schommer	1a8348900d	Merge pull request #5899 from christopherdarling/patch-7 ... DOCS add missing commit af3412a to 3.4.1 changelog	2016-09-01 08:17:16 +12: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	f4a6e9e517	Merge branch '3.1' into 3.2	2016-08-22 15:30:03 +01:00
Loz Calver	0f3eabcf03	Merge pull request #5902 from dhensby/pulls/relation-list-cleanup ... Cleanup of RelationList, HasManyList and ManyManyList	2016-08-22 14:27:29 +01:00
Loz Calver	c8f49045dc	Merge pull request #5903 from dhensby/pulls/3.2/fix-bad-arraylist-sort ... FIX ArrayList sorting now caseinsensitive	2016-08-22 14:27:10 +01:00
Daniel Hensby	229a2b9217	Merge pull request #4133 from nimeso/patch-1	2016-08-22 11:52:47 +01:00
Daniel Hensby	4998b80445	FIX ArrayList sorting now caseinsensitive	2016-08-22 11:21:50 +01:00
Daniel Hensby	8e4e2b4fa8	Merge pull request #4173 from AntonyThorpe/patch-4 ... DOCS Update 06_Tabbed_Forms.md	2016-08-19 15:49:51 +01:00
Daniel Hensby	8737ddefba	Cleanup of RelationList, HasManyList and ManyManyList	2016-08-19 10:37:58 +01:00
Damian Mooyman	6e864702ce	Merge pull request #5901 from dhensby/pulls/3.2/cleanup-gridautocompleter ... Cleaning up GridFieldAddExistingAutocompleter	2016-08-19 11:24:55 +12:00
Daniel Hensby	bdf9e97b0e	Cleaning up GridFieldAddExistingAutocompleter	2016-08-19 00:00:56 +01:00
Daniel Hensby	d306c884c7	Merge branch '3.3' into 3.4	2016-08-18 22:20:42 +01:00
Daniel Hensby	dc008b38ab	Merge branch '3.2' into 3.3	2016-08-18 22:18:47 +01:00
Christopher Darling	ef1d93c994	DOCS add missing commit af3412a to 3.4.1 changelog	2016-08-18 16:27:36 +01:00
Damian Mooyman	8028387c84	Merge pull request #5847 from dhensby/pulls/3.2/fix-etag-quoting ... FIX ETag header now properly quoted	2016-08-17 11:16:26 +12:00
Damian Mooyman	f4ba3cd175	Merge 3.3 into 3.4 ... # Conflicts: # security/ChangePasswordForm.php # templates/forms/OptionsetField.ss	2016-08-15 19:03:13 +12:00
Damian Mooyman	ebc0bafea9	Merge 3.2 into 3.3	2016-08-15 18:51:07 +12:00
Damian Mooyman	f3afd14e4f	Merge 3.2 into 3.3	2016-08-15 18:47:43 +12:00
Damian Mooyman	8ec89be9d4	Merge 3.1 into 3.2 ... # Conflicts: # forms/CheckboxSetField.php # forms/OptionsetField.php # security/Member.php # tests/forms/CheckboxSetFieldTest.php	2016-08-15 18:46:26 +12:00
Damian Mooyman	bbc865ff67	Merge 3.4.1 into 3.4	2016-08-15 18:37:55 +12:00
Damian Mooyman	cba7950701	Merge 3.3.3 into 3.3	2016-08-15 18:36:16 +12:00
Damian Mooyman	169d072502	Merge 3.2.5 into 3.2	2016-08-15 18:35:00 +12:00
Damian Mooyman	439753a61b	Merge 3.1.20 into 3.1	2016-08-15 18:33:45 +12:00
Damian Mooyman	1f06e6dd18	Added 3.4.1 changelog	2016-08-15 18:29:38 +12:00