Commit Graph

4541 Commits

Author SHA1 Message Date
Patrick Nelson
75dc391df9 FIX for #586 and possible fix for #736 and relates to #2449: Don't perform validation upon deletion, since it isn't necessary. Cleaned up type hint. 2015-10-09 15:36:21 -04:00
Damian Mooyman
d8915115f8 Update translations 2015-10-06 18:33:16 +13:00
Damian Mooyman
aab9999390 Merge pull request #1281 from kinglozzer/pulls/sitetree-settings-toggles
FIX: Incorrect field IDs breaking SiteTree settings toggles (fixes #1280)
2015-10-06 11:53:12 +13:00
Damian Mooyman
65492d8de0 Merge pull request #1283 from spekulatius/fixing-phpdoc-blocks
fixing phpdoc blocks to refering to Objects to built-in types of PHP
2015-10-06 11:46:37 +13:00
Peter Thaleikis
f291c5f365 fixing phpdoc blocks to refering to Objects to built-in types of PHP 2015-09-28 22:31:31 +13:00
Loz Calver
052aba17ac FIX: Incorrect field IDs breaking SiteTree settings toggles (fixes #1280) 2015-09-23 14:53:07 +01:00
Damian Mooyman
e382818399 Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	lang/cs.yml
	lang/de.yml
	lang/en.yml
	lang/es.yml
	lang/fr.yml
	lang/id.yml
	lang/it.yml
	lang/lt.yml
	lang/nb.yml
	lang/sk.yml
	lang/sr_RS@latin.yml
	lang/sv.yml
2015-09-15 12:48:48 +12:00
Damian Mooyman
6e72bd2cf8 Update translations 2015-09-15 10:51:27 +12:00
Damian Mooyman
ce212972c8 Update translations 2015-09-15 10:42:32 +12:00
Damian Mooyman
105b3c60d1 Update translations 2015-09-15 10:33:25 +12:00
Damian Mooyman
f2efbefb8c Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	.travis.yml
2015-09-09 14:09:00 +12:00
Damian Mooyman
353e5938de Update translations 2015-09-02 11:15:52 +12:00
Damian Mooyman
b26b6c3eca Update translations 2015-08-26 13:56:19 +12:00
Loz Calver
a382dd1cfc Merge pull request #1269 from sminnee/travis-disable-irc
MINOR: Remove IRC notifications of travis builds.
2015-08-25 09:07:20 +01:00
Sam Minnee
8a3e84ba1c MINOR: Remove IRC notifications of travis builds.
Companion to https://github.com/silverstripe/silverstripe-framework/pull/4535
2015-08-25 18:12:22 +12:00
Sam Minnée
da348f74e8 Merge pull request #1265 from tractorcow/pulls/3.2/fix-archived-actions
BUG block adding children from archived pages
2015-08-24 17:04:46 +12:00
Sam Minnée
a650d6ad39 Merge pull request #1266 from tractorcow/pulls/3.2/packages
Fix missing packages
2015-08-24 17:04:43 +12:00
Damian Mooyman
a3f789c2b5 Update translations 2015-08-24 16:29:40 +12:00
Damian Mooyman
46180f671e Fix missing packages 2015-08-24 16:14:33 +12:00
Damian Mooyman
6c17397322 BUG block adding children from archived pages
Fixes #1260
2015-08-24 15:16:09 +12:00
Sam Minnée
4db4db05af Merge pull request #1263 from ss23/fix_812_oldpageredirector
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
2015-08-21 17:26:09 +12:00
Stephen Shkardoon
b87f5473d9 MINOR Change how OldPageRedirector gets URLs to fix nested redirects
Previously, we would be limited by the way allParams will return 3 parameters
 at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12:00
Sean Harvey
e5a4cdb302 Merge pull request #1261 from dhensby/pulls/remove-nightly
Removing hhvm-nightly as its not supported on travis
2015-08-18 10:07:16 +12:00
Daniel Hensby
4039805ac2 Removing hhvm-nightly as its not supported on travis 2015-08-17 16:53:42 +01:00
Daniel Hensby
80aca3a511 Merge branch '3.1' into 3.2 2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1 Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
* antons--773-nested-virtual-pages-allowed_children:
  Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6 Issue #773 - $allowed_children not allowing nested virtual pages
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
Damian Mooyman
a1b9e99342 Update localisation 2015-08-04 13:02:52 +12:00
Sam Minnée
fd457fe93e Merge pull request #1256 from tractorcow/pulls/3.2/batch-restore-beta
API batch restore action (ALTERNATE SOLUTION)
2015-08-03 22:08:13 +12:00
Damian Mooyman
e22b653e06 API batch restore action 2015-08-03 20:57:30 +12:00
Damian Mooyman
f38402bee3 Merge pull request #1254 from scott1702/update-alerts
Update archive warning to include children pages
2015-08-03 18:14:12 +12:00
Sam Minnée
fa8aa8f92e Merge pull request #1241 from tractorcow/pulls/3.2/predictable-ids
API respect custom attributes on OptionsetField and CheckboxSetField
2015-08-03 17:23:24 +12:00
scott1702
3566e4ed87 Update archive warning to include children pages 2015-08-03 16:10:10 +12:00
Damian Mooyman
a6677b1653 API respect custom attributes on OptionsetField and CheckboxSetField
Must be merged with https://github.com/silverstripe/silverstripe-framework/pull/4390
2015-08-03 16:08:56 +12:00
Damian Mooyman
e45ef93aa7 Merge pull request #1250 from jonom/choose-file-thumbnails-3.2
Moved image thumbnail style rules to Framework
2015-08-03 08:40:21 +12:00
Damian Mooyman
f6752c5ce9 Merge remote-tracking branch 'origin/3.1' into 3.2 2015-07-31 11:42:20 +12:00
Jonathon Menz
7041a43684 Moved image thumbnail style rules to Framework
for consistent styling of image thumbnails in GridFields
2015-07-30 16:15:35 -07:00
Daniel Hensby
aa913dd1d5 Merge pull request #1248 from kinglozzer/pulls/1244-contentcontroller-templates
FIX: ContentController::getViewer() not returning all found templates (fixes #1244)
2015-07-27 13:00:38 +01:00
Loz Calver
af4150312c Update .travis.yml to match framework 2015-07-24 15:27:13 +01:00
Daniel Hensby
6050cc5403 Move to new travis containerised infrastructure 2015-07-24 11:50:12 +01:00
Loz Calver
10b2fdc318 FIX: ContentController::getViewer() not returning all found templates (fixes #1244) 2015-07-24 11:50:09 +01:00
Daniel Hensby
2408c16b0a Move to new travis containerised infrastructure 2015-07-20 15:54:56 +01:00
Daniel Hensby
f55b22bd75 Merge branch '3.1' into 3.2
Conflicts:
	CONTRIBUTING.md
	code/reports/BrokenLinksReport.php
	code/reports/SideReport.php
	tests/model/RedirectorPageTest.php
	tests/reports/ReportTest.php
2015-07-20 11:09:29 +01:00
Damian Mooyman
8bb09086fe Merge pull request #1246 from chillu/pulls/fix-behat-image-hotlink
Behat tests hotlinking to non-existant image
2015-07-20 19:39:12 +12:00
Ingo Schommer
ce85764292 Behat tests hotlinking to non-existant image
Caused by silverstripe.com redesign. Ideally we'd
have a permanent asset hosted there which is clearly marked as a test dependency.
Or create a placeholder for images linked served localhost within the Behat tests,
in which case we wouldn't require a network connection to execute Behat.
2015-07-18 15:38:44 +12:00
Ingo Schommer
d5043ed5c8 Merge pull request #1245 from torleif/patch-2
Update CONTRIBUTING.md
2015-07-15 09:23:17 +12:00
torleif
4c050b727b Update CONTRIBUTING.md
[Fix] dead links for 3.1
2015-07-15 09:17:29 +12:00
Damian Mooyman
2771f2708b Merge pull request #1239 from oddnoc/broken-links-report-broken-link-31
Correct doubly-escaped " marks
2015-07-14 15:29:57 +12:00
Daniel Hensby
2371830790 Merge pull request #1243 from torleif/patch-1
[fix] update dead links
2015-07-13 14:28:04 +01:00
torleif
1975511c63 [fix] update dead links 2015-07-13 12:39:45 +12:00