Commit Graph

61 Commits

Author SHA1 Message Date
Sam Minnee
3ee8f505b7 MINORE: 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 -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
Damian Mooyman
1686c83826 Revert #3425 #3396 to restore deprecated functionality
Fixes #4514
2015-08-24 11:26:25 +12:00
Daniel Hensby
ca8d0f2818 Merge branch '3.1' into 3.2
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
2015-07-20 10:48:01 +01:00
Damian Mooyman
a556b4854a BUG Fix of multiple i18nTextCollector issues: #3797, #3798, #3417 2015-07-09 10:45:08 +12:00
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Sean Harvey
404478b07f Removing @deprecated 3.1 functionality and classes.
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
2014-08-18 16:00:13 +12:00
Loz Calver
791ee7171b API: Prevent large images from repeatedly crashing PHP on resize 2014-07-16 09:18:51 +01:00
Damian Mooyman
d8e9af8af8 API New Database abstraction layer. Ticket #7429
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
2014-07-09 18:04:05 +12:00
Ingo Schommer
f855c146d5 Merge remote-tracking branch 'origin/3.1' 2013-06-02 20:25:32 +02:00
Ingo Schommer
a3c406e4d2 NEW Merge i18nTextCollector with existing (fixes #1838)
This is a necessity for any further 3.1 pushes of master files to getlocalization.
Because we'd otherwise remove existing master strings for CTF etc,
which means we can no longer backport new translations to 3.0
(and there's no way for users to contribute translations to 3.0 via getlocalization).

It's still a very monolithic class, but at least I've refactored it to return
all collected strings without writing it to files (for easier testing).
2013-06-02 20:17:28 +02:00
Nico Haase
8908a6bcd7 This is a fixed version for RegenerateCachedImagesTask (former FlushGeneratedImagesTask) such that it regenerates images instead of silently removing them and breaking existing pages
The pull request also contains some enhancements and fixes to the corresponding testcases.

Fixes #318
2013-04-06 15:56:27 +02:00
Ingo Schommer
3334eafcb1 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:20:53 +01:00
Ingo Schommer
88867cdd23 API Deprecated ScheduledTask and subclasses
Base CliController or BuildTask instead, with custom cron job intervals.
2013-02-18 14:01:15 +01:00
g4b0
f2a9a2657e Fixed error in documentation 2013-02-07 16:49:52 +01:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Ingo Schommer
7ce1572d38 MINOR Stability fixes on new tokenizer implementation of i18nTextCollector, allowing to specify writer and locale arguments on task execution 2012-04-16 12:25:49 +02:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Fred Condo
d370423825 Clean up trailing ?> per coding standard
All sapphire but the lang directory
2012-02-12 12:40:16 -08:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Ingo Schommer
9b29616710 API CHANGE Rearranged files in sapphire to reflect core dependencies more accurately, and have the tests/ folder mirror its folder structure 2011-03-31 09:56:21 +13:00
Ingo Schommer
d61444e976 API CHANGE Moved Translatable class into new 'translatable' module 2011-03-29 18:07:56 +13:00
Ingo Schommer
204fd2c4ce MINOR Moved SiteTree, SiteTreeDecorator, SiteConfig, ErrorPage, RedirectorPage, VirtualPage (and related tests) to "cms" module 2011-03-29 18:07:55 +13:00
Ingo Schommer
07b6d1870a MINOR Checking for class_exists() before SapphireTest::is_running_tests() to avoid including the whole testing framework, and triggering PHPUnit to run a performance-intensive directory traversal for coverage file blacklists
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114332 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-30 05:13:09 +00:00
Sam Minnee
065155eb5d MINOR Removed removeDuplicates() call on linked pages DataObjectSet in MigrateSiteTreeLinkingTask which is no longer required, as the duplicate results were fixed in DataObject directly (from r110200)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112836 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:28:37 +00:00
Sam Minnee
2f159ce93e BUGFIX MigrateSiteTreeLinkingTask now takes a direct map when querying the page tracked links instead of looping through the direct result set. This fixes SQL Server failing when MARS (Multiple Active Result Sets) is disabled (from r110197)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112835 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:28:13 +00:00
Ingo Schommer
a0dd4ff8f0 MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc (from r107725)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:55:22 +00:00
Ingo Schommer
59ae019b6d MINOR Defensive coding in MigrateSiteTreeLinkingTask (from r104594)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 00:30:10 +00:00
Sam Minnee
b7df8b5c86 MINOR: do not save before the rewriting is finished (from r103829)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:09:40 +00:00
Ingo Schommer
df405f2ecd MINOR Cleaned up tabbing and code formatting in automated task classes (from r99753)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105526 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 02:58:59 +00:00
Ingo Schommer
1dec4a33f8 BUGFIX: Change EncryptAllPasswords to BuildTask instead of DailyTask (from r96733)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 01:58:32 +00:00
Ingo Schommer
a11db29672 MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:29:59 +00:00
Ingo Schommer
053431aaf0 MINOR Using jquery-latest.js in FileIframeField and RemoveOrphanedPagesTask
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92476 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:22:30 +00:00
Sean Harvey
03fb434e59 BUGFIX MigrateSiteTreeLinkingTask returns duplicate results from databases like MSSQL - remove any duplicates that may be around (from r91418)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-12 21:46:14 +00:00
Ingo Schommer
e4ca24c7e2 BUGFIX Legacy password hash migration in MemberAuthenticator::authenticate() which fixes the precision problems mentioned in #3004 when a user logs in
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90950 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-06 02:23:30 +00:00
Ingo Schommer
7dc1d607de MINOR Moved Security::encryptallpasswords() to EncryptAllPasswordsTask
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90948 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-06 02:23:13 +00:00
Sam Minnee
d2918f40ed BUGFIX: Hard code the migration task to use Content instead of the no-longer-used FieldName. This should probably be improved to iterate over all HTMLText fields on the model.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-19 05:29:46 +00:00
Andrew Short
86c81bc6b4 FEATURE: Added MigrateSiteTreeLinkingTask to allow plain HTML links to be migrated into shortcode links.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88992 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 00:02:06 +00:00
Geoff Munn
fa937208f2 MINOR FIX: backticks converted to quotes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86501 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-17 00:02:04 +00:00
Ingo Schommer
0cf75cfc65 MINOR Unified permission control for i18nTextCollectorTask, TaskRunner, TestRunner, ModelViewer, DevelopmentAdmin, TestViewer, MigrateTranslatableTask
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86005 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-10 01:49:56 +00:00
Tom Rix
e7e0e9424d MINOR added better handling of pages that result in no URLSegment
MINOR added QuarterHourly scheduled tasks, tidied documentation a little bit

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-17 22:30:27 +00:00
Sam Minnee
f515ed7898 BUGFIX Calling doRestoreToStage() on orphans which don't have a stage record before unpublishing them in RemoveOrphanedPagesTask
MINOR Added "unselect all" and better permission checks to RemoveOrphanedPagesTask (from r78478)
MINOR Fixed visibility of RemoveOrphanedPagesTask->getOrphanedPages() (from r78486)
ENHANCEMENT Allow rebasing of orphans in a subfolder for RemoveOrphanedPagesTask (from r78494)
MINOR set_time_limit for RemoveOrphanedPagesTask (from r78495)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 06:13:33 +00:00
Sam Minnee
f88fb435e3 FEATURE Added RemoveOrphanedPagesTask (from r78473)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 06:11:55 +00:00
Ingo Schommer
104470006e API CHANGE Deprecated Translatable::set_reading_lang(), use Translatable::set_current_locale().
MINOR Renamed internal property Translatable::$reading_lang to $current_lang

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77006 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 05:36:01 +00:00
Ingo Schommer
67180937ff API CHANGE Deprecated Translatable::current_lang(), use Translatable::get_current_locale()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:05:48 +00:00
Ingo Schommer
9306b8b065 ENHANCEMENT Adapted MigrateTranslatableTask to new Locale datamodel and fixed some inconsistencies with translation groups, duplicate records etc
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 23:21:48 +00:00
Ingo Schommer
b12a00c391 MINOR phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-22 22:59:14 +00:00
Ingo Schommer
7ad7f8dcf2 ENHANCEMENT Adjusted SearchForm, Debug, ErrorPage, SiteTree to using locales instead of lang codes
API CHANGE Changed Translatable datamodel to use locales ("en_US") instead of lang values ("en).
API CHANGE Changed Translatable::$default_lang to $default_locale, Translatable::$reading_lang to $reading_locale
API CHANGE Using "locale" instead of "lang" in Translatable::choose_site_lang() to auto-detect language from cookies or GET parameters
API CHANGE Deprecated Translatable::is_default_lang(), set_default_lang(), get_default_lang(), current_lang(), set_reading_lang(), get_reading_lang(), get_by_lang(), get_one_by_lang()
API CHANGE Removed Translatable::get_original() - with the new "translation groups" concept there no longer is an original for a translation
BUGFIX Updated MigrateTranslatableTask to new Locale based datamodel

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-20 08:47:06 +00:00