Commit Graph

21401 Commits

Author SHA1 Message Date
Dan Hensby
765d1568ab
Merge branch '4.3' into 4 2019-03-06 11:04:50 +00:00
Dan Hensby
a8605b04e0
Merge branch '4.2' into 4.3 2019-03-06 11:04:14 +00:00
Dan Hensby
7e34167ddf
Merge branch '4.1' into 4.2 2019-03-06 11:01:17 +00:00
Dan Hensby
625e6d5f54
Merge branch '4.0' into 4.1 2019-03-06 11:00:41 +00:00
Loz Calver
80f83b9043
Merge pull request #8843 from dhensby/pulls/4.0/doinit-comparison
FIX doInit comparison should be lowercased
2019-03-06 09:53:51 +00:00
Aaron Carlino
406b286325 Merge branch '4.3' into 4 2019-03-06 11:13:13 +13:00
Maxime Rainville
c40e6d38a0 Add reference to #8815 in change log 2019-03-06 11:13:02 +13:00
Aaron Carlino
92050578ce Added 4.3.2 changelog 2019-03-06 11:13:01 +13:00
Guy Marriott
f8f6983773
Merge pull request #8793 from wilr/pulls/orm-exception
Throw error message when searchable_field does not return a object
2019-03-06 08:50:50 +13:00
Daniel Hensby
7416ce275b
FIX doInit comparison should be lowercased 2019-03-05 19:01:12 +00:00
Maxime Rainville
66e60a334b
Merge pull request #8807 from open-sausages/pulls/4/class-to-trait
Add class to trait visitor.
2019-03-04 14:10:48 +13:00
bergice
e9ab2ed381 Add class to trait visitor.
This lets us replace classes that extend certain other classes with a provided list of traits.
2019-03-04 13:52:28 +13:00
Robbie Averill
8af1ca53a7
Merge pull request #8818 from oddnoc/8579-nginx-assets
Update nginx example to support assets better
2019-03-01 10:47:21 +11:00
Daniel Hensby
3629875e12
Merge pull request #8831 from tractorcow/pulls/4.2/fix-write-base-record
BUG Fix writeBaseRecord with unique indexes
2019-02-28 13:54:08 +00:00
Ingo Schommer
71c32fea20 DOCS Clarify legacy_filenames=true tradeoffs 2019-02-28 08:56:53 +13:00
Ingo Schommer
1f08ed3765 DOCS Note about replaced files on keep_archived_files flag 2019-02-28 08:27:29 +13:00
Damian Mooyman
d1396b7dfe
BUG Fix writeBaseRecord with unique indexes
Fixes #6819
2019-02-27 16:40:12 +13:00
Maxime Rainville
11b9429c34 Merge branch '4.3' into 4 2019-02-27 12:14:51 +13:00
Maxime Rainville
651d537196 Merge branch '4.2' into 4.3 2019-02-27 12:13:24 +13:00
Maxime Rainville
ed013fcfbb Merge branch '4.1' into 4.2 2019-02-27 12:12:39 +13:00
Maxime Rainville
ac53f77115 Merge branch '4.0' into 4.1 2019-02-27 12:11:47 +13:00
Robbie Averill
b59aeaf802
Merge pull request #8815 from open-sausages/pulls/4.0/restore-dynamic-field-assigment
BUG Renable the ability to do dynamic assignment with DBField
2019-02-27 09:51:56 +11:00
Maxime Rainville
6ff319a0e1 BUG Implement peer review feedback, 2019-02-27 11:14:47 +13:00
Guy Marriott
3497c05a83
Merge pull request #8828 from open-sausages/pulls/4/docs-legacy-filenames
DOCS Clarify file migration and mention known bug
2019-02-27 10:37:39 +13:00
Andre Kiste
5c42fa18d7
Merge pull request #8796 from open-sausages/pulls/4/upgrading-your-module-doc
Adding a Upgrade module guide
2019-02-26 04:07:06 +01:00
Andre Kiste
d1fa6e40d8
Fix some minor typos 2019-02-26 15:38:03 +13:00
Ingo Schommer
62bd6ff334 DOCS Clarify security process, introduce CVE and CVSS
Moved the guts to "making a core release", since it's only really relevant to that audience.
There's more work to do around making security and non-security releases the same (less special handling),
but I think this is a good start.

[ci-skip]
2019-02-26 13:48:07 +13:00
Ingo Schommer
b4b2f576f0 DOCS Clarify file migration and mention known bug 2019-02-26 09:44:32 +13:00
Robbie Averill
7ab55a4948 Add LoggerState to disble user-configured logging during PHPUnit tests 2019-02-22 11:43:01 +07:00
Robbie Averill
b76d52d4cd
Merge pull request #8822 from creative-commoners/pulls/4/givimeo-a-relevant-lesson
DOCS Updating "lesson 0" to a relevant link
2019-02-22 11:07:17 +07:00
Guy Marriott
276ee6c7e6
DOCS Updating "lesson 0" to a relevant link 2019-02-22 16:33:51 +13:00
Guy Marriott
9773ee0330
Merge pull request #8819 from scott1702/patch-4
DOCS Update HTTP Cache headers docs to include note about testing in dev mode
2019-02-22 12:24:51 +13:00
Maxime Rainville
9a59f2f57d BUG Renable the ability to do dynamic assignment with DBField 2019-02-22 11:08:43 +13:00
Scott Hutchinson
57184c245c
DOCS Update HTTP Cache headers docs to include note about testing in dev mode [ci skip] 2019-02-22 10:16:11 +13:00
Fred Condo
22ae0e4387 Update nginx example to support assets better
- Enable viewing of draft assets
- Disable viewing of .htaccess and .method
- Enforce File.allowed_extensions (manually for now)
2019-02-21 12:30:13 -08:00
Robbie Averill
70c5fd6fed
Merge pull request #8817 from Juanitou/patch-6
Correct links in 13_CSS_Coding_Conventions.md
2019-02-21 21:35:04 +07:00
Juan Molina
b02fd13766
Correct 13_CSS_Coding_Conventions.md
Correct two broken links and the syntax of a third one
2019-02-21 15:32:45 +01:00
Juan Molina
fa7b6b25f0
Correct typo and commit hash
The previous commit was leading to a 404 page in GitHub.
2019-02-19 22:58:35 +01:00
Maxime Rainville
98988cfcf1 DOCS Escape \*nix in upgrading guide 2019-02-19 14:57:55 +13:00
Maxime Rainville
e07937c532 DOCS Implement some feedback from code review. 2019-02-19 14:55:01 +13:00
Robbie Averill
3e90fdf42f Merge branch '4.3' into 4 2019-02-19 08:41:05 +07:00
Robbie Averill
ed74549c4f Merge branch '4.2' into 4.3 2019-02-19 08:39:59 +07:00
Robbie Averill
79e44b42fa Merge branch '4.1' into 4.2 2019-02-19 08:37:07 +07:00
Robbie Averill
cb7f15a681 Merge branch '4.0' into 4.1 2019-02-19 08:36:41 +07:00
Aaron Carlino
a481d004ec Added 3.7.3 changelog 2019-02-19 08:36:17 +07:00
Aaron Carlino
4eeec52b09 Added 3.6.7 changelog 2019-02-19 08:35:57 +07:00
Aaron Carlino
0758cd8416 Added 4.2.4 changelog 2019-02-19 13:43:45 +13:00
Aaron Carlino
09c539e1c3 Merge branch '4.3' into 4 2019-02-19 12:21:24 +13:00
Aaron Carlino
70fc2d6f1d Add 4.3.1 changelog 2019-02-19 12:20:41 +13:00
Maxime Rainville
25bba49923 [SS-2018-021] Fix potential SQL vulnerability in non-scalar value hyrdation 2019-02-19 12:20:24 +13:00