tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
11,556 Commits 31 Branches 527 Tags 162 MiB
8fca3799c3
Commit Graph

11556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
8fca3799c3 Update module development, remove outdated release steps 2013-06-15 12:06:25 +12:00
Will Rossiter
9775204436 FIX Allow filtering on joined columns 2013-06-15 12:06:24 +12:00
Will Rossiter
0129e185b8 Coding conventions, PHPDoc cleanup 2013-06-15 12:06:24 +12:00
Ingo Schommer
40eed9e902 Merge pull request #2096 from CheeseSucker/patch-1 
ENHANCEMENT: Allow programmers to set OwnerID for new files.
 2013-06-14 11:36:35 -07:00
CheeseSucker
3d9e12baf4 ENHANCEMENT: Allow programmers to set OwnerID for new files. 
NOTE: This change should be reviewed to make sure it does not cause any side effects.

Example use case: 
    An admin porting user images from an old website.
    The script would put the images in the assets folder,
    and then insert them into the database using Image::write()
    and data from the old database.

public function insertImage($data) {
    $image = new Image();
    $image->ParentID = $data->parentId;
    $image->Title = $data->title;
    $image->FileName = $data->filename;
    $image->OwnerID = $data->ownerId;
    $image->write();
    
    // In the current version, this results in all images
    // being owned by Member::currentUser() instead of 
    // the expected $data->ownerId;
}
 2013-06-14 18:30:09 +02:00
Ingo Schommer
a9bf7dfcce Fixed HtmlEditorField.js editor instanciation 
Wasn't parsing data-editor attrs correctly.
Using proper instances of the underlying editor now,
instead of relying on "active editor" states which get
wonky once they lose focus (e.g. when opening a dialog).
 2013-06-14 11:46:07 +02:00
Ingo Schommer
975e09643f Merge pull request #2095 from CheeseSucker/patch-1 
Fixed a translation issue for File.INVALIDEXCEPTION
 2013-06-14 00:51:15 -07:00
Will Rossiter
acf42e87c2 Merge pull request #2090 from chillu/pulls/tabs-float 
Fixed Tab floating in CMS (fixes #1778)
 2013-06-14 00:00:53 -07:00
CheeseSucker
6ce2a90f19 Fixes a translation issue where a parameter isn't replaced. 
Whenever File::Validate() failed due to an illegal file extension, it printed the translated message without replacing the parameter {extensions}.
 2013-06-14 00:08:44 +03:00
Ingo Schommer
5ff69b98ab LeftAndMain.js: Fix 'X-Reload' for IE10 (fixes #647) 2013-06-13 15:17:14 +02:00
Ingo Schommer
d42cbdd613 Removed "Last visited" from admin/myprofile (fixes #648) 
It doesn't make any sense in this context
 2013-06-13 15:01:23 +02:00
Ingo Schommer
9d4b8f61ca Note about IE10 support 2013-06-13 10:27:19 +02:00
Ingo Schommer
385f364018 TinyMCE "Insert Media" screen, update button triggers navigation (fixes #742) 2013-06-13 09:29:55 +02:00
Ingo Schommer
5a94e621c5 Replace DataObject->isNotNull() helper with closure 
Now possible since we support PHP 5.3+ only.
 2013-06-13 07:53:27 +02:00
Sean Harvey
0650dbe1e7 Merge pull request #2091 from robert-h-curry/cms-preview-not-loading 
Always load preview when in preview mode, not in edit mode
 2013-06-12 17:16:17 -07:00
Sean Harvey
0b16cbaee8 Merge pull request #2092 from robert-h-curry/tree-dropdown-unsticky-selection 
Force TreeDropdown to remember selected title.
 2013-06-12 17:15:48 -07:00
Robert Curry
36f0fd7a58 Force TreeDropdown to remember selected title. 2013-06-13 11:36:08 +12:00
Robert Curry
a365759a0d Always load preview when in preview mode, not in edit mode 2013-06-13 11:31:57 +12:00
Ingo Schommer
878600701f Merge pull request #2087 from tractorcow/3.1-summary-field 
API Allow $summary_fields to support methods on DBFields
 2013-06-12 16:00:48 -07:00
Ingo Schommer
65209a0ed5 AssetAdmin reset button and chosen.js (fixes #1640) 
See https://github.com/harvesthq/chosen/issues/215
 2013-06-13 00:45:59 +02:00
Ingo Schommer
98f8191dff Fixed Tab floating in CMS (fixes #1778) 
Removed inline-block from header elements which seems
to cause the issues of tabs stacking on top of each other.
Replaced header background to work on multiline scenarios
Added bottom margin to breadcrumbs so they don't look cramped
when tabs are floated below them.

See https://github.com/silverstripe/silverstripe-framework/pull/1863,
https://github.com/silverstripe/silverstripe-framework/issues/1943,
https://groups.google.com/forum/?fromgroups#!topic/silverstripe-dev/c-W-ZxDlDuA,
http://open.silverstripe.org/ticket/6882
 2013-06-13 00:04:56 +02:00
Damian Mooyman
be986c6524 API Allow $summary_fields to support methods on DBFields 2013-06-13 09:41:24 +12:00
Ingo Schommer
88595e38f9 Merge pull request #2088 from g4b0/cache-comments 
Inline documentation updated
 2013-06-12 08:02:23 -07:00
g4b0
4b7cf5af18 2013-06-12 16:47:07 +02:00
Ingo Schommer
ab9e0286f0 Merge pull request #2051 from kinglozzer/candelete-gridfield-fix 
Fix: Enable delete button for users with canDelete() but no canEdit() permissions
 2013-06-12 02:10:41 -07:00
Ingo Schommer
25ba77d333 Merge pull request #2062 from jthomerson/enhancement_3.1_allow_disabling_prepopulate_version_number_cache 
ENHANCEMENT: allow disabling of Versioned prepopulate_versionnumber_cache
 2013-06-12 01:59:49 -07:00
Ingo Schommer
4df7f5f0f8 Merge pull request #2086 from robert-h-curry/1954-link-editor 
BUG Fix JS issues in treedropdownfield for link editor
 2013-06-12 01:18:30 -07:00
Robert Curry
eaf0fe4b2f BUG Fix JS issues in treedropdownfield for link editor 2013-06-12 16:59:07 +12:00
Sean Harvey
dfdb274773 Merge pull request #2085 from mateusz/password-autocomplete 
Add autocomplete=off switch for the password field.
 2013-06-11 15:16:18 -07:00
Mateusz Uzdowski
d1482bee15 Add autocomplete=off switch for the password field. 
Some clients require disabling of the browser password handling
mechanisms. Add a switch to make it possible without hacking the core.

No change to default behaviour.
 2013-06-12 09:41:18 +12:00
Ingo Schommer
a643f95796 Merge pull request #2080 from tractorcow/3.1-mediadialog-overwrite-hack 
BUG Temporarily disable overwrite warning on HtmlEditorField "insert media".
 2013-06-11 00:11:39 -07:00
Ingo Schommer
1c150ac3a0 Merge pull request #2044 from jonom/patch-3 
FIX #527 : Add Thumbnails to 'Choose another file' dialogue
 2013-06-10 05:13:08 -07:00
Damian Mooyman
78bd73d40d BUG Temporarily disable overwrite warning on HtmlEditorField "insert media" dialogue until this feature properly supports validation error recovery. 2013-06-10 15:35:28 +12:00
Stig Lindqvist
dbc2b62c69 Merge pull request #2054 from chillu/pulls/dataobject-duplicate-hasone 
BUG Correct relation saving in DataObject->duplicateRelations()
 2013-06-07 22:54:36 -07:00
Stig Lindqvist
487a55f9f9 Merge pull request #2052 from chillu/pulls/onchange-tinymce-trigger 
BUG Trigger TinyMCE onChange more frequently
 2013-06-07 22:50:08 -07:00
Stig Lindqvist
2eafd63297 Merge pull request #2077 from halkyon/changepassword_validation_redirection_issue 
BUG If BackURL set, validation errors send the user to wrong place.
 2013-06-07 22:44:13 -07:00
Will Rossiter
6d792adab2 Update documentation static declarations to private 
Also spelling, grammar and line length clean up.
 2013-06-08 15:16:59 +12:00
Sean Harvey
83bff54ec2 BUG If BackURL set, validation errors send the user to wrong place. 
If there's validation errors in the ChangePasswordForm, the user
is taken to the BackURL because redirectBack() will go there if
it's set.

Instead of this, just redirect back to the "changepassword" action
on the Security controller.
 2013-06-08 11:34:58 +12:00
Will Rossiter
31cfcdb08e Merge pull request #2076 from halkyon/passwordvalidator_translate 
Allow PasswordValidator to be translated
 2013-06-07 16:19:40 -07:00
Sean Harvey
7862ececbd Allow PasswordValidator to be translated 2013-06-08 10:48:27 +12:00
Ingo Schommer
4ebd5ab740 Merge pull request #2057 from jthomerson/enhancement_3.1_do_not_run_abstract_test_cases 
ENHANCEMENT: Do not attempt to run abstract test classes
 2013-06-07 07:54:05 -07:00
Will Morgan
1c0ae76f8e Adding passwordless message instead of throwing an exception 2013-06-07 16:52:44 +02:00
Andrew Short
92135acc14 Merge pull request #2063 from g4b0/mysqldatabase-extensible 
Enhancement: replaced private with protected
 2013-06-07 07:51:49 -07:00
Ingo Schommer
117b6887c7 Merge pull request #2070 from stevie-mayhew/patch-2 
MINOR: equality check consistency
 2013-06-07 07:14:29 -07:00
Ingo Schommer
7b7d99d3b1 Merge pull request #2071 from tractorcow/3.1-uploadfield-tweaks 
API Removed user_error  UploadField::setConfig
 2013-06-07 07:13:41 -07:00
Mike Parkhill
574c11a834 Behat: "Insert image from web" feature 
Partially fixes https://github.com/silverstripe/silverstripe-cms/issues/628
Modified a bit by Ingo :)
 2013-06-07 16:10:21 +02:00
Ingo Schommer
fd6060e7be Behat: More robust "field should contain" logic 2013-06-07 16:02:29 +02:00
Ingo Schommer
924664527b Less assumptions in "HTML field contains" step 
Not using the loose idea of a "field name" in the NamedSelector
sense of the word as "field with id exists".
 2013-06-07 15:46:05 +02:00
Ingo Schommer
7dfe5ccbd2 Limit "should see a button" to actually visible elements 2013-06-07 15:45:15 +02:00
Stig Lindqvist
17bca1db86 Behat: Adding context for 'Given I should not see a "xxx" button' 2013-06-07 12:06:01 +02:00