4979 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	d1e3bcc14e	Remove .tx file to freeze localisations	2017-05-01 16:23:11 +12:00
Damian Mooyman	0ef3844dd4	Remove .tx file to freeze localisations	2017-05-01 16:22:39 +12:00
John Milmine	1ff6f3f1b0	fixing doArchive ... for users who can delete, but not unpublish, they should be able to delete draft pages that they’ve created. Old code used to unpublish even if the page wasn’t published, which meant users who couldn’t publish, also could delete draft pages. They could create draft pages, but not delete them.	2017-04-27 08:48:19 +12:00
Daniel Hensby	48a3152ee2	Merge pull request #1803 from open-sausages/pulls/3.6/fix-settings-history ... BUG Fix page history / settings forms	2017-04-26 10:00:01 +01:00
Daniel Hensby	eeaec7a876	Merge pull request #1800 from dhensby/pulls/3.6.0/test-fix ... FIX intl test	2017-04-26 09:59:18 +01:00
Damian Mooyman	000a5f7209	BUG Fix page history / settings forms	2017-04-26 18:13:48 +12:00
Sam Minnee	18171f8875	Merge branch '3.4' into 3.5	2017-04-24 15:59:38 +12:00
Uncle Cheese	cfef458a00	Remove .tx folder	2017-04-24 15:57:45 +12:00
Uncle Cheese	58c0405b58	Remove .tx folder	2017-04-24 14:49:42 +12:00
Daniel Hensby	0494af1243	Aliasing 3 as 3.7.x-dev	2017-04-21 16:09:05 +01:00
Daniel Hensby	7e77753274	FIX intl test	2017-04-21 15:17:47 +01:00
Daniel Hensby	2bde67d6de	Merge branch '3.6' into 3	2017-04-21 14:09:35 +01:00
root	475b733579	Update translations	2017-04-21 11:49:37 +01:00
Damian Mooyman	1a6518803b	ENHANCEMENT Make page urls bookmarkable	2017-04-12 13:00:21 +12:00
Tim Kung	bb3c09c359	- making form actions on edit forms safer ... - re-adding removed methods	2017-04-12 11:42:21 +12:00
Tim Kung	41eddfcc8e	fixing cms page history controller to use new page id param	2017-04-07 15:58:35 +12:00
Tim Kung	487235f991	adding page id into cmsmain	2017-04-07 14:41:15 +12:00
Damian Mooyman	af1002194d	Merge pull request #1781 from silverstripe/pulls/3/ss3-php7 ... Fixing VirtualPage for php7 patch	2017-04-05 13:09:50 +12:00
Daniel Hensby	2ddb616829	FIX Correct case of CopyContentFrom method	2017-04-05 10:49:17 +10:00
Sam Minnee	80e8967308	FIX: Fix VirtualPage::init() content-modification check. ... This check had never worked but PHP 5 silently ignored it and PHP 7 raised it as an error.	2017-04-05 10:49:16 +10:00
Daniel Hensby	322c6f578b	DOCS Fix PHPDoc	2017-04-05 10:49:16 +10:00
Daniel Hensby	ec15c71342	FIX: Add __isset to VirtualPage for PHP7 support. ... Also rely on parent::hasField and parent::hasMethod	2017-04-05 10:48:58 +10:00
Daniel Hensby	7ac2be0802	Merge tag '3.5.3' into 3.5 ... Release 3.5.3	2017-02-23 15:11:46 +00:00
Dan Hensby	80099f24b7	Update translations	2017-02-20 17:01:15 +00:00
Damian Mooyman	12377fcc9b	Merge 3.5 into 3	2017-02-08 11:56:39 +13:00
Damian Mooyman	f35e62afc5	Merge 3.4 into 3.5	2017-02-08 11:55:10 +13:00
Damian Mooyman	db2b55c3da	Merge 3.4.5 into 3.4	2017-02-08 11:52:41 +13:00
Damian Mooyman	ba43d120cd	Update translations	2017-02-08 11:05:29 +13:00
Damian Mooyman	6fec151f2b	Update translations	2017-02-08 10:29:07 +13:00
Daniel Hensby	68b49921f9	Merge branch '3.5' into 3	2017-02-07 17:41:18 +00:00
Daniel Hensby	c088ee5332	Merge branch '3.4' into 3.5	2017-02-07 17:39:58 +00:00
Daniel Hensby	75115bc490	Merge tag 'refs/tags/3.4.4' into 3.4 ... Release 3.4.4	2017-02-07 17:39:01 +00:00
Daniel Hensby	27f8acf373	Merge pull request #1705 from dhensby/pulls/3/cleanup ... Remove redundant label	2017-02-03 11:20:37 +00:00
Daniel Hensby	aa2d0fb247	Merge branch '3.4' into 3.5	2017-01-31 20:09:00 +00:00
Daniel Hensby	1f3802d48d	Merge remote-tracking branch 'upstream/3.4.4' into 3.4	2017-01-31 20:06:54 +00:00
Dan Hensby	9917cee7bd	Update translations	2017-01-31 11:39:08 +00:00
Damian Mooyman	ac6083c9a2	Merge pull request #1731 from trewq/asset-upload-directory-fix ... Fix error when uploading file and ASSETS_DIR is a subdirectory	2017-01-31 15:47:16 +13:00
Brendan Halley	10d9f9080b	Fix to allow ASSETS_DIR to be a subdirectory	2017-01-31 09:46:14 +11:00
Dan Hensby	ce9b05d21d	Update translations	2017-01-26 21:02:38 +00:00
Dan Hensby	94cdea8e65	Update translations	2017-01-26 18:30:10 +00:00
Dan Hensby	47b6b2cd0e	Update translations	2017-01-25 16:46:33 +00:00
Daniel Hensby	6f05242e3b	Merge branch '3.5' into 3	2017-01-17 12:33:03 +00:00
Daniel Hensby	cb3008956f	Merge branch '3.4' into 3.5	2017-01-17 12:31:18 +00:00
Loz Calver	f26ecb2a9c	Merge pull request #1711 from dhensby/pulls/3.4/allowed-children-fix2 ... FIX Dont attempt to iterate over null in SiteTree::allowedChildren	2017-01-10 16:46:48 +00:00
Daniel Hensby	5bba7264c6	FIX Dont attempt to iterate over null in SiteTree::allowedChildren	2017-01-10 16:20:22 +00:00
Daniel Hensby	577a024109	Remove redundant label	2017-01-04 15:55:32 +00:00
Damian Mooyman	a26607ca56	Merge 3.5 into 3 ... # Conflicts: # lang/en.yml # lang/fa_IR.yml # lang/fi.yml # lang/hr.yml # lang/it.yml	2016-12-22 13:24:17 +13:00
Damian Mooyman	6060af45c1	Merge 3.4 into 3.5	2016-12-22 13:18:30 +13:00
Damian Mooyman	e4ff310a62	Merge 3.5.1 into 3.5	2016-12-22 13:17:16 +13:00
Damian Mooyman	483cda95a6	Merge 3.4.3 into 3.4	2016-12-22 13:16:07 +13:00