tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-01 07:17:48 +02:00
Code Issues Projects Releases Wiki Activity
23,578 Commits 29 Branches 525 Tags 150 MiB
11e573694d
Commit Graph

23578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Boyd
11e573694d Merge branch '5.0' into 5 2023-06-19 17:33:35 +12:00
Sabina Talipova
220fee6a44
Merge pull request #10823 from creative-commoners/pulls/5.0/duplicate 
MNT Remove duplicate translation keys
 2023-06-19 17:10:05 +12:00
Steve Boyd
90c50957fb MNT Remove duplicate translation keys 2023-06-19 14:13:12 +12:00
Steve Boyd
11ab07a056 Merge branch '5.0' into 5 2023-06-16 11:48:53 +12:00
Steve Boyd
53237b9611 Merge branch '4' into 5.0 2023-06-16 11:43:16 +12:00
Steve Boyd
799cd2b7bc Merge branch '4.13' into 4 2023-06-16 11:43:02 +12:00
Guy Sartorelli
d27bf3d85c
Merge pull request #10798 from beerbohmdo/fix/empty-template-arguments 
FIX Passing 0 as first method argument breaks template
 2023-06-15 11:04:08 +12:00
Guy Sartorelli
5303e08d34
Merge pull request #10820 from creative-commoners/pulls/4.13/tx-1686724699 
ENH Update translations
 2023-06-15 10:06:37 +12:00
Steve Boyd
2ea66922cd ENH Update translations 2023-06-14 18:38:19 +12:00
Steve Boyd
9a279f654d Merge branch '5.0' into 5 2023-06-14 16:09:58 +12:00
Steve Boyd
cfda51a48e Merge branch '4' into 5.0 2023-06-14 16:09:34 +12:00
Steve Boyd
c2c5db0da0 Merge branch '4.13' into 4 2023-06-14 16:08:53 +12:00
josephlewisnz
b6a3e3a951
added an additional filter to remove empty array items (#10803) 
* ENH Added filter to remove empty/null from Path::join parts

This is to ensure null values are removed and trim() deprecated warnings are not thrown
Fixes #10802

* FIX revert public signature

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>

---------

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
 2023-06-14 15:46:23 +12:00
Guy Sartorelli
d5b9c8a0f9
Merge pull request #10818 from creative-commoners/pulls/5/tx-1686703393 
ENH Update translations
 2023-06-14 15:17:40 +12:00
Guy Sartorelli
6fd7694cbc
Merge pull request #10816 from creative-commoners/pulls/4.13/updatebool 
FIX Show correct default value
 2023-06-14 13:32:09 +12:00
Steve Boyd
76e9b78b0c ENH Update translations 2023-06-14 12:43:13 +12:00
Steve Boyd
35a8d79f62 FIX Show correct default value 2023-06-14 11:25:34 +12:00
Steve Boyd
dbefcef440 Merge branch '5.0' into 5 2023-06-14 11:10:44 +12:00
Guy Sartorelli
6c266ec6ff
Merge pull request #10813 from creative-commoners/pulls/5.0/textcollecttraits 
FIX Handle __TRAIT__ in i18nTextCollector
 2023-06-13 16:50:31 +12:00
Steve Boyd
f4e0c768bd FIX Handle __TRAIT__ in i18nTextCollector 2023-06-13 10:11:12 +12:00
Steve Boyd
8cee451d41 Merge branch '5.0' into 5 2023-06-12 14:08:03 +12:00
Steve Boyd
cf77f06544 Merge branch '4' into 5.0 2023-06-12 14:07:24 +12:00
Steve Boyd
ca542a386b Merge branch '4.13' into 4 2023-06-12 14:02:15 +12:00
Sabina Talipova
f88b7c3c2b
FIX Duplicate page keeps original pages canView and canEdit permission (#10806) 2023-06-12 13:29:06 +12:00
Guy Sartorelli
848768dfeb
Merge pull request #10774 from sunnysideup/patch-26 
BUG: fix issue where default admin without valid email can not be saved
 2023-06-09 19:06:26 +12:00
dominik
face94371e FIX Passing 0 as first argument breaks template 
Replace !empty with explicit string test
Added test for falseish first parameter arguments
 2023-06-09 08:55:20 +02:00
Nicolaas / Sunny Side Up
675ba90280
FIX fix issue where member without valid email can not be saved 
It is possible to have a member record without a valid email address. In this case, you can not save Member as it throws an error (email is tried being sent without a valid email address).
 2023-06-09 15:29:54 +12:00
Bram de Leeuw
33c62033fe
Fix translation key for DataObject.GENERALSEARCH (#10805) 
* MNT Use gha-dispatch-ci

* Update DataObject.php

Fix typo in GENERALSEARCH localisation

* Update en.yml

remove unnecessary localisation line

* Update nl.yml

remove unnecessary localisation line

* Update eo.yml

remove unnecessary localisation line

* Update ci.yml
 2023-06-09 13:44:00 +12:00
Guy Sartorelli
fd57f06755
Merge pull request #10804 from creative-commoners/pulls/5/unit-test-buildtask 
MNT Add BuildTaskTest
 2023-06-09 10:26:55 +12:00
Sabina Talipova
02aa80ffd2
Merge pull request #10783 from creative-commoners/pulls/5/eager-load 
NEW ORM eager loading
 2023-06-09 09:52:28 +12:00
Steve Boyd
ce01137e56 MNT Add BuildTaskTest 2023-06-08 12:32:47 +12:00
kevingroeger
30cd4047df
Adjust isEnabled method (#10801) 
* Adjust isEnabled method to use config values if present, adjust dev.yml to have a default_enabled key, add is_enabled as a private property for deprecation in cms 6

* remove default_enabled flag again, adjust comments as suggested, remove method signature from isEnabled, fix typo, adjust logic and add fallback value for isEnabled as true

* adjust isEnabled method, change static:: to ->enabled as the property is not actually static

---------

Co-authored-by: Kevin Gröger <k.groeger@headtrip.eu>
 2023-06-08 12:22:14 +12:00
Sabina Talipova
86917ce291
Merge pull request #10800 from creative-commoners/pulls/5/scan-theme-dir 
FIX Ensure dir exists before scanning it
 2023-06-08 08:37:19 +12:00
Steve Boyd
95eceb8d9e FIX Ensure dir exists before scanning it 2023-06-07 17:35:13 +12:00
Steve Boyd
246735101a NEW ORM eager loading 2023-06-07 14:59:02 +12:00
Steve Boyd
a211b5eeb5 Merge branch '4.12' into 4.13 2023-05-31 15:49:15 +12:00
Steve Boyd
e1ffa18db6 Merge branch '5.0' into 5 2023-05-31 14:26:21 +12:00
Steve Boyd
6cb35972c9 Merge branch '4' into 5.0 2023-05-31 14:26:07 +12:00
Steve Boyd
35b641ba09 Merge branch '4.13' into 4 2023-05-31 14:25:46 +12:00
Sabina Talipova
a790e5a6c4
Merge pull request #10793 from creative-commoners/pulls/4.13/tx-1685417432 
ENH Update translations
 2023-05-31 11:27:58 +12:00
Steve Boyd
9d84831756 Merge branch '4.11' into 4.12 2023-05-31 10:19:33 +12:00
Sabina Talipova
e137e0456a
Merge pull request #10794 from creative-commoners/pulls/4.11/backport-http-message 
DEP Explicitly require psr/http-message ^1
 2023-05-31 10:01:21 +12:00
Steve Boyd
80c51b6bd2 DEP Explicitly require psr/http-message ^1 2023-05-30 16:43:37 +12:00
Steve Boyd
6b49b6cdb6 ENH Update translations 2023-05-30 15:30:32 +12:00
Bernard Hamlin
e98f0d45af
Use ::create instead of new in GridFieldDetailForm_ItemRequest (#10791) 
Updates instances of `new X` to `X::create` so that Silverstripe classes will respect dependency injection
 2023-05-25 11:42:43 +12:00
Steve Boyd
385d13b6db Merge branch '5.0' into 5 2023-05-24 15:02:45 +12:00
Sabina Talipova
e8bde0f4f5
Merge pull request #10790 from creative-commoners/pulls/5.0/fix-merge-up 
MNT Fix broken merge-up
 2023-05-24 14:57:14 +12:00
Steve Boyd
aafdde1e13 MNT Fix broken merge-up 2023-05-24 14:27:33 +12:00
Steve Boyd
b02ccdf820 Merge branch '5.0' into 5 2023-05-24 14:19:18 +12:00
Steve Boyd
186800ae9e Merge branch '4' into 5.0 2023-05-24 14:18:46 +12:00