Commit Graph

10242 Commits

Author SHA1 Message Date
Simon Welsh
bedb579b07 Merge branch '3.0' 2012-10-23 15:21:20 +13:00
Simon Welsh
29c2fec977 Changes flush and build URLs for tutorials. 2012-10-23 13:38:53 +13:00
Naomi Guyer
84851c96a7 Remove sub navigation for "Files" (fixes 7956) 2012-10-23 09:55:08 +13:00
Sam Minnée
1b1f645157 Merge pull request #885 from Martimiz/3.0-DocUploadField
ENHANCEMENT - UploadField documentation
2012-10-22 13:20:14 -07:00
martimiz
3b65b38826 UPDATE: replace subclassing with a DataExtension, add has_many warning
I replaced the subclassing example by one using a DataExtension. This
is the preferred way to add extra functionality to the Image class. You
can now add any existing image from the assets section instead of only
those belonging to the subclass.

Added a warning not to use has_many relations, because the UploadField
doesn't fully support them.
2012-10-22 12:28:18 +02:00
Will Rossiter
e62a5116da Merge pull request #888 from adrexia/7940-right-title-fix
BUG: No indent on Right Title (fixes #7950)
2012-10-17 21:51:55 -07:00
Naomi Guyer
9158dead67 BUG: No indent on rightTitle (fixes #7950)
Added margin and made non checkbox right title's match similar labels
used elsewhere.
2012-10-18 16:23:49 +13:00
Sean Harvey
f593002b03 Merge pull request #879 from tractorcow/3.0-test-fixes
BUG / API Fixes to test cases requiring code for consolidating newlines
2012-10-17 15:24:22 -07:00
Sean Harvey
713fe809bb Merge pull request #883 from mateusz/schema-updating-flag
API Add the ability to query if the schema update is in progress.
2012-10-17 12:58:51 -07:00
Martimiz
38b0c672ec Merge pull request #1 from Zauberfisch/patch-1
MINOR: fixed docs
2012-10-17 01:56:22 -07:00
Ingo Schommer
ee3954d5d7 Merge pull request #884 from icecaster/master
Fix: scaffolded Enum dropdown field always returning empty string
2012-10-16 23:28:10 -07:00
icecaster
8a7f9ede97 fixed empty string always on scaffolded enum fields 2012-10-17 12:30:05 +13:00
Damian Mooyman
0d7816b55d BUG Fixed issue with Deprecation failing to extract the module from a stacktrace, especially on non-unix systems
API Added Convert::nl2os function to normalise end of line characters across systems with tests
BUG Fixed i18n unit tests in non-unix systems constantly failing
BUG Fixed problems with HTMLCleaner tests failing in non-unix systems
2012-10-17 11:57:16 +13:00
Mateusz Uzdowski
8eb0fa91bd API Add the ability to query if the schema update is in progress.
The specific situation where this is useful is where populateDefaults on
DataObjects needs to query the database. This will break the dev/build
when it tries to create the object via singleton - the query will not be
able to be executed if the table is not there or its schema has changed.

For an example of such use case see Translatable::populateDefaults.
2012-10-17 11:45:21 +13:00
Naomi Guyer
1a864d739d BUG: Force gridfield to wrap on long content
Make sure gridfield cells wrap. Added word-warp, so long words will
break apart to wrap, and a max-width.

The max-width number is semi-arbitrary. In practice it does not act as
a real max-width, but as some sort of limit on the percentage.
Unfortunately, this fix has no effect at all on any version of IE.
2012-10-17 10:33:18 +13:00
Zauberfisch
3a9edde8c4 MINOR: fixed docs
fixed AllowedExtensions docs
added AllowedMaxFileSize docs
2012-10-16 20:53:12 +00:00
martimiz
1c32cde7e7 ENHANCMENT - documentation for the UploadField
Documentation for the uploadfield. Only the implementation in the CMS
is documented, as the field doesn't seem to fully support being used in
the frontend just yet.
2012-10-16 19:14:52 +02:00
Ingo Schommer
28dce229a3 Build status in README 2012-10-16 18:26:20 +02:00
Ingo Schommer
b5fd9e6a8d Merge pull request #684 from adrexia/add-new-button
BUG: Adjust css for actions toolbar on pages (fixes 7649)
2012-10-16 07:21:27 -07:00
Ingo Schommer
2cc80abe65 Merge pull request #875 from mateusz/gridfield-relation-search
FIX Pass only the search string where testing, not the entire form.
2012-10-16 06:41:33 -07:00
Ingo Schommer
9e34a989a8 Removed wrong datamodel docs
See https://groups.google.com/forum/?hl=en&fromgroups=#!topic/silverstripe-dev/Leh8fN0MjDY
2012-10-16 15:07:47 +02:00
Ingo Schommer
6a06965b37 Merge pull request #881 from simonwelsh/2.4-5.4-fixes
Minor PHP5.4 fixes
2012-10-16 06:02:12 -07:00
Simon Welsh
4ff8cff262 Minor PHP5.4 fixes
Explictly excludes E_STRICT from live error level and handle arrays in a backtrace
output, rather than trying to convert to string.
2012-10-16 23:37:30 +13:00
Ingo Schommer
f365134375 Added 2.4.8-rc1 changelog 2012-10-16 11:09:26 +02:00
Ingo Schommer
1181ba089a Merge remote-tracking branch 'origin/3.0'
Conflicts:
	.travis.yml
2012-10-16 10:26:04 +02:00
Ingo Schommer
be8ab2ef56 Travis branch exclusions 2012-10-16 10:25:18 +02:00
Ingo Schommer
392543bde3 BUGFIX Don't' set 'Referer' header in FunctionalTest->get()/post() if its explicitly passed to the method 2012-10-16 10:17:10 +02:00
Ingo Schommer
46064f8f88 SECURITY More solid relative/site URL checks (related to "BackURL" redirection)
Return true for Director::is_absolute_url() checks if they're prefixed with two or more slashes (as browsers interpret this as a valid URL)

More solid URL checks in Director::is_site_url(), using a conservative parse_url() hostname comparison rather than Director::makeRelative(), which is not designed for security purposes
2012-10-16 10:17:07 +02:00
Will Rossiter
9eb4af37bf Merge pull request #878 from chillu/pulls/alternative-db-session
BUG Using Session::set() for DB::set_alternative_database_name()
2012-10-15 22:34:05 -07:00
Sean Harvey
a171c7e4b0 BUG Fixing regression in 26d70d6fca with formatted output in SS_HTMLValue
If formatOutput is set to TRUE, then the regexes in getContent()
will not match the newlines, and the output will include html, body
and meta tags. Introduce a few new tests to ensure the output is
correct, and fix the regex.
2012-10-16 11:59:30 +13:00
Ingo Schommer
35da873ad9 BUG Using Session::set() for DB::set_alternative_database_name()
Setting session directly through $_SESSION relies on
session_autostart which might not be set on every environment,
and isn't consistent with other framework use.
2012-10-15 20:40:38 +02:00
UndefinedOffset
908869290e FIX 7906 Regression: GridFieldConfig_RelationEditor: Removing relation deletes data object 2012-10-15 13:41:11 -03:00
Mateusz Uzdowski
e84b0339d8 FIX Pass only the search string where testing, not the entire form. 2012-10-15 16:47:54 +13:00
Sean Harvey
f6a90467e4 Merge branch '3.0' 2012-10-15 10:10:01 +13:00
jean
574c53d5ba FIX 7927 Redirect to the parent controller after deleting an item in a gridfield (edit form) 2012-10-12 18:09:17 +02:00
Ingo Schommer
a3295e2a37 API File->canEdit() returns TRUE by default (not checking CMS perms)
This is a measure to support form fields and controllers
interacting with files in different contexts,
for example an UploadField used in a ModelAdmin,
or a website frontend. The check for 'CMS_ACCESS_AssetAdmin'
was too restricting. This wasn't a problem in 2.x simply because
the old FileField/Upload classes didn't respect File->can*()
permissions.
2012-10-12 15:42:06 +02:00
Ingo Schommer
5be3a4c35a NEW DataList->filterAny() 2012-10-12 15:24:25 +02:00
martimiz
5186bada17 FIX DateField Calendar - make dates with day- and monthnames validate
In locales other than en_US, as a result of missing jQuery locale
files, the DatePicker defaulted to English whenever day and monthnames
were used, breaking validation. Needed to change official locale files
before adding, because Zend_Date and jQuery day/monthnames not matching
again breaks validation.

Removed hard setting the names to uppercase, breaking validation for
other locales

Changed order in convert_iso_to_jquery_format(), to prevent EEE(E)
settings from being overwritten

Added a check for existing locale files, and made DatePicker fallback
to ISO yyy-MM-dd if a missing locale file would otherwise break
validation.

Added documentation for the DateField
2012-10-12 10:16:35 +02:00
Sam Minnée
a4afea127e Merge pull request #868 from halkyon/dataobject_model
BUG Fixing model not being set before populateDefaults()
2012-10-11 21:12:10 -07:00
Sean Harvey
fa29930419 Merge pull request #869 from robert-h-curry/travis-test-manifest
Exclude test/travis/_config.php from being include in the test manifest.
2012-10-11 21:11:10 -07:00
Robert Curry
4c35c302d2 Exclude test/travis/_config.php from being include in the test manifest. 2012-10-12 17:07:42 +13:00
Will Rossiter
09132759ec Merge pull request #866 from Juanitou/patch-4
Update docs/en/installation/from-source.md
2012-10-11 21:01:38 -07:00
Sean Harvey
bc345803d5 BUG Fixing model not being set before populateDefaults()
In cases where a getter on a DataObject calls getComponent() or
other relational getter, $this->model won't have been set at
this point, and a fatal error is triggered.

This fixes it so $this->model is set *before* populateDefaults()
in DataObject::__construct() and the getters can operate normally.
2012-10-12 09:57:11 +13:00
Ingo Schommer
6de479cce5 Added github-compatible contributing notes 2012-10-11 17:20:00 +02:00
Juan Molina
7625d103f0 Update docs/en/installation/from-source.md
Removed broken links and confusing contributing/collaboration text.
2012-10-11 17:06:51 +03:00
Sean Harvey
9bb190813f Fixing BulkLoader to use increase_time_limit_to() 2012-10-11 17:12:27 +13:00
Sean Harvey
bc64de0264 Fixing misleading SimpleImageField deprecation message 2012-10-11 16:58:57 +13:00
Sean Harvey
27a7fc34c1 Fixing misleading ImageField deprecation message 2012-10-11 15:40:55 +13:00
Sean Harvey
fe65da7250 Merge pull request #863 from tractorcow/3.0-security-DI-fixes
BUG: Fixed use of DI in the Security controller
2012-10-10 18:04:43 -07:00
Damian Mooyman
c99991ba7a BUG Dummy Page_Controller initiated during login now is correctly initialised via dependency injection 2012-10-11 13:45:54 +13:00