5663bd2116
fixing typo
2015-07-22 21:53:55 +12:00
3f7bbeac65
Move to new travis containerised infrastructure
2015-07-20 16:05:32 +01:00
2408c16b0a
Move to new travis containerised infrastructure
2015-07-20 15:54:56 +01:00
740dbbfb99
Merge branch '3'
...
Conflicts:
composer.json
2015-07-20 15:39:40 +01:00
c56b92a4c3
Merge branch '3.2' into 3
2015-07-20 15:37:49 +01:00
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
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
d5043ed5c8
Merge pull request #1245 from torleif/patch-2
...
Update CONTRIBUTING.md
2015-07-15 09:23:17 +12:00
4c050b727b
Update CONTRIBUTING.md
...
[Fix] dead links for 3.1
2015-07-15 09:17:29 +12:00
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
f9cceaada0
Correct doubly-escaped " marks
...
The links in the Broken Links Report had extraneous " marks that made
them unusable. This fixes the links.
2015-07-01 17:42:26 -07:00
284a0f0e13
Merge pull request #1231 from kinglozzer/pulls/redirectorpage-finished-response
...
FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished (fixes #1230 )
2015-06-26 16:46:52 +01:00
d78d325073
FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished ( fixes #1230 )
2015-06-26 10:47:39 +01:00
524b36b75c
Merge pull request #1213 from nglasl/3.1
...
FIX Enforced the published/draft selection for SS reports, which was bein…
2015-06-24 08:08:37 +01:00
3ac29817ba
Merge pull request #1206 from ss23/permissions_fix
...
Fix duplicate not having the correct permission check
2015-06-23 17:32:35 +12:00
b71a521c21
Fix incorrect permission check on duplicate()
...
Will now properly fall back to the canCreate() on the parent
2015-06-23 16:42:08 +12:00
0de71d45db
Enforced the published/draft selection for SS reports, which was being ignored due to previous code refactoring.
2015-06-22 16:05:13 +10:00
2a76be8b94
Bump PHP version
2015-06-21 09:35:13 +01:00
0b92a61e51
Updating docs link in default install
...
Fixing the default Content for Homepage to link to docs.silverstripe.org (there's an "s" at the end of "docs")
2015-06-18 16:47:10 +01:00
bcc7f358a8
Alias master as 4.0
2015-06-18 11:31:48 +12:00
46281d7d33
Alias 3 as 3.3
2015-06-18 11:30:08 +12:00
5e9bce0c06
Merge pull request #1218 from scott1702/quick-fixes
...
Increase click-size of multi-selection button
2015-06-17 16:20:52 +01:00
e9fde144eb
Merge pull request #1201 from scott1702/update-content
...
Update default home content
2015-06-17 15:40:17 +01:00
bf25dd9492
Increase click-size of multi-selection button
2015-06-17 22:12:00 +12:00
60c68098eb
Update default home content
2015-06-17 13:04:29 +12:00
e570d4a726
Updating travis provisioner
...
Travis will now be more resilient to `composer self-update` failures
2015-06-15 10:03:40 +01:00
3872b02f65
Merge pull request #1205 from jonom/fix-treedropdown-folders
...
FIX: Folder expansion icons
2015-06-03 10:18:11 +12:00
dbe2ad4f9f
FIX: Folder expansion icons
...
This is a companion fix for https://github.com/silverstripe/silverstripe-framework/pull/4202
2015-05-29 08:43:44 -07:00
0557c0d47b
Update translations
2015-05-14 13:52:21 +12:00
bb177249ba
Merge pull request #1170 from tractorcow/pulls/3.1/cms-test
...
BUG Fix CMSMainTest attempting to render page on Security permission error
2015-04-29 00:12:47 +12:00
221281dade
Merge pull request #1181 from dhensby/pulls/injector-searc-form
...
FIX Use SearchForm::create to instantiate SearchForm
2015-04-29 00:11:52 +12:00
a5ef364e67
Merge pull request #1140 from InfinityIo/sitetree-docblock-improvements
...
PHPDoc improvements for SiteTree and SiteTreeLinkTracking
2015-04-26 18:43:43 +12:00
5163690bdc
PHPDoc improvements for SiteTree and SiteTreeLinkTracking
...
- Removed @param/@method references to fields from extensions
- Added @mixin references to extensions
- Fixed incorrect PHPDoc @params and @returns
- Fixed wrapping width on many docblocks
- Added and/or improved method documentation when missing or confusing
- Fixed typos as found
2015-04-20 20:59:52 +12:00
5ab15da8fe
Concat links in "broken links" report ( fixes #1117 )
...
Fixes operation with any modules that add GET parameters to CMS links,
such as the Translatable module.
Pull request by @micmania1, see https://github.com/silverstripe/silverstripe-cms/pull/1118 .
Modified by @chillu based on peer review feedback.
2015-04-19 22:39:57 +12:00
819954b8b4
Merge pull request #1186 from colintucker/1150-save-delete-buttons-files
...
Issue #1150 : Removed Save and Delete buttons from regular edit form.
2015-04-19 22:00:06 +12:00
02fcf6429b
Issue #1150 : Removed Save and Delete buttons from regular edit form.
2015-04-17 09:19:15 +10:00
a71f5f99fa
FIX Use SearchForm::create to instantiate SearchForm
2015-03-31 17:03:17 +01:00
7f1f615634
Merge remote-tracking branch 'origin/3.1.11' into 3.1
2015-03-19 17:51:25 +13:00
8e2ed31453
Merge pull request #1176 from tractorcow/pulls/3.1.11/fix-page-create
...
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 16:36:39 +13:00
a84361e4e8
Ensure SiteConfig::canView
2015-03-19 16:16:54 +13:00
3df41e1176
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 15:29:38 +13:00
c0a44db56b
Merge pull request #1154 from uniun/missing-translations-entity
...
FIX. Missing translation entity
2015-03-10 22:50:26 +13:00
c238e1e15b
Update translations
2015-03-09 17:11:50 +13:00
cabd8bbab9
Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting
...
FIX: VirtualPages use correct casting for 'virtual' database fields
2015-03-06 11:29:18 +13:00
6c92a86d2e
BUG Fix CMSMainTest attempting to render page on Security permission error
2015-02-24 17:27:48 +13:00
c7814cffc9
Update translations
2015-02-16 11:54:06 +13:00
0a8cb64a5c
Merge pull request #1165 from dhensby/pulls/fixes
...
Pulls/fixes
2015-02-13 11:54:26 +13:00
fe8cbc89d4
Remove double escaping of report data
2015-02-08 02:11:17 +00:00
a530085016
FIX External redirects shouldnt show in preview pane
2015-02-08 00:30:38 +00:00
cfcbfea88e
Merge pull request #1159 from micmania1/patch-3
...
BUG Correctly sanitise Title
2015-01-22 22:23:26 +13:00
Peter Thaleikis
Daniel Hensby
Daniel Hensby
Damian Mooyman
Ingo Schommer
torleif
Fred Condo
Loz Calver
Stephen Shkardoon
Nathan Glasl
scott1702
Jonathon Menz
Ingo Schommer
Nik Rolls
Michael Strong
Colin Tucker
Daniel Hensby
Hamish Friedlander