tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,397 Commits 29 Branches 510 Tags 146 MiB
Commit Graph

16397 Commits

Author SHA1 Message Date
Daniel Hensby 24ea2638fe
Create licence file so that GitHub (and humans) can more easily find it 2018-02-12 11:21:03 +00:00
Daniel Hensby 2a8d365aac
Merge pull request #6973 from steadlane/fix/csv-unescaped-values 
Fix for badly escaped values in CSV export
 2018-02-08 13:45:52 +00:00
JorisDebonnet 5df1ec7eee
Use fputcsv in GridFieldExportButton 2018-02-08 12:26:29 +00:00
Damian Mooyman abbc4b72be Added 3.5.7 changelog 2018-02-05 14:30:53 +13:00
Damian Mooyman 6fe5c37d6a
Merge pull request #7795 from kinglozzer/uploadfield-height 
FIX: Fix UploadField cuts off “Save” button (closes #2862)
 2018-02-05 14:24:30 +13:00
Damian Mooyman fa44d22058
Merge pull request #6744 from d-rivera-c/dev/pharmac-fork 
fixing val reference to url in https hotlink and allowes https hotlinking on TinyMCE
 2018-02-05 14:22:08 +13:00
Damian Mooyman aca1e16b8e
Merge pull request #6211 from jason-zz/patch-3 
BUG Fix : relObject() should return null if one of the node is null
 2018-02-05 14:18:44 +13:00
Damian Mooyman 98907b3ba4
Merge pull request #4096 from patricknelson/issue-4095-tinymce-embed 
FIX for #4095, TinyMCE not able to modify props of embed media (bug 1) and invalid HTML inserted (bug 2)
 2018-02-05 14:14:44 +13:00
Daniel Hensby cf373ad53b
Merge pull request #7804 from beerbohmdo/bugfix/composite_field_missing_table 
BUG $this->tableName in CompositeDBField->addToQuery is blank.
 2018-01-30 16:52:02 +00:00
Daniel Hensby 231de43e3a
Merge pull request #7784 from spaceship-operators/bugfix/gridfield-overflow 
FIX: Gridfields with dropdowns having lots of overflow
 2018-01-30 16:36:27 +00:00
Scott Hutchinson 7384e3fc25
FIX: Gridfields with dropdowns having lots of overflow 2018-01-30 14:45:08 +00:00
Dominik Beerbohm 416915b082 BUG tableName is blank in CompositeDBField->addToQuery 
Added call to setTable() to ensure tableName is provided inside addToQuery method.
 2018-01-26 14:58:46 +01:00
Loz Calver 861112bd31
Merge pull request #7803 from open-sausages/pulls/3.5/fix-ping-reqs 
BUG Fix ping including requirements
 2018-01-26 09:16:20 +00:00
Damian Mooyman cf69d04866
BUG Fix ping including requirements 
Fixes #7802
 2018-01-26 10:26:18 +13:00
Damian Mooyman 72e2326731
Merge pull request #7798 from kinglozzer/member-groupset-delete 
FIX: Fix Member_GroupSet::removeAll() (fixes #3948)
 2018-01-25 09:20:30 +13:00
Loz Calver c2cd6b3832 FIX: Fix Member_GroupSet::removeAll() (fixes #3948) 2018-01-24 17:17:20 +00:00
Loz Calver f2b4c192ec FIX: Fix UploadField cuts off “Save” button (closes #2862) 2018-01-24 15:49:46 +00:00
Damian Mooyman 677336fbef
Merge pull request #7726 from dhensby/pulls/3.5/functionaltest-html5-forms 
FIX Allow HTML 5 input tags in FunctionalTest form submissions
 2018-01-08 13:32:44 +13:00
Daniel Hensby 44930f211b
FIX Allow HTML 5 input tags in FunctionalTest form submissions 2017-12-22 11:15:56 +00:00
Daniel Hensby 81150c5922
FIX Use PHP 5.3 array syntax 2017-12-14 15:24:53 +00:00
Damian Mooyman b6a7e47441 Added 3.5.6 changelog 2017-12-07 13:27:17 +13:00
Damian Mooyman a8465900bd
Merge pull request #47 from silverstripe-security/patch/3.5/SS-2017-008 
[SS-2017-008] FIX Make sure int params are successfull cast to int
 2017-12-06 17:30:51 +13:00
Damian Mooyman d09c2d7b03 Added 3.5.6-rc1 changelog 2017-12-06 16:27:12 +13:00
Damian Mooyman 5f7f1ea150 Added 3.5.6-rc1 changelog 2017-12-06 16:27:08 +13:00
Damian Mooyman dd4c5417e7
Merge pull request #49 from silverstripe-security/pulls/3.5/ss-2017-007 
[ss-2017-007] Ensure xls formulae are safely sanitised on output (3.5)
 2017-12-06 16:25:58 +13:00
Damian Mooyman 44de03da01
Merge pull request #53 from silverstripe-security/pulls/3.5/ss-2017-006 
[ss-2017-006] Fix user agent invalidation on session startup (3.5 branch)
 2017-12-06 16:25:39 +13:00
Damian Mooyman 3e2bcaa0b4
Merge pull request #54 from silverstripe-security/pulls/3.5/ss-2017-009 
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt (3.5 branch)
 2017-12-06 16:25:19 +13:00
Damian Mooyman 975d462e0c
Merge pull request #7661 from dhensby/pulls/3.5/versioned-base-class 
FIX Use baseDataClass for allVersions as with other methods
 2017-12-06 14:13:14 +13:00
Damian Mooyman 77b46672e2
Merge branch '3.5' into pulls/3.5/versioned-base-class 2017-12-06 11:37:46 +13:00
Damian Mooyman c5837c62e8
Merge pull request #7679 from dhensby/pulls/3.5/fix-critical-issues 
Fixing scrutinizer issues
 2017-12-06 11:30:57 +13:00
Daniel Hensby 8d1a5ed8b7
More code style fixes 2017-12-05 14:20:13 +00:00
Daniel Hensby 2aa1d8f2c4
remove create_function usage 2017-12-05 14:20:13 +00:00
Daniel Hensby 84d7afb347
FIX Use baseDataClass for allVersions as with other methods 2017-12-05 13:02:20 +00:00
Robbie Averill 2538f59ab7
Merge pull request #5211 from stevie-mayhew/pulls/reset-button 
BUGFIX: don't try and switch out of context of the tab system
 2017-12-05 19:59:49 +13:00
Damian Mooyman 25e276cf37 [ss-2017-006] Fix user agent invalidation on session startup 2017-12-01 10:55:00 +13:00
Damian Mooyman 22ccf3e2f9
[ss-2017-007] Ensure xls formulae are safely sanitised on output 
CSVParser now strips leading tabs on cells
 2017-12-01 10:19:48 +13:00
Damian Mooyman 6ba00e829a
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt 2017-11-30 15:53:50 +13:00
Loz Calver b31b22ac8e
Merge pull request #7635 from dhensby/pulls/3.5/update-pwd-encryption-on-change 
FIX Update meber passwordencryption to default on password change
 2017-11-27 09:05:43 +00:00
Damian Mooyman bac5f4c8aa
Merge branch '3.5' into pulls/3.5/update-pwd-encryption-on-change 2017-11-27 14:42:32 +13:00
Daniel Hensby f31caaa429
Merge pull request #7640 from kinglozzer/travis-firefox 
Specify Firefox 31 for Travis Behat builds
 2017-11-24 21:53:35 +00:00
Loz Calver 7b719d7b9d Specify Firefox 31 for Travis Behat builds 2017-11-24 21:16:36 +00:00
Loz Calver 6ab9dba9c8
Merge pull request #7639 from dhensby/pulls/3.5/phpunit-warnings 
Fix deprecated usage of getMock in unit tests
 2017-11-24 15:16:26 +00:00
Daniel Hensby 09a003bc13
Fix deprecated usage of getMock in unit tests 2017-11-24 14:48:30 +00:00
Daniel Hensby 2ad3cc07d5
FIX Update meber passwordencryption to default on password change 2017-11-23 21:17:31 +00:00
Daniel Hensby 79bba8bfd1
Merge pull request #7632 from open-sausages/pulls/3.5/fix-director-cli-redirect 
BUG Don't redirect in force_redirect() in CLI
 2017-11-23 12:49:32 +00:00
Damian Mooyman 1053de7ec3 BUG Don't redirect in force_redirect() in CLI 
Replaces #4025
 2017-11-23 14:26:55 +13:00
Loz Calver a7dfda2a85
Merge pull request #7628 from dhensby/pulls/3.5/travis-retry 
Travis retry on imagick install
 2017-11-22 17:04:01 +00:00
Daniel Hensby a63bb12d92
Travis retry on imagick install 2017-11-22 13:25:26 +00:00
Daniel Hensby 2e76936878
Merge pull request #7345 from schellmax/patch-2 
TreeDropdownField: replace onadd by onmatch
 2017-11-22 12:37:11 +00:00
Daniel Hensby 0f2049d4d4
[SS-2017-008] Fix SQL injection in search engine 2017-11-21 14:45:36 +00:00