tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 00:19:25 +02:00
Code Issues Projects Releases Wiki Activity
20,982 Commits 29 Branches 516 Tags 147 MiB
066ce8e01c
Commit Graph

20982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
066ce8e01c Merge branch '4.2' into 4.3 
# Conflicts:
 #	src/View/ThemeResourceLoader.php
 2019-09-13 18:10:37 -07:00
Andre Kiste
cf90cfdd2a
Merge pull request #9221 from open-sausages/pulls/4.3/recursive-writeComponent 
BUG Allow infinite loop when calling DataObject::writeComponent() recursively
 2019-09-12 17:18:08 +12:00
Maxime Rainville
591b88a9bc BUG Allow infinite loop when calling DataObject::writeComponent() recursively 2019-09-10 14:15:28 +12:00
Robbie Averill
41a766d135
Merge pull request #9085 from kinglozzer/9084-path-join-exception 
Catch Path::join() exceptions in findTemplate() (fixes #9084)
 2019-09-06 12:00:39 -07:00
Robbie Averill
aec5051a24
Merge pull request #9206 from creative-commoners/pulls/4.3/strip-bom-on-csv-import 
FIX Byte Order Marks (BOM) are now stripped when importing CSV files
 2019-09-03 09:55:38 -07:00
Robbie Averill
0b991cc039
Merge pull request #9198 from elabuwa/pulls/4.3/bug-fix-html-entities-breadcrumbs-in-group 
Bug : Add html_entity_decode to group parents
 2019-08-30 09:51:52 +12:00
Dileep Ratnayake
fe4eb5dd2a
Update src/Security/Group.php 
Co-Authored-By: Maxime Rainville <maxime@rainville.me>
 2019-08-29 15:44:41 +12:00
Robbie Averill
77ba8391c4 FIX Byte Order Marks (BOM) are now stripped when importing CSV files 2019-08-29 14:54:57 +12:00
Maxime Rainville
4cfce30842
Merge pull request #9204 from open-sausages/pulls/4.3/remove-dumb-place-holder-text 
BUG Remove placeholder text on new group form
 2019-08-29 09:05:38 +12:00
Maxime Rainville
73f43c6f42 BUG Remove placeholder text on new group form 2019-08-28 17:14:19 +12:00
Dileep Ratnayake
9b7075ed5d
Update Group.php 2019-08-27 16:22:00 +12:00
Dileep Ratnayake
a976a1688b
Update Group.php 
move to private method
 2019-08-27 16:21:08 +12:00
Dileep Ratnayake
40e5c4ec59
Update Group.php 
use of convert::raw2xml, rename $grp to $group
 2019-08-27 16:19:40 +12:00
Dileep Ratnayake
4f8240bd48
Update src/Security/Group.php 
Co-Authored-By: Andre Kiste <bergice@users.noreply.github.com>
 2019-08-27 12:19:03 +12:00
Dileep Ratnayake
f7a602137a
add html_entity_decode to breadcrumbs 2019-08-27 11:49:17 +12:00
Robbie Averill
d63e4b520c Merge branch '4.2' into 4.3 2019-08-14 09:30:41 +12:00
Robbie Averill
2e2c56249e
Merge pull request #9147 from webbuilders-group/sort-order-fix 
BUGFIX: Fixed issue where multiple relationship sort order columns would be lost in favor of only the last relationship column in the sort order
 2019-08-14 09:29:20 +12:00
Robbie Averill
05d5db43f3
Merge pull request #9173 from creative-commoners/pulls/4.3/column-content-for-print-csvs 
FIX Use content generated by DataColumns component for print and csv export
 2019-08-09 15:21:50 +12:00
Guy Marriott
3d989a6eae
FIX Use content generated by DataColumns component for print and csv export 2019-08-09 15:04:38 +12:00
Loz Calver
6f19cb3a83
Merge pull request #9152 from creative-commoners/pulls/4.3/session-exists-check 
FIX Prevent setting session value when no session exists yet
 2019-07-30 09:42:45 +01:00
Robbie Averill
5c794dfcdd FIX Prevent setting session value when no session exists yet 2019-07-29 17:16:01 +02:00
UndefinedOffset
c1ffc4edfb Added unit tests for multiple relationship sorting 2019-07-29 10:45:10 -03:00
UndefinedOffset
40cd66852e BUGFIX: Fixed issue where multiple relationship sort order columns would be lost in favor of only the last relationship column in the sort order 2019-07-26 11:54:10 -03:00
Robbie Averill
2d2b0b82f0 DOCS Fix incorrect rendering of note on list item 
[ci skip]
 2019-07-25 12:03:12 +02:00
Robbie Averill
c7b15eaef5 Merge branch '4.2' into 4.3 2019-07-19 10:45:29 +02:00
Garion Herman
9efe9e96eb
Merge pull request #9123 from open-sausages/pulls/4.3/increase-memory-limit-max 
FIX core memory limit test
 2019-07-12 17:08:42 +12:00
Serge Latyntcev
fcd7a1e63e FIX core memory limit test 2019-07-12 16:30:25 +12:00
Guy Marriott
b01dc580e1
FIX Protect against undefined index when using nullifyEmpty opt… (#9090) 
FIX Protect against undefined index when using nullifyEmpty option
 2019-06-27 11:19:42 +12:00
Robbie Averill
c76d3a5db1 FIX Protect against undefined index when using nullifyEmpty option 2019-06-26 09:26:36 +12:00
Loz Calver
b1551a687d Catch Path::join() exceptions in findTemplate() (fixes #9084) 2019-06-21 09:40:18 +01:00
Loz Calver
a54ba97e16
Merge pull request #9082 from Sommereder/patch-1 
Fix of delimiter not used bug
 2019-06-20 10:49:24 +01:00
Mario Sommereder
260c89fd54 Fix of delimiter not used bug 
See issue https://github.com/silverstripe/silverstripe-framework/issues/8881
 2019-06-20 11:11:27 +12:00
Aaron Carlino
054dbd6ae5 Added 4.3.4 changelog 2019-06-10 22:49:06 +12:00
Aaron Carlino
960a7bb5ae Added 4.2.5 changelog 2019-06-10 22:48:57 +12:00
Aaron Carlino
e442724e4e Update translations 2019-06-10 22:48:02 +12:00
Aaron Carlino
c913e54709 Update translations 2019-06-10 22:47:33 +12:00
Robbie Averill
188698dcee Merge branch '4.2' into 4.3 2019-05-30 09:35:17 +12:00
Robbie Averill
7f69cc8f94 Merge branch '4.1' into 4.2 2019-05-30 09:35:06 +12:00
Robbie Averill
02864aba3f Merge branch '4.0' into 4.1 2019-05-30 09:34:55 +12:00
Robbie Averill
58791e52b6
Merge pull request #9007 from NightJar/pulls/4.0/headerfield 
FIX HeaderField requires the optional Title field
 2019-05-27 10:50:15 +12:00
Dylan Wagstaff
25aa3af032 FIX HeaderField requires the optional Title field 
FormField marks the Title constructor argument as optional, and DatalessField does not override the __construct method. HeaderField on the other hand goes against the grain of FormFields as a whole and requires the Title field, seemingly for no good reason (at least, not that the commit message for a68ba38478 indicates) - this seems like an accidental ommision. This commit looks to reinstate the optionality of this constructor argument for consistency's sake.

Plus it broke a module I was investigating.
 2019-05-24 13:44:01 +12:00
Robbie Averill
32c04ce765
Merge pull request #8979 from silverstripe-terraformers/feature/add-extension-for-schema-validation 
Add extend function in getSchemaValidation function
 2019-05-16 11:22:45 +12:00
Aaron Carlino
3f1479edbb
BUGFIX: DataQuery overwriting _SortColumn selects (#8974) 
* BUGFIX: DataQuery overwriting _SortColumn selects

* FIX DataQuery _SortColumn handling
 2019-05-15 11:42:10 +12:00
shoosah
4da8be3bf5 Add extend function in getSchemaValidation function 
This allows to create extensions which add validation list
 2019-05-14 09:47:14 +12:00
Guy Marriott
53cb804929
Merge branch '4.2' into 4.3 2019-05-13 15:56:23 +12:00
Guy Marriott
3a5c14f7c2
FIX password validation min length message (#8976) 
FIX password validation min length message
 2019-05-13 15:55:31 +12:00
matt-in-a-hat
db0e6f7104 Fix password validation min length message 
When relying on static config instead of an explicitly set minLength then this message would show without the value, like "it must be  or more characters long".
 2019-05-13 13:43:29 +12:00
Guy Marriott
e7bb508391
Merge pull request #8956 from open-sausages/pulls/4.3/custom-aliases-to-be 
Backward compatible behaviour for SQLConditionalExpression::getJoins
 2019-05-03 09:40:25 +12:00
Serge Latyntcev
3d777cfb8a Backward compatible behaviour for SQLConditionalExpression::getJoins 2019-05-02 15:39:36 +12:00
Robbie Averill
523456ae09
Merge pull request #8921 from creative-commoners/pulls/4.3/threshold-count-in-sql 
FIX Calculate threshold condition with SQL rather than PHP
 2019-04-21 01:25:24 +12:00