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
17,090 Commits 31 Branches 527 Tags 162 MiB
345b4d56e6
Commit Graph

17090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
0ab33b205d Merge pull request #5906 from robingram/fixture-doc-update 
Change order of fixtures in example
 2016-08-31 17:40:03 +01:00
Daniel Hensby
c7e85d61e7 Merge pull request #5929 from open-sausages/pulls/4.0/breadcrumb-icon-spacing 
Fixed breadcrumb icon spacing
 2016-08-31 12:27:55 +01:00
Ingo Schommer
5ddd8c3318 API Adapt File/Folder getCMSFields() to new AssetAdmin 
See https://github.com/silverstripe/silverstripe-asset-admin/issues/156
 2016-08-31 22:50:57 +12:00
Ingo Schommer
fa5e6bbd69 Fixed breadcrumb icon spacing 
Regression from https://github.com/silverstripe/silverstripe-framework/issues/5917
 2016-08-31 22:31:39 +12:00
Daniel Hensby
a098589b4e Merge pull request #5917 from open-sausages/pulls/4.0/folder-edit 
Add icons to breadcrumbs
 2016-08-30 17:52:00 +01:00
Christopher Joe
c1c20aaafc Breadcrumbs with new icons generated 2016-08-30 14:46:59 +12:00
Ingo Schommer
3f7a433a07 Merge pull request #5919 from open-sausages/pulls/4.0/modal-response 
Fix Modal response positioning
 2016-08-30 11:56:32 +12:00
Christopher Joe
b509f9199d Fix Modal response positioning 2016-08-29 10:50:17 +12:00
Ingo Schommer
44ccfa2ea4 Merge pull request #5895 from open-sausages/pulls/4.0/add-to-campaign 
Add to campaign modal in React
 2016-08-28 14:10:54 +12:00
Ingo Schommer
daaff886ad Limiting CodeClimate mass_threshold on duplication 
It's way too sensitive by default (40) for JSX-style JavaScript ASTs.
Example: https://codeclimate.com/github/silverstripe/silverstripe-framework/pull/5895

See https://docs.codeclimate.com/docs/duplication and
https://docs.codeclimate.com/v1.0/docs/duplication-concept
 2016-08-28 14:09:43 +12:00
Ingo Schommer
52686aa4ad Better exception handling for PopoverField 2016-08-28 13:45:16 +12:00
Ingo Schommer
bd9997f79a Removed AddToCampaignHandler->setShowTitle() 
It was used to support different display variations in admin/assets and admin/pages,
while those display variations should've been removed in the first place (and have been now).
 2016-08-28 13:35:09 +12:00
Ingo Schommer
564ddfa602 Apply .field class to <FieldHolder> react component 
It keeps styling consistent between Entwine sections (generated by FieldHolder.ss)
and React sections (generated by <FieldHolder> component).
 2016-08-28 13:31:17 +12:00
Ingo Schommer
a0d4e363c2 Moved <select> styles to generic _forms.scss 
Form element styles should be consistent throughout the CMS.
While we still have the ability to create dropdowns (<select>) which aren't based on
Entwine/HTML rather than new components like <SingleSelectField>,
we need to ensure those are rendered the same.

By default, the Entwine-based CMS sections will transform <select>
into a ChosenJS control, but you can still apply .no-chosen.
Hence there's a need for correct height both in React and Entwine sections,
not just in a React component.
 2016-08-28 13:30:18 +12:00
Ingo Schommer
79b9bb6f18 React for "Add to campaign" on pages 
Reuse existing functionality rather than creating "new legacy code" through writing more Entwine
 2016-08-28 13:07:32 +12:00
Christopher Joe
b77d21c25a Fix pages add to campaign, improved FormActions error handling, Popover focus highlight and refactored AddToCampaignModal to FormBuilderModal 
tweaked tests to suit new generic FormBuilderModal, changed FormAction handler to throw a promise instead
 2016-08-28 13:07:32 +12:00
Paul Clarke
a49456df20 Fix for batch actions not postponed under toolbar on open/close 2016-08-28 13:07:32 +12:00
Paul Clarke
b01de98b04 Remove padding override but adjust contents to suit container padding 
Remove spacing to the right of icon as there is no btn label
 2016-08-28 13:07:31 +12:00
Ingo Schommer
5c2e8d1299 Fix form attr merging order 2016-08-28 13:07:31 +12:00
Ingo Schommer
84cdb15a5f Simplify "add to campaign" dialog 
Talked to @clarkepaul and simplified to avoid title duplication
 2016-08-28 13:07:31 +12:00
Christopher Joe
a9bdf33ca8 Fix SingleSelect styling, added add to campaign documentation 2016-08-28 13:07:31 +12:00
Christopher Joe
b9624994ac AddToCampaign save message, Submitting indicator on FormAction button 2016-08-28 13:07:31 +12:00
Christopher Joe
d7663e850e Remove duplicate props for PopoverField, added FormBuilder->handleAction and flattened state data 2016-08-28 13:07:30 +12:00
Christopher Joe
6a4b29d703 Add to campaign modal 2016-08-28 13:07:30 +12:00
Christopher Joe
fb64e27960 Cleanup API for better form schema support 2016-08-28 13:07:30 +12:00
Rob Ingram
a0d3ad1875 Change order of fixtures in example 
* Make the document explicit about the definition of objects before they are referenced.
 2016-08-24 07:37:55 +12:00
Daniel Hensby
1d1227cc9a
Merge branch '3' 2016-08-23 10:37:47 +01:00
Daniel Hensby
058f57979b
Merge branch '3.4' into 3 2016-08-22 16:23:22 +01:00
Daniel Hensby
060bf6b327
Merge branch '3.3' into 3.4 2016-08-22 16:22:37 +01:00
Daniel Hensby
088d88e978
Merge branch '3.2' into 3.3 2016-08-22 16:22:02 +01:00
Daniel Hensby
f4a6e9e517
Merge branch '3.1' into 3.2 2016-08-22 15:30:03 +01:00
Loz Calver
0f3eabcf03 Merge pull request #5902 from dhensby/pulls/relation-list-cleanup 
Cleanup of RelationList, HasManyList and ManyManyList
 2016-08-22 14:27:29 +01:00
Loz Calver
c8f49045dc Merge pull request #5903 from dhensby/pulls/3.2/fix-bad-arraylist-sort 
FIX ArrayList sorting now caseinsensitive
 2016-08-22 14:27:10 +01:00
Daniel Hensby
229a2b9217
Merge pull request #4133 from nimeso/patch-1 2016-08-22 11:52:47 +01:00
Daniel Hensby
4998b80445
FIX ArrayList sorting now caseinsensitive 2016-08-22 11:21:50 +01:00
Daniel Hensby
8e4e2b4fa8 Merge pull request #4173 from AntonyThorpe/patch-4 
DOCS Update 06_Tabbed_Forms.md
 2016-08-19 15:49:51 +01:00
Daniel Hensby
8737ddefba
Cleanup of RelationList, HasManyList and ManyManyList 2016-08-19 10:37:58 +01:00
Damian Mooyman
6e864702ce Merge pull request #5901 from dhensby/pulls/3.2/cleanup-gridautocompleter 
Cleaning up GridFieldAddExistingAutocompleter
 2016-08-19 11:24:55 +12:00
Daniel Hensby
bdf9e97b0e
Cleaning up GridFieldAddExistingAutocompleter 2016-08-19 00:00:56 +01:00
Daniel Hensby
6d4625f067
Merge branch '3.4' into 3 2016-08-18 22:21:04 +01:00
Daniel Hensby
d306c884c7
Merge branch '3.3' into 3.4 2016-08-18 22:20:42 +01:00
Daniel Hensby
dc008b38ab
Merge branch '3.2' into 3.3 2016-08-18 22:18:47 +01:00
Christopher Darling
ef1d93c994 DOCS add missing commit af3412a to 3.4.1 changelog 2016-08-18 16:27:36 +01:00
Daniel Hensby
43d0b842cd Merge pull request #5893 from open-sausages/pulls/4.0/namespace-admin 
Namespace Admin module
 2016-08-17 11:30:13 +01:00
Damian Mooyman
59efd280ad Fix issues with CMS permission codes 
Standardise template locations
Move CMSSettingsController class to SiteConfig module
Fix CMSMenu behaviour for namespaced admin sections
Split classes into one per file
Manual fixes and cleanup
 2016-08-17 11:19:14 +12:00
Damian Mooyman
8028387c84 Merge pull request #5847 from dhensby/pulls/3.2/fix-etag-quoting 
FIX ETag header now properly quoted
 2016-08-17 11:16:26 +12:00
Damian Mooyman
db34e011f3 Apply SilverStripe\Admin namespace 2016-08-17 11:12:22 +12:00
Loz Calver
bbb2824f3a Merge pull request #5894 from open-sausages/pulls/4.0/remove-autobuild 
Remove DatabaseAdmin::autoBuild
 2016-08-16 10:47:05 +01:00
Ingo Schommer
a06a10ea3b Merge pull request #5891 from open-sausages/pulls/4.0/formbuilder-file-edit 
Improve FormBuilder API and added React form fields
 2016-08-16 19:53:15 +12:00
Damian Mooyman
25d3187c1d Remove DatabaseAdmin::autoBuild 
Fixes #5843
 2016-08-16 17:25:26 +12:00