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,884 Commits 31 Branches 527 Tags 162 MiB
a3ff6d56ec
Commit Graph

2371 Commits

Author SHA1 Message Date
Daniel Hensby
17690ff6bc
Merge branch '3.3' into 3.4 2016-11-28 13:30:29 +00:00
Daniel Hensby
6552dce70e
Merge branch '3.2' into 3.3 2016-11-28 13:26:31 +00:00
Daniel Hensby
1be2e70a2a
Merge branch '3' 2016-11-24 14:18:09 +00:00
Damian Mooyman
38a63ad73f Merge pull request #6327 from open-sausages/pulls/4.0/file-icon-update 
Update doc icons for files area
 2016-11-24 10:34:55 +13:00
Damian Mooyman
22cb3d0d74 Fix various ORM test issues 2016-11-23 19:25:12 +13:00
Damian Mooyman
6e8304ff2f API Namespace framework tests 2016-11-23 19:25:12 +13:00
Damian Mooyman
789cb5b465 Move files to psr-2 standard locations 2016-11-23 19:25:12 +13:00
Paul Clarke
f5923cf433 Update doc icons 2016-11-23 11:26:38 +13:00
Dan Hensby
ee11b12e7a Update translations 2016-11-22 14:53:02 +00:00
Paul Clarke
35e313de17 Enhancement Fix height for modal in IE10 
Enhancement Remove link color specific to header
Enhancement Close panel class renamed, as it is not always top right
 2016-11-22 16:58:01 +13:00
Christopher Joe
875811fdfd API Create loading state for schema 
API Create stateOverride state for schema
Enhancement Moved crumbs property to rely on redux state
Enhancement Updated file app icon names
API Added InsertMediaModal functionality to HtmlEditorField
API Removed dependency on schema ID that is returned from server
API Added afterMessages property for FormBuilder to display content after the alert message
 2016-11-22 16:58:00 +13:00
Dan Hensby
50f456eed8 Update translations 2016-11-21 13:27:57 +00:00
Dan Hensby
0d2710c31b Update translations 2016-11-21 12:37:07 +00:00
Dan Hensby
5890f6f7e2 Update translations 2016-11-18 15:14:40 +00:00
Daniel Hensby
f311ef4ca5 Merge pull request #6309 from Zauberfisch/modeladmin-showImportForm-2 
Added $showSearchForm to ModelAdmin
 2016-11-10 14:22:49 +00:00
zauberfisch
6697327a98 Added $showSearchForm to ModelAdmin 2016-11-10 13:50:44 +00:00
Daniel Hensby
bcc21c2403
Merge branch '3' 2016-11-10 01:09:35 +00:00
Dan Hensby
662bc688e5 Update translations 2016-11-09 11:32:20 +00:00
Paul
61abbfbd60 Merge pull request #6289 from open-sausages/pulls/4.0/folder-spacing 
State variables for pages and files
 2016-11-09 09:47:55 +13:00
Daniel Hensby
955e02ab90
Merge branch '3.4' into 3 2016-11-08 17:03:10 +00:00
Paul Clarke
276392c3b2 build js 2016-11-08 17:45:22 +13:00
Paul Clarke
5666dab4b3 Added page/file sate variables 2016-11-08 17:41:11 +13:00
Paul Clarke
47179313eb Remove scroll from preview auto as its in iframe 2016-11-08 17:23:06 +13:00
Paul Clarke
2acbad1bb0 Rewrite preview for border-box and use variables 2016-11-08 17:23:06 +13:00
Paul Clarke
c5510fc416 Mobile device variables 2016-11-08 17:23:06 +13:00
Paul Clarke
b1be159155 Remove js sizing 2016-11-08 17:23:06 +13:00
Paul Clarke
9dbb5c0a1a fix safari tabs active border 2016-11-08 17:23:06 +13:00
Paul Clarke
aca9deed23 Fix for safari scroll in campaign area 2016-11-08 17:23:06 +13:00
Martijn
1ec56a1202
Prevent undefined index notices 2016-11-07 15:09:35 +00:00
Daniel Hensby
27206c9240 Revert "Added $showSearchForm to ModelAdmin" 2016-11-07 13:42:47 +00:00
Daniel Hensby
38ccce656b Merge pull request #6201 from open-sausages/pulls/4.0/update-devtools 
Update devtools code to reflect the new API
 2016-11-07 13:13:26 +00:00
Paul Clarke
aafa448bdd Capitalise title 2016-11-07 14:08:42 +13:00
Paul Clarke
d109992a37 Safari fix for menu toggle position and bottom of menu 2016-11-07 13:57:46 +13:00
Christopher Joe
8c15e53feb Update devtools code to reflect the new API 2016-11-07 09:08:01 +13:00
Damian Mooyman
ae037b68c6 Update translations 2016-11-03 14:53:52 +13:00
Damian Mooyman
cc451d9ca4 BUG Fix crash when re-ordering pages (#6281) 
Fixes #6273
 2016-11-03 14:51:17 +13:00
Damian Mooyman
3449d5df0f
BUG Fix broken promise handling 2016-11-03 11:45:54 +13:00
Christopher Joe
d65270c4c7 Removed temporary validation for AddToCampaign 2016-11-03 10:43:42 +13:00
Christopher Joe
8a7ea044ac Added validator class to decouple validation library from FormBuilder 
Added required rule priority logic and fix styling of error messages
 2016-11-03 10:39:53 +13:00
Damian Mooyman
67f00302f9 Add logic to React FormBuilder to utilise validation schema generated 2016-11-03 10:24:36 +13:00
Paul
c98a08f3f5 Merge pull request #6234 from open-sausages/pulls/4.0/fix-mediaform-errors 
BUG Fix clicking "No items found" from causing ajax error
 2016-11-01 13:22:00 +13:00
Damian Mooyman
1622ed8f69 Merge pull request #6242 from open-sausages/pulls/4.0/fix-overlay 
BUG Fix missing loading overlay
 2016-10-31 15:25:11 +13:00
Damian Mooyman
040ae2e6a3
BUG Fix clicking "No items found" from causing ajax error 2016-10-31 15:21:41 +13:00
Damian Mooyman
513c7aebc7 Fix HtmlEditorField.js indentation 2016-10-31 15:18:50 +13:00
Damian Mooyman
37cb351a66 Merge pull request #6222 from open-sausages/features/4.0/responsive-improvements 
ENHANCEMENT: Improved behaviour for flexbox on smaller screens
 2016-10-31 14:17:12 +13:00
Paul Clarke
76d3fb80e3 Nicer pattern for showing list view of pages 2016-10-31 13:36:41 +13:00
Damian Mooyman
3fb291d340 Merge pull request #6239 from open-sausages/pulls/4.0/fix-option-changetracker 
BUG Fix incorrect change detection on checkbox fields
 2016-10-31 13:26:13 +13:00
Christopher Joe
bb2cb3d487 Fix webpack css config, removes duplicate css files that were generated 2016-10-31 13:12:12 +13:00
Christopher Joe
e592c5b45e Remove back button if no callback was given 
Fix FormBuilderLoader not chaining promise
 2016-10-31 13:11:57 +13:00
Paul Clarke
4cc6cc3151 Fix position of back button on empty preview within campaigns 2016-10-31 12:55:53 +13:00
Paul Clarke
1395ee0c31 Don't hide gridfield content on small list view of tree 2016-10-31 12:21:48 +13:00
Paul Clarke
a5d3dccd37 Fix for preview being under toolbar 2016-10-28 16:53:00 +13:00
Paul Clarke
5df797b705 Toolbar-content to be flexible 2016-10-28 16:53:00 +13:00
Paul Clarke
50f0c1f37c Remove fixed height for batch actions 2016-10-28 16:53:00 +13:00
Paul Clarke
2daca4ebc6 Improve alert text, fix spacing 2016-10-28 16:53:00 +13:00
Paul Clarke
706d2b6458 Add additional space to tree bottom, required for large tree 2016-10-28 16:52:03 +13:00
Paul Clarke
fad8df83cc Remove console.log 2016-10-28 16:52:03 +13:00
Paul Clarke
71a4eb7d22 Hide preview in campaigns, override list styles for mobile 2016-10-28 16:52:03 +13:00
Paul Clarke
4373eb6801 Hide sitetree in smaller screens for setting and pages 2016-10-28 16:51:03 +13:00
Christopher Joe
debb1a947e Add responsive class for Campaign list 
Fix back button in preview
Fix add to campaign in pages section
 2016-10-28 16:51:03 +13:00
Paul Clarke
5350fcf650 Delete legacy styles in Layout, move rest to CampaignAdmin. Convert to BEM 2016-10-28 16:47:50 +13:00
Paul Clarke
c82c88ebf6 Remove legacy classes 2016-10-28 16:44:54 +13:00
Paul Clarke
5257c92fcd Remove legacy class 2016-10-28 16:44:54 +13:00
Paul Clarke
4ce2bcc360 Add back button style if it has text 2016-10-28 16:44:54 +13:00
Paul Clarke
3fd5a6d4e6 Add left border to preview and bg 2016-10-28 16:44:54 +13:00
Paul Clarke
d761075fd3 Move mock back button 2016-10-28 16:44:54 +13:00
Paul Clarke
0885a3178e Adjust button padding so they all have the same height 2016-10-28 16:44:54 +13:00
Paul Clarke
25783db020 toolbar-north to be 100%, removed from toolbar-content 2016-10-28 16:44:54 +13:00
Paul Clarke
50af94099e Remove some legacy layout styles 2016-10-28 16:39:59 +13:00
Paul Clarke
a95781e66e Search and batch actions to have same selected state 2016-10-28 16:39:59 +13:00
Paul Clarke
96964be39d Sitetree scroll moved so whole area scrolls excluding actions 2016-10-28 16:39:59 +13:00
Paul Clarke
364ab957e6 improve spacing of sitetree for smaller screens 2016-10-28 16:39:59 +13:00
Paul Clarke
6254f186b1 Remove border on left of preview mode 2016-10-28 16:39:59 +13:00
Paul Clarke
27724c0829 Remove set width of toolbar-content as it extends further than 100% 2016-10-28 16:39:59 +13:00
Chris Joe
82119888c1 Validation on server side for React forms (fixes #6205) 2016-10-28 16:13:29 +13:00
Damian Mooyman
d7ed308e17 BUG Fix minor html encoding issue in SecurityAdmin (#6240) 2016-10-28 15:22:21 +13:00
Michael Strong
1df533298d BUG abstract HTMLEditorConfig instantiates (#6244) 
https://github.com/silverstripe/silverstripe-framework/blob/master/Forms/HTMLEditor/HTMLEditorConfig.php#L64

On line 64, HTMLEditorConfig tries to create an instance of itself if it doesn't exist. However, HTMLEditorConfig is abstract and this throws an error.

This is caused by admin/_config.php
 2016-10-28 15:21:44 +13:00
Damian Mooyman
adfd0456de Merge pull request #6241 from open-sausages/pulls/4.0/fix-pagination-wrapping 
BUG Prevent pagination wrapping
 2016-10-28 13:44:28 +13:00
Damian Mooyman
02bac8c4bc
BUG Fix missing loading overlay 
Fixes #6163
 2016-10-27 12:09:17 +13:00
Damian Mooyman
42096bb41b
BUG Prevent pagination wrapping 
Fixes https://github.com/silverstripe/silverstripe-asset-admin/issues/269
 2016-10-27 11:58:19 +13:00
Damian Mooyman
f7fd4ffae1
BUG Fix incorrect change detection on checkbox fields 
Fixes #6121
 2016-10-27 11:15:37 +13:00
zauberfisch
c4aed0c081 Added $showSearchForm to ModelAdmin 2016-10-26 11:35:52 +00:00
Damian Mooyman
5551040839 API Update listview / treeview to use pjax instead of deferred loading 2016-10-26 14:29:10 +13:00
Damian Mooyman
44b65429f1 Merge pull request #6212 from open-sausages/pulls/4.0/search-bg 
Adjustments for filter panel positioning
 2016-10-26 14:27:24 +13:00
Christopher Joe
8de2f9dbb4 switched from calc to negative margin 2016-10-26 10:43:51 +13:00
Ingo Schommer
bed547fc86 Merge pull request #6206 from Chibby/master 
Prevent undefined index notices
 2016-10-26 09:06:35 +13:00
Paul Clarke
4b413d395e Adjustments for filter panel positioning 2016-10-21 14:09:39 +13:00
Damian Mooyman
316ac86036
API Writes to versioned dataobjects always writes to stage even when written on live 
API Remove "Archive" actions
API "Delete" actions for pages now archives records
BUG Fix batch actions failing on certain controllers
Fixes #6059
 2016-10-21 13:16:32 +13:00
Ingo Schommer
9ca359e5de Merge pull request #6208 from open-sausages/pulls/4.0/tab-spacing 
Add spacing to nested tabs
 2016-10-21 12:53:35 +13:00
Ingo Schommer
bf02abe688 Merge pull request #6209 from open-sausages/pulls/4.0/button-internal-padding 
Remove additional spacing from buttons with no icon
 2016-10-21 12:53:19 +13:00
Paul Clarke
833dbbcafe remove additional spacing from buttons with no icon 2016-10-21 11:40:31 +13:00
Paul Clarke
19c1ed9443 add spacing to nested tabs 2016-10-21 11:28:29 +13:00
Damian Mooyman
7cd32b7d72
Remove unnecessary $schemaLink parameter 2016-10-21 11:11:18 +13:00
Martijn
b0566b0cb8 Prevent undefined index notices 2016-10-20 14:04:15 +02:00
Ingo Schommer
aa47845a6c Updated dist files 2016-10-20 22:03:42 +13:00
Ingo Schommer
3a690d8084 Moved promise polyfill into boot logic 
It's not specific to one single component
 2016-10-20 22:03:42 +13:00
Ingo Schommer
54a4cef863 Consistently use 'value' for FormField schemas 
LiteralField (data.content) was inconsistent with HTMLReadonlyField (value),
which made the frontend components harder to handle.

See https://github.com/silverstripe/silverstripe-framework/pull/6172#discussion_r83561757 for contex
 2016-10-20 22:03:38 +13:00
Christopher Joe
84c0df3db0 Fix double forward slash link in campaign admin 2016-10-20 21:49:10 +13:00
Ingo Schommer
5b31a40593 Use redux-form instead of custom actions/reducers (fixes #5524) 
- Removed custom form reducers in favour of redux-form (updateField(), addForm(), etc)
- Storing 'state' in schema reducer to avoid a separate forms reducer tree (no longer needed for other use cases). This means 'state' is only the "initial state", any form edits will be handled by redux-form internally in the 'reduxForm' reducer namespace
- Removed componentWillUnmount() from <Form> since there's no more reducer state to clean up (removed formReducer.js), and redux-form handles that internally
- Removed isFetching state from <FormBuilder> since there's now a props.submitting coming from redux-form
- Improved passing of "clicked button" (submittingAction), using component state rather than reducer and passing it into action handlers (no need for components to inspect it any other way)
- Hacky duplication of this.submittingAction and this.state.submittingAction to avoid re-render of <FormBuilder> *during* a submission (see https://github.com/erikras/redux-form/issues/1944)
- Inlined handleSubmit() XHR (rather than using a redux action). There's other ways for form consumers to listen to form evens (e.g. onSubmitSuccess passed through <FormBuilder> into reduxForm()).
- Adapting checkbox/radio fields to redux-forms
  Need to send onChange event with values rather than the original event,
  see http://redux-form.com/6.1.1/docs/api/Field.md/#-input-onchange-eventorvalue-function-
- Using reduxForm() within render() causes DOM to get thrown away,
  and has weird side effects like https://github.com/erikras/redux-form/issues/1944.
  See https://github.com/erikras/redux-form/issues/603#issuecomment-176397728
- Refactored <FormBuilderLoader> as a separate container component which connects to redux and redux-form. This keeps the <FormBuilder> component dependency free and easy to test. It'll also be an advantage if we switch to a GraphQL backed component, in which case the async loading routines will look very different from the current <FormBuilderLoader> implementation
- Refactoring out the redux-form dependency from FormBuilder to make it more testable (through baseFormComponent and baseFieldComponent)
- Passing through 'form' to allow custom identifiers (which is important because currently the schema "id" contains the record identifier, making the form identifier non-deterministic - which means you can't use it with the redux-form selector API)
 2016-10-20 21:49:06 +13:00
Ingo Schommer
5f81122ad3 Removed misdocumented 'data' prop 2016-10-20 15:33:50 +13:00
Ingo Schommer
1e478a5378 Consistently set 'id' in FormSchema 
The URL to request the schema representation is the unique identifier.
We can't default to $request->getURL() since that's different for form submissions.

The schema.schema_url key is redundant, since the identifier is already contained on the top level 'id' key.
Keeping schema_url in a schema itself makes it less portable, particularly once we transition into
generic schemas which are not reliant on a particular record context (that's only contained in the schema_url)

This also fixes the issue of form schemas not refreshing after submit,
e.g. when form fields are added or removed.
 2016-10-20 15:33:50 +13:00
Damian Mooyman
3f773c826a Merge pull request #6189 from open-sausages/pulls/4.0/split-pages-toolbar 
Split top toolbar for Pages section
 2016-10-18 18:44:06 +13:00
Christopher Joe
08b1171ae7 Adjust CSS for top toolbar split for Pages section 2016-10-18 14:22:03 +13:00
Christopher Joe
820407887e Adjusted button submit action to respect _super() 2016-10-18 09:27:58 +13:00
Daniel Hensby
8afff154b8 Merge pull request #6171 from open-sausages/pulls/4.0/use-changeset-for-publish 
API Versioned::publishRecursive() now uses a ChangeSet
 2016-10-16 14:45:23 +01:00
Christopher Joe
25ca87b650 Clean up build files to be more consistent 2016-10-14 15:33:07 +13:00
Loz Calver
0ebde90dd0 Fix flexbox 'fill-height' overflowing container 2016-10-13 09:42:12 +01:00
Damian Mooyman
f60fe7d4a9
API Versioned::publishRecursive() now uses a ChangeSet 
API Add IsInferred to inferred changesets
API Add SapphireTest::assertNotDOSContains
Fixes #5667
 2016-10-13 17:38:08 +13:00
Daniel Hensby
369fde2a5b Merge pull request #6150 from open-sausages/pulls/4.0/fix-form-validation-persistence 
BUG prevent form data / validation persisting in state when using form schema
 2016-10-11 15:43:59 +01:00
Damian Mooyman
72fd3b949e Fix linting issues 2016-10-11 16:49:24 +13:00
Christopher Joe
5a5d62fa27 Fix profile layout 2016-10-11 15:50:35 +13:00
Damian Mooyman
20cee73583
Fix pages background 2016-10-11 15:27:32 +13:00
Christopher Joe
7b36df286e Fix split mode disappearing as an option 2016-10-11 14:41:08 +13:00
Christopher Joe
a03abe1356 Set select box width 100% to override chosen's default hardcoding width 2016-10-11 13:50:30 +13:00
Christopher Joe
bb2f487644 Scrolling fixes for Model Admin 2016-10-11 13:47:44 +13:00
Christopher Joe
eee9ffaaa2 disable select option for split when it is graphically disabled in chosen... 2016-10-11 13:47:32 +13:00
Christopher Joe
ba44382cb9 tweak for ie10 styling issues 2016-10-11 13:47:21 +13:00
Christopher Joe
7acb3b5fc2 Fix selected view mode not reflected on button 
Fix other ModelAdmin layout (test)
Fix fieldholder placement
 2016-10-11 13:47:09 +13:00
Christopher Joe
89150c48e7 Fix preview in pages section 2016-10-11 13:47:00 +13:00
Paul Clarke
8b02d9d68a Remove legacy classes for flexbox classes 2016-10-11 13:46:49 +13:00
Christopher Joe
0a0a990c54 Remove add wrapper element 
Added 100% height to fill-width to fix some layout issues
 2016-10-11 13:46:38 +13:00
Paul Clarke
eb7a8be3f8 Temp work in progress- to clean up 2016-10-11 13:46:38 +13:00
Paul Clarke
a37bf87857 Replace Layout with flexbox CSS classes 2016-10-11 13:46:24 +13:00
Paul Clarke
e71f39d171 Remove table bg 2016-10-11 13:46:24 +13:00
Paul Clarke
472e135602 Add Layout js back in as it contains preview JS 2016-10-11 13:46:24 +13:00
Paul Clarke
4a45793af9 Hide preview in other areas of the cms outside of pages 2016-10-11 13:46:24 +13:00
Paul Clarke
e7829eb974 Replace jLayout classes with flexbox CSS classes 2016-10-11 13:46:24 +13:00
Paul Clarke
1fd46ed36d Pages area: remove layout classes, replace with flexbox CSS classes 2016-10-11 13:46:24 +13:00
Paul Clarke
ed4270155b Remove layout.js 2016-10-11 13:45:17 +13:00
Paul Clarke
8dd56efe2e Add flex classes, remove layout classes 2016-10-11 13:45:08 +13:00
Paul Clarke
1b0839a8e8 Remove Layout 2016-10-11 13:45:08 +13:00
Damian Mooyman
27d35403e8 API Force formschema to be reloaded on form submission 
BUG Fix missing action state
 2016-10-07 13:26:57 +13:00
Damian Mooyman
f130ebf9de Restore tab indentation to LeftAndMain.php 2016-10-07 13:24:48 +13:00
Stevie Mayhew
0d173f231c Merge pull request #6160 from SteveAzz/update-documentation 
Update yml formating for extra javascript & css
 2016-10-07 12:26:29 +13:00
Steve Azzopardi
d7530ed22b Update css doc to spaces instead of tabs 2016-10-06 22:01:44 +02:00
Steve Azzopardi
2ec14cefcb Update yml formating for extra javascript & css 2016-10-06 20:03:00 +02:00
Christopher Joe
21dc238685 Fixed classes that weren't matching icon 2016-10-06 20:46:30 +13:00
Christopher Joe
e5b86457b4 Added react LookupField component 
API MultiSelectField readonly transformation casts to LookupField instead of ReadonlyField
FIX removed jQuery dependency from i18n
 2016-10-05 15:32:05 +13:00
Damian Mooyman
82e72d062f BUG prevent form data / validation persisting in state when using form schema 2016-10-05 10:26:32 +13:00
Christopher Joe
30d161625f Fix unmock qs module, Backend-test refactored to not time out on error 2016-10-05 10:25:22 +13:00
Christopher Joe
287809ec3b Refactored react FormFields to use react-bootstrap FormControl components 
Addded Checkbox, CheckboxSet and Optionset (radio) fields
Refactored documentation
 2016-10-05 10:25:21 +13:00
Daniel Hensby
45736ef2db
Merge branch '3' 2016-10-03 12:00:20 +01:00
Daniel Hensby
5e9d16646d
Merge branch '3.4' into 3 2016-10-03 10:24:32 +01:00
Damian Mooyman
ebbb0258dd Fix linting issue 2016-10-03 10:58:58 +13:00
Daniel Hensby
f2d3026e93
Merge pull request #3628 from JeremyRoundill/3.1 2016-09-30 17:16:47 +01:00
Paul Clarke
3ac0eaaf62 Remove legacy styles 2016-09-30 15:45:12 +13:00
Paul Clarke
b794a40864 Group button icon styles 2016-09-30 15:44:17 +13:00
Paul Clarke
374ef6e0c3 Modal styles 2016-09-30 15:44:17 +13:00
Paul Clarke
5f92e12911 If description field is empty hide it as it has margin 2016-09-30 15:44:17 +13:00
Paul Clarke
d6a24f4133 Use bootstrap modal variables 2016-09-30 15:44:17 +13:00