tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
4,937 Commits 29 Branches 403 Tags 28 MiB
75d72285c7
Commit Graph

73 Commits

Author SHA1 Message Date
Damian Mooyman
e378332ff3
API Update for new SilverStripe\ORM namespace 2016-06-24 11:00:21 +12:00
Damian Mooyman
d7d6fd8758 Merge 3 into master 
# Conflicts:
#	code/controllers/CMSPageAddController.php
#	code/model/ErrorPage.php
#	composer.json
#	css/screen.css
#	tests/behat/features/insert-a-link.feature
 2016-04-29 14:34:29 +12:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2 
Conflicts:
	code/reports/SideReport.php
 2016-04-26 00:09:19 +01:00
Daniel Hensby
bc31d9ca9c FIX Use Controller::join_links() in Reports 2016-03-10 16:39:00 +00:00
Damian Mooyman
849cd898a4 Cleanup trailing whitespace 2016-03-09 10:28:45 +13:00
Sam Minnee
bbc3aaaf9f MINOR: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:32:05 +13:00
Damian Mooyman
b26c3a3b4e Restore deprecated reports 2015-11-10 17:17:56 +13: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
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
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
Damian Mooyman
1f9fc33349 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	code/model/SiteTree.php
	code/model/SiteTreeLinkTracking.php
	tests/controller/CMSMainTest.php
 2015-06-02 19:23:48 +12:00
Michael Strong
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
Daniel Hensby
fe8cbc89d4 Remove double escaping of report data 2015-02-08 02:11:17 +00:00
Damian Mooyman
a395c5322f API Move of codebase to parameterised query database abstraction layer 
API Renamed DB static methods to properly conform to naming convention (lowercase, underscored)
API Replaced deprecated method
 2014-07-07 15:07:37 +12:00
Damian Mooyman
7277dc1600 BUG Fix sorting on main ReportAdmin grid 
ref: CWPBUG-133
 2014-05-15 14:49:41 +12:00
Simon Welsh
5024a48f89 FIX: Reports with Parameter fields override ReportTitle and ReportDescription 
Fixes #696
 2014-03-16 19:09:47 +13:00
Ingo Schommer
2a4191d449 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-02 12:21:50 +02:00
Ingo Schommer
92e0c410b8 Fixed report link escaping 2013-10-02 12:19:23 +02:00
Ingo Schommer
8a96bab70d Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 18:50:52 +02:00
Ingo Schommer
79996a76fe Clearer escaping in ReportAdmin 
No direct security issue since report titles can't be set by the user
 2013-09-24 21:37:26 +02:00
Tom Densham
4f30fedafd FIX: GridField button styling in reports 2013-08-29 13:56:29 +01:00
Ingo Schommer
51c8e8639e API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:21:04 +01:00
Will Rossiter
56346a50bf API: moved reports API to separate module 2013-01-17 21:58:03 +13:00
Ingo Schommer
93bee9422a Don't duplicate SS_Report title in GridField 2013-01-14 17:12:27 +01:00
Ingo Schommer
2e164eae51 API Report::get_reports() returns native array (fixes #8096) 
Used to return ArrayList, but since 9d74c99e08 its no
longer using keys, which they functionality using these return
values rely on. Hence the breakage of ReportAdmin,
since no report was being detected as "current" by looking
through the array keys.
 2012-12-13 00:46:17 +01:00
Sean Harvey
35bcf69c01 Removed deprecated Register::register() and unregister() 
Report automatically includes reports instead, and
add_excluded_reports() can be used to exclude certain reports
 2012-11-15 14:30:47 +13:00
Russell Michell
72543440cb BUGFIX: Fixed SideReport for use with Postgres (using v8.4) which requires table/column-names to be quoted. MySQL seems OK with either/both 2012-10-19 16:04:32 +13:00
Sean Harvey
98197525c6 Remove use of backticks in BrokenLinksReport, always use ANSI quotes 2012-10-11 17:24:23 +13:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Ingo Schommer
9124d8ae1a Fixed report title column localization 2012-09-11 12:49:27 +02:00
Ingo Schommer
8055fc2e7b FIX Corrected page edit links in reports 2012-07-12 16:30:17 +02:00
Ingo Schommer
57c615d6b2 NEW Reinstated filters in ReportAdmin 
- Moved report table generation back to its original location in Report->getCMSFields(),
in order to keep it customisable rather than duplicating it in ReportAdmin.
- Using History.js to set URL state and reload panel
- Namespacing filter GET parameters in order to only include them in URL state
 2012-07-12 16:19:23 +02:00
Sam Minnee
792c9058fa BUGFIX: Fixed DataList operations to respect the fact that they're idempotent. 2012-06-15 15:30:08 +12:00
Ingo Schommer
38f1236b1f MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:05:19 +02:00
Julian Seidenberg
8ad93a197e BUGFIX: check for abstract classes when automatically registering SS_Report classes. Abstract classes are now no longer included in the list of Reports. Includes unit test for this scenario. 2012-04-20 16:32:39 +12:00
Ingo Schommer
52e69dd1fd MINOR Removed usage of deprecated $priority argument for _t() 2012-04-15 16:49:31 +02:00
Ingo Schommer
73a466c927 Merge branch 'integration' 2012-04-11 16:25:46 +02:00
Sean Harvey
d914ee0f2c MINOR Fixing ereg functions with preg in SideReport and Widget 2012-04-10 22:16:17 +12:00
Julian Seidenberg
8df5cd74fc BUGFIX: SSF-168 fixing "print" and "export to CSV" button in Report Admin 2012-04-10 11:15:29 +12:00
Ingo Schommer
76f4e6d93b Merge branch 'master' into integration 2012-04-09 21:08:37 +02:00
Andrew O'Neil
4c76c8563c ENHANCEMENT: Use GridFields to show reports in the ReportAdmin 2012-04-04 17:58:29 +12:00
Julian Seidenberg
349a04d049 API-CHANGE: SSF-168 changing the API/code-conventions for excluding specific reports. get_reports method now returns an ArrayList instead of an array of SS_Reports. 2012-04-04 10:58:48 +12:00
Julian Seidenberg
ee220bbcce API-CHANGE: SSF-168 initial rearranging the SS_Report class for use in SS3. Deprecating unnecessary methods, moving code around, rewriting get_reports method and writing unit tests 2012-04-03 18:06:35 +12:00
Sean Harvey
0ea9451014 MINOR Fixes to method arguments in cms classes for E_STRICT support. 2012-03-27 21:42:54 +13:00
Fred Condo
d99e3a0927 Code cleanup: removed trailing ?> markers per code standard. 
All cms module except lang directory.
 2012-02-13 12:48:41 -08:00
Sam Minnee
3acffaa5bb MINOR: Removed use of deprecated FieldSet in favour of FieldList. 2011-10-29 17:41:51 +13:00
Stig Lindqvist
d81b46f141 MINOR Fixed some inline documentation 2011-10-27 20:24:46 +02:00
Stig Lindqvist
d799c80cc5 API CHANGE Changed name from DataObjectSet to either ArrayList or DataList 2011-10-27 20:24:45 +02:00
Stig Lindqvist
05e90838c0 API CHANGE Switch usage from FieldSet to FieldList 2011-10-27 20:24:45 +02:00
Sam Minnee
32ab772615 BUGFIX: Use SSReport::description() (by sminnee, merged from r100009) 2011-10-07 12:08:12 +02:00