Commit Graph

9940 Commits

Author SHA1 Message Date
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
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
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
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
Sean Harvey
fca9831e66 Remove end php tag from TemplateIteratorProvider 2012-10-10 11:15:55 +13:00
Simon Welsh
40276fdd32 Merge pull request #859 from sminnee/break-up-contributing-docs
Break up contributing docs
2012-10-08 19:08:37 -07:00
Sam Minnee
9e7b8baecf Point people at silverstripe-dev and not the forum for discussing patches. 2012-10-09 14:53:48 +13:00
Sam Minnee
7d203a9af1 Moved all translator-targeted documentation to contributing/translation and left translation-process for advanced topics relating to module maintainers and the core team. 2012-10-09 14:53:47 +13:00
Sam Minnee
c4d2f9e6b2 Corrected a number of inbound links pointing to the documentation. 2012-10-09 14:53:47 +13:00
Sam Minnee
c28dd4c24b Make the copyright assignment clearer, and gave some explanation of why we do this. 2012-10-09 14:53:45 +13:00
Sam Minnee
65d20e4acc Simplified some of the code contribution guidelines.
The current guides have a few areas where they recommend an approach that is more complex than what most people take.

 - Rebase straight onto upsteam/msaster
 - Force push a rebased branch

I also fixed the conflict resolution help to be relevant to rebase commands, and kept the push instruction out of the rebase instruction.
2012-10-09 14:53:45 +13:00
Sam Minnee
433d29ce7b Removed 'release candidate branch' step of contributing.
I don't know what that release candidate branch stuff is, but:

 * I've never seen any of the core team do it
 * I think it's overkill for most patches
 * I think it's being too prescriptive: if contributors want to do that, that's cool, but it doesn't affect the core team.
 * It makes our contributing guidelines more complex than they need to be.
2012-10-09 14:53:44 +13:00
Sam Minnee
439339d4fc Broke up contributing docs into 4 sections and unified code contribtion guide.
The guidelines for contributing code were scattered across a section of contributing.md and collaboration-on-git.md.  I've updated this to have separate contributing/code.md page with all the content in a single cohesive page.  We also have contributing/documentation.md, contributing/issues.md and contributing/translation.md.
2012-10-09 14:53:39 +13:00
Ingo Schommer
423f1844bd Merge pull request #855 from kentvv/patch-1
Update docs/en/howto/extend-cms-interface.md
2012-10-08 14:30:03 -07:00
Sean Harvey
8351dc8c9c Merge pull request #858 from chillu/pulls/tinymce-delayed-show
BUG Delay HTMLEditorField showing (TinyMCE workaround)
2012-10-08 13:00:13 -07:00
Ingo Schommer
680baab925 BUG Delay HTMLEditorField showing (TinyMCE workaround)
Delayed show because TinyMCE calls hide() via
setTimeout on removing an element,
which is called in quick succession with adding a new editor
after ajax loading new markup

See e0378ceb77
and https://github.com/silverstripe/sapphire/pull/847
2012-10-08 21:44:03 +02:00
Ingo Schommer
b38cb39256 BUG Prevent CMS submission on disabled buttons (#7928)
Thanks @jbarrios for triggering this fix
2012-10-08 09:29:08 +02:00
kentvv
ef0cd7b428 Update docs/en/howto/extend-cms-interface.md
Minor changes to file links.
2012-10-08 13:11:33 +13:00
Simon Welsh
c782e00178 Merge pull request #854 from Juanitou/patch-3
Update docs/en/howto/simple-contact-form.md
2012-10-07 16:09:18 -07:00
Juan Molina
ab065b41bd Update docs/en/howto/simple-contact-form.md
Minor code highlighting fix.
2012-10-08 00:11:57 +03:00
Sean Harvey
0cce58040a BUG Fix deprecated use of dataFieldByName() in Member_Validator 2012-10-08 09:26:28 +13:00
Will Rossiter
62adea5882 Merge pull request #851 from Juanitou/patch-2
Update docs/en/reference/dataextension.md
2012-10-07 12:32:28 -07:00
Juan Molina
2c480ed94e Update docs/en/reference/dataextension.md
Removed ForumRole broken link and minor typo.
2012-10-07 18:11:40 +03:00
Ingo Schommer
2034927d31 Merge pull request #850 from willmorgan/patch-2
Fixed grammatical error for Form.FIELDISREQUIRED
2012-10-05 10:28:07 -07:00
Will Morgan
1c7b7d0ab5 Fixed grammatical error for Form.FIELDISREQUIRED 2012-10-05 18:04:38 +02:00
Ingo Schommer
be13ba3ef9 Removed 'built-in page controls' links from docs
See https://github.com/silverstripe/sapphire/pull/842, thanks Juanitou!
2012-10-05 17:39:19 +02:00
Ingo Schommer
890bac8de3 Docs: GridFieldDeleteAction 2012-10-05 17:39:19 +02:00