15866 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Damian Mooyman	87e789674f	Update translations	2016-08-15 18:27:31 +12:00
Damian Mooyman	68986558c9	Added 3.3.3 changelog	2016-08-15 18:05:32 +12:00
Damian Mooyman	b57fde6cff	Update translations	2016-08-15 17:44:52 +12:00
Damian Mooyman	351bf6cfe4	Added 3.2.5 changelog	2016-08-15 17:22:23 +12:00
Damian Mooyman	8178f20eac	Update translations	2016-08-15 17:02:07 +12:00
Damian Mooyman	ac2681658a	BUG Fix regression in url concatenation #4967	2016-08-15 16:49:57 +12:00
Damian Mooyman	6f60d2518b	Added 3.1.20 changelog	2016-08-15 16:44:36 +12:00
Damian Mooyman	a3f8e522d8	Update translations	2016-08-15 16:31:56 +12:00
Damian Mooyman	02000e5446	Added 3.4.1-rc2 changelog	2016-08-15 15:55:19 +12:00
Daniel Hensby	41be95c95a	[SS-2016-007] FIX Encode user supplied URL for embeding into page	2016-08-15 15:53:36 +12:00
Damian Mooyman	b0ba2015d9	[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField	2016-08-15 15:53:21 +12:00
Daniel Hensby	d1163d87b7	[SS-2016-014] FIX Autologin cookies are ignored if autologin is disabled	2016-08-15 15:52:10 +12:00
Daniel Hensby	8bbf1caae6	[SS-2016-013] FIX Uncasted member name	2016-08-15 15:52:04 +12:00
Daniel Hensby	782c18fd13	[SS-2016-011] ChangePasswordForm does not check $member->canLogin before login	2016-08-15 15:51:53 +12:00
Daniel Hensby	08384bb4d6	[SS-2016-008] Reset Member::Salt on password change	2016-08-15 15:50:56 +12:00
Damian Mooyman	00d1d294ca	Update translations	2016-08-15 15:49:50 +12:00
Damian Mooyman	7c0669486a	Added 3.3.3-rc2 changelog	2016-08-15 15:34:41 +12:00