tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity
4,520 Commits 24 Branches 193 Tags 16 MiB
6112ae6ac7
Commit Graph

4520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
358c294092 FIX Tests for 3.2 2015-11-03 11:35:31 +13:00
Damian Mooyman
0d736d0f3e Merge remote-tracking branch 'silverstripe-cms/3.1' into 3.2 
Conflicts:
	.gitignore
	.travis.yml
	README.md
	_config.php
	composer.json
	javascript/ReportAdmin.js
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss
 2015-11-03 11:11:58 +13:00
Will Rossiter
d71c638e0d Merge pull request #8 from christopherdarling/patch-1 
FIX: HtmlEditorConfig should be using content_css
 2015-10-27 09:17:24 +13:00
Christopher Darling
70dedf26e2 FIX: HtmlEditorConfig should be using content_css 
as per https://github.com/silverstripe/silverstripe-framework/pull/4706
 2015-10-26 11:04:44 +00:00
Damian Mooyman
b302a9a9be Merge pull request #1296 from patricknelson/issue-1294-errorpage-fatal-3.1 
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
 2015-10-19 07:59:47 +13:00
Patrick Nelson
ff6c0a3160 FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing. 2015-10-08 17:48:31 -04:00
Damian Mooyman
0df0f35278 Update translations 2015-09-18 14:21:19 +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
353e5938de Update translations 2015-09-02 11:15:52 +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
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
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
Daniel Hensby
0759392980 Merge pull request #2 from sunnysideup/master 
adding counts to report links
 2015-07-22 13:23:52 +01:00
Daniel Hensby
324da5fff4 Merge pull request #4 from jedateach/patch-1 
Added note about visibility of reports
 2015-07-22 13:22:39 +01:00
Daniel Hensby
435ccb79c5 Merge pull request #7 from spekulatius/patch-1 
fixing typo
 2015-07-22 13:21:54 +01:00
Peter Thaleikis
5663bd2116 fixing typo 2015-07-22 21:53:55 +12:00
Daniel Hensby
3f7bbeac65 Move to new travis containerised infrastructure 2015-07-20 16:05:32 +01:00
Daniel Hensby
2408c16b0a Move to new travis containerised infrastructure 2015-07-20 15:54:56 +01:00
Daniel Hensby
740dbbfb99 Merge branch '3' 
Conflicts:
	composer.json
 2015-07-20 15:39:40 +01:00
Daniel Hensby
c56b92a4c3 Merge branch '3.2' into 3 2015-07-20 15:37:49 +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
Fred Condo
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
Daniel Hensby
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
Loz Calver
d78d325073 FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished (fixes #1230) 2015-06-26 10:47:39 +01:00
Daniel Hensby
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
Damian Mooyman
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
Stephen Shkardoon
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
Nathan Glasl
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
Daniel Hensby
2a76be8b94 Bump PHP version 2015-06-21 09:35:13 +01:00
Daniel Hensby
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
Damian Mooyman
bcc7f358a8 Alias master as 4.0 2015-06-18 11:31:48 +12:00
Damian Mooyman
46281d7d33 Alias 3 as 3.3 2015-06-18 11:30:08 +12:00
Daniel Hensby
5e9bce0c06 Merge pull request #1218 from scott1702/quick-fixes 
Increase click-size of multi-selection button
 2015-06-17 16:20:52 +01:00
Daniel Hensby
e9fde144eb Merge pull request #1201 from scott1702/update-content 
Update default home content
 2015-06-17 15:40:17 +01:00
scott1702
bf25dd9492 Increase click-size of multi-selection button 2015-06-17 22:12:00 +12:00
scott1702
60c68098eb Update default home content 2015-06-17 13:04:29 +12:00
Daniel Hensby
e570d4a726 Updating travis provisioner 
Travis will now be more resilient to `composer self-update` failures
 2015-06-15 10:03:40 +01:00
Damian Mooyman
3872b02f65 Merge pull request #1205 from jonom/fix-treedropdown-folders 
FIX: Folder expansion icons
 2015-06-03 10:18:11 +12:00
Jonathon Menz
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