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
15,289 Commits 31 Branches 527 Tags 162 MiB
eaf9d32bc7
Commit Graph

460 Commits

Author SHA1 Message Date
Daniel Hensby
24aaee984e Set the stage reading mode in LeftAndMain 2016-02-02 13:35:39 +00:00
Damian Mooyman
e091bb8474 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	tests/model/VersionedTest.yml
 2016-01-25 15:57:37 +13:00
scott1702
e4222d8186 Add default action from batch actions 2016-01-22 16:02:27 +13:00
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
Nicola Fontana
c39cf2d55f Do not hang on nested parameters in search context 2015-09-23 09:12:02 +02:00
Damian Mooyman
f10785350e Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
 2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php
 2015-09-09 14:35:29 +12:00
Sam Minnée
f4b7cd3f68 Merge pull request #4500 from stevie-mayhew/pulls/get-response 
FEATURE: implement getter and setter usage for response
 2015-08-29 15:35:55 +12:00
Stevie Mayhew
1b57e0ca5b FEATURE: implement getter and setter usage for response 2015-08-29 10:24:06 +12:00
Daniel Hensby
2d4b743090 FIX Members can access their own profiles in CMS 2015-08-26 15:47:51 +01:00
Sam Minnée
942ef04664 Merge pull request #4532 from tractorcow/pulls/3.2/packages 
Add missing packages
 2015-08-24 17:04:39 +12:00
Damian Mooyman
f220adc3e0 Update translations 2015-08-24 16:52:39 +12:00
Damian Mooyman
4a011303b9 Add missing packages 2015-08-24 16:15:38 +12:00
Daniel Hensby
0b177ad20f Merge branch '3.2' into 3 2015-08-18 16:40:20 +01:00
Daniel Hensby
af5ef13e6c Merge branch '3.1' into 3.2 2015-08-18 16:39:35 +01:00
Loz Calver
8b638f56fb FIX: Using undefined var in ModelAdmin 2015-08-18 15:37:15 +01:00
Dan Hensby
c5c8a6a720 Merge remote-tracking branch '3.2' into 3 
Conflicts:
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	css/GridField.css
 2015-08-17 11:59:24 +00:00
Daniel Hensby
a8ab5a468d Merge branch '3.1' into 3.2 
Conflicts:
	admin/code/LeftAndMain.php
	composer.json
 2015-08-17 11:43:28 +01:00
Sam Minnée
5911d50bca Merge pull request #4477 from nickbooties/nickbooties-patch-1 
Fixes #4424
 2015-08-11 17:34:35 +12:00
Nick
c4c4d79c26 Fix for Issue #4424 
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces.
Uses className for element ID on ImportSpec template.
 2015-08-11 14:56:13 +10:00
Stevie Mayhew
ea7b0714c2 MINOR: be more specific with background class for menu 2015-08-07 13:22:57 +12:00
Daniel Hensby
009458e342 Fixing rubbish login message when trying to access the CMS 2015-08-04 12:23:22 +01:00
Nick
9ad64716cc Issue #4424 
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424
 2015-08-04 15:55:07 +10:00
Damian Mooyman
e0a560051e Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	css/AssetUploadField.css
 2015-07-31 14:33:16 +12:00
Damian Mooyman
7ee444e08a Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	admin/code/LeftAndMain.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	filesystem/File.php
	model/DataObject.php
	model/DataQuery.php
	search/filters/FulltextFilter.php
	search/filters/SearchFilter.php
	tests/core/ClassInfoTest.php
	tests/filesystem/FileTest.php
	tests/model/DataListTest.php
 2015-07-31 11:38:18 +12:00
Damian Mooyman
ae783e9598 Merge pull request #4042 from selay/3.1 
Hardcoded http:// cause browser warnings in admin panel
 2015-07-28 09:14:34 +12:00
Dan Hensby
64ceba133c Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	admin/css/screen.css
 2015-07-20 14:08:36 +00: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
Jonathon Menz
272f6d7700 Improved site tree tooltips 
Now shows full title and friendly singular name for page type
 2015-07-16 08:49:43 -07:00
Tom Densham
b17b186e93 Convert FQCNs to html safe strings 
Convert namespaced class names to html safe strings in `LeftAndMain.php` `CMSMenu.php` and `LeftAndMain.Main.js` by replacing backslashes (\) with dashes (\) and removing special characters with `Convert::raw2htmlname()`
 2015-07-15 15:33:00 +01:00
David Craig
ca039e15ef BUG Fix regressions in changes to batch action feature 2015-06-23 16:28:25 +12:00
David Craig
a6013ed1d0 Move filters from panel to header 
- The filter panel has been removed in favour of a search menu in the header.
- The multi-select component has been updated:
  - Now called 'Bulk actions'
  - Styling updated
  - Added placeholder text / removed redundant option
  - Now also appears in SiteTree view
 2015-06-23 13:08:23 +12:00
Hamish Friedlander
4e8aa72702 Merge pull request #4310 from tractorcow/pulls/3.2/deprecations 
Set deprecation level for all changes in 3.x to 4.0
 2015-06-19 15:58:27 +12:00
Damian Mooyman
d9c7d4538b Update user help link for 3.2 2015-06-19 15:56:12 +12:00
Damian Mooyman
e14f743bf0 Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
Damian Mooyman
0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
 2015-06-17 11:24:25 +12:00
Damian Mooyman
a8ace75341 API Support for multiple HTMLEditorConfig per page 2015-06-09 12:17:55 +12:00
Damian Mooyman
a72bd16f42 API Deprecate delete in favour of archive 
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug in reporting publishing of error pages
Restoring a page also restores parents
 2015-06-03 14:24:27 +12:00
Damian Mooyman
8331171f2c Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
 2015-06-02 19:13:38 +12:00
Loz Calver
8b4a9a3988 Store current page before marking tree nodes (fixes #4137, fixes silverstripe/silverstripe-cms#1135) 2015-05-07 16:01:24 +01:00
Damian Mooyman
8863797b76 API Enable tree filter highlighting 
Decoupling of CMS / Framework
 2015-05-04 17:06:16 +12:00
Stevie Mayhew
0d94cf15a5 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
David Craig
3122226273 Add toggleable description to CMS fields 2015-04-24 11:40:29 +12:00
Damian Mooyman
43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php
 2015-03-31 19:54:15 +13:00
ielmin
b617ef1abd Hardcoded http:// cause browser warnings 2015-03-26 13:20:21 +11:00
Naomi Guyer
636cddb4bc BUG: export and print buttons outside button row 
Export and print buttons are appearing outside the button row in model admin, meaning that if the add button is removed (say, by removing the create permission), the buttons are flush with the gridfield.
 2015-03-26 14:08:46 +13:00
Daniel Hensby
13cec2ee81 Using sigular name for model import form rather than class name 2015-03-13 13:36:52 +00:00
Damian Mooyman
dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
 2015-02-20 10:17:19 +13:00
Oliver Shaw
7484b4f5d9 Trim ModelAdmin SearchForm values 2015-02-08 19:25:51 +13:00
Elvinas L.
ab24ed3bea FIX. Use i18n_plural_name() instead of plural_name() 2015-01-13 15:31:17 +02:00