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
16,981 Commits 31 Branches 527 Tags 162 MiB
a6049ec383
Commit Graph

16981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
918fb94396
Merge branch '3' 2016-09-07 09:31:23 +01:00
Daniel Hensby
3fd9fe3aa0
Merge branch '3.4' into 3 2016-09-07 09:22:06 +01:00
Daniel Hensby
5959419645
Merge branch '3.3' into 3.4 2016-09-07 09:21:50 +01:00
Daniel Hensby
b80dc6450a
Merge branch '3.2' into 3.3 2016-09-07 09:21:21 +01:00
Damian Mooyman
9455ced41a Merge pull request #5959 from dhensby/pulls/3.2/bad-strpos-fix 
FIX Bad strpos call in HTTP::register_etag()
 2016-09-07 12:05:57 +12:00
Daniel Hensby
e7ecf6cf15
FIX Bad strpos call in HTTP::register_etag() 2016-09-06 23:32:57 +01:00
Ingo Schommer
a45657b369 Merge pull request #5942 from open-sausages/pulls/4.0/react-15 
Update to React v15.0 and react-bootstrap fork
 2016-09-06 21:40:54 +12:00
Ingo Schommer
65718770d6 Update to React v15.0 2016-09-06 21:39:20 +12:00
Ingo Schommer
0cc91d3b38 Use react-bootstrap-ss fork 
The react-bootstrap project won't update their codebase for TWBS4 compat
until they're out of alpha (https://github.com/react-bootstrap/react-bootstrap/issues/1187).
So we have to work in a fork for the meantime.
 2016-09-06 21:36:58 +12:00
Ingo Schommer
b14804fc2d Merge pull request #5958 from open-sausages/pulls/4.0/react-button-loading-indicator 
Fix button loading indicator
 2016-09-06 21:15:05 +12:00
Ingo Schommer
57d885f406 Updated dist files 2016-09-06 20:40:20 +12:00
Ingo Schommer
f7f1cf0e87 Fix SingleSelectField readonly view 2016-09-06 20:40:14 +12:00
Ingo Schommer
1d3aaf368e Popover docs 2016-09-06 20:39:41 +12:00
Ingo Schommer
b53ce4c190 FIX Button loading indicator 
See silverstripe/silverstripe-framework#5941
 2016-09-06 20:39:32 +12:00
Ingo Schommer
3b71b7731a Merge pull request #5943 from open-sausages/pulls/4.0/template-lookup-redux 
API Update template lookup to late resolution for performance reasons
 2016-09-06 20:27:11 +12:00
Daniel Hensby
10f429d8d8 Merge pull request #5950 from open-sausages/pulls/4.0/change-class-cleanup 
API use injector for DataObject::newClassInstance()
 2016-09-06 07:53:51 +01:00
Damian Mooyman
efb004b72a
API use injector for DataObject::newClassInstance() 
API Fail on invalid class type change
 2016-09-06 14:10:51 +12:00
Damian Mooyman
c9b6e9bac0
API Update template lookup to late resolution for performance reasons 
API Update behaviour of form fields to use standard template lookup mechanism
API Support custom "type" parameter to template lookup
 2016-09-06 12:54:03 +12:00
Daniel Hensby
2fbd1658dd Merge pull request #5949 from open-sausages/pulls/4.0/document-iconv 
Document iconv a bit better
 2016-09-06 00:00:29 +01:00
Ingo Schommer
f40ed07dec Merge pull request #5940 from open-sausages/pulls/4.0/filter-updates 
API Change behaviour of filter API to support injected search filter classes
 2016-09-06 08:01:37 +12:00
Damian Mooyman
ca6be9eddb
Document iconv a bit better 
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1002
 2016-09-05 17:55:32 +12:00
Damian Mooyman
7105099497
API Change behaviour of filter API to support injected search filter classes 
API Remove DataList::applyFilterContext(), superseded by DataList::createSearchFilter()
API SearchFilter::getSupportedModifiers() added to support supported modifier inspection
 2016-09-05 17:28:36 +12:00
Damian Mooyman
fc353dc17a API Allow has_many fixtures to be declared with array format as well as many_many (#5944) 
BUG Fix issue with parsing of extrafields in fixtures
BUG Fix issue in duplicate relation name, and ensure FixtureBlueprint fails on these
 2016-09-05 16:58:36 +12:00
Damian Mooyman
1eb4e70201 Merge pull request #5945 from open-sausages/pulls/4.0/insert-link 
Insert link styling adjustments incl. minor text updates
 2016-09-05 15:56:23 +12:00
Ingo Schommer
6d0d46b06b Merge pull request #5946 from robbieaverill/bugfix/5936-show-formatting-help 
FIX Show formatting help toggle link
 2016-09-05 12:10:57 +12:00
Robbie Averill
cbdf3eb725 FIX Show formatting help toggle link 
* Fixes #5936
 2016-09-05 11:59:14 +12:00
Paul Clarke
ea2fb1b325 Remove duplicated HTMLEditorField label variables, keep LINKTO label for language upgrade 2016-09-05 10:50:58 +12:00
Paul Clarke
f2637fc059 Remove additional divider lines, adjust padding 2016-09-02 16:50:52 +12:00
Paul Clarke
d7e756c4f2 Update labels with more appropriate text 2016-09-02 16:50:13 +12:00
Paul Clarke
cfee2022ba Remove .show() as not compatible with Flex 
Removed .show() as it uses display: block rather than display: flex
 2016-09-02 16:41:26 +12:00
Paul Clarke
c3f4d0cf0b Add inline forms styles to insert-link modal 2016-09-02 16:37:59 +12:00
Paul Clarke
79b7f84a46 Remove duplicate class output 2016-09-02 16:37:30 +12:00
Damian Mooyman
a68dfd1016 Merge pull request #5937 from dhensby/pulls/3.4/fix-empty-dmyfields-validation 
FIX Empty dmyfields on DateField now validate as true
 2016-09-02 09:01:39 +12:00
Daniel Hensby
f2ed59e185
FIX Empty dmyfields on DateField now validate as true 2016-09-01 11:55:17 +01:00
Ingo Schommer
ecaed8c08d Fixed icon regression in <Breadcrumb> 2016-09-01 14:07:02 +12:00
Ingo Schommer
d38db31eb4 Added link to React coding conventions 2016-09-01 13:59:34 +12:00
Daniel Hensby
f57d6b377e Merge pull request #5934 from open-sausages/pulls/4.0/file-folder-getCMSFields 
API Adapt File/Folder getCMSFields() to new AssetAdmin
 2016-08-31 23:26:33 +01:00
Daniel Hensby
d59d308577 Merge pull request #5933 from open-sausages/pulls/4.0/form-builder-pass-field-values 
Field values in FormBuilder action handling
 2016-08-31 23:09:28 +01:00
Rob Ingram
0c7264eca6 DOCS Update PHP doc on latestPublished method (#5905) 
* Update doc comment on  method to be more accurate
 2016-08-31 21:37:50 +01:00
Ingo Schommer
1a8348900d Merge pull request #5899 from christopherdarling/patch-7 
DOCS add missing commit af3412a to 3.4.1 changelog
 2016-09-01 08:17:16 +12:00
Ingo Schommer
56b249eb23 Field values in FormBuilder action handling 
Allows actions to make decisions based on the form payload.
For example, a "delete" button can pass the currently edited record ID to its API endpoint.
 2016-09-01 07:55:56 +12:00
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