Commit Graph

21973 Commits

Author SHA1 Message Date
Garion Herman
6161e8bf07 Merge branch '4.6' into 4 2020-06-15 15:04:09 +12:00
Garion Herman
1094077320 Added 4.6.0-rc1 changelog 2020-06-15 14:31:31 +12:00
Garion Herman
c4e2d0f45c Update translations 2020-06-15 12:35:00 +12:00
Robbie Averill
213e97f7b9
Merge pull request #9547 from jakxnz/pulls/4/mention-session-timeout-in-security-docs
Added mention of Session.timeout to secure_coding docs
2020-06-12 09:30:26 -07:00
Jackson Darlow
ae1a883b32 Added mention of Session.timeout to secure_coding docs 2020-06-12 14:43:37 +12:00
Steve Boyd
7d87ba72d5 Merge branch '4.6' into 4 2020-06-12 11:20:53 +12:00
Steve Boyd
4daccfab67 Merge branch '4.5' into 4.6 2020-06-12 11:20:13 +12:00
Robbie Averill
1d6a6247a3
Merge pull request #9537 from open-sausages/pulls/4/set-up-47-dev
Merge up 4.6 branch + update travis to target x-dev branches
2020-06-04 09:10:33 -07:00
Maxime Rainville
256309bc56 Update travis config to target x-dev branches 2020-06-04 14:50:33 +12:00
Maxime Rainville
b0eb2fb38e Merge branch '4.6' into pulls/4/set-up-47-dev 2020-06-04 14:49:06 +12:00
Bryn Whyman
09aba3594d
Merge pull request #9533 from creative-commoners/fix-link
DOCS fix broken link in changelog
2020-06-03 10:21:53 +12:00
brynwhyman
a2bdd1ca82 DOCS fix broken link in changelog 2020-06-03 09:53:14 +12:00
Robbie Averill
ea7e0e8e3b
Merge pull request #9529 from open-sausages/pulls/4.6/update-travis
Target 4.6 minor branches in build
2020-05-28 09:19:36 -07:00
Robbie Averill
615abf5020
Merge pull request #9530 from christopherdarling/patch-17
DOCS Form::loadDataFrom constants in docblock
2020-05-28 09:16:23 -07:00
Christopher Darling
4303917ac5
DOCS Form::loadDataFrom constants in docblock
... missing MERGE_ prefix as defined in this class
2020-05-28 16:40:12 +01:00
Maxime Rainville
6b46995a60 Target 4.6 minor branches in build 2020-05-28 18:05:21 +12:00
Sam Minnée
eb658e0705
Merge pull request #9528 from silverstripe-terraformers/bugfix/remove-recursive-write-rebased
Remove recursive write until its fixed [Rebased]
2020-05-28 17:12:36 +12:00
Steve Boyd
44776a0e3e
DOC Add file status icons to change log (#9522)
DOC Add file status icons to change log
2020-05-28 16:14:07 +12:00
Adrian Humphreys
d320026375
Remove recursive write until its fixed 2020-05-28 14:34:55 +12:00
Maxime Rainville
dd9b8ecd1f
Add a landing page for the beta changelogs (#9524)
DOC Add an index page for the beta changelog
2020-05-28 09:28:23 +12:00
Maxime Rainville
0f5c5d14c2
DOC Show beta changelogs on doc site (#9523) 2020-05-27 17:36:38 +12:00
Maxime Rainville
c3bde434d9 Added 4.6.0-beta1 changelog 2020-05-27 16:43:53 +12:00
Maxime Rainville
d3e8d10226 Update translations 2020-05-27 03:06:45 +00:00
Loz Calver
d8819f8f18
Merge pull request #9521 from indygriffiths/patch-1
DOCS fix incorrect Injector YAML examples
2020-05-26 12:39:17 +01:00
Indy Griffiths
63fd20093e
DOCS fix incorrect Injector YAML examples 2020-05-26 22:30:01 +12:00
Maxime Rainville
acccdd8a1c Merge branch '4.5' into 4 2020-05-26 14:31:06 +12:00
Maxime Rainville
42bb28965c Merge branch '4.4' into 4.5 2020-05-26 14:30:27 +12:00
Maxime Rainville
395893b559 Merge branch '4.3' into 4.4 2020-05-26 14:30:02 +12:00
Maxime Rainville
86fcb9e29c Merge branch '4.2' into 4.3 2020-05-26 14:29:16 +12:00
Maxime Rainville
a24a923d0c
DOC Create dedicated article about limiting allowed file types (#9505) 2020-05-20 20:36:51 +12:00
Daniel Hensby
295fc7c2ad
Merge pull request #9473 from dhensby/pulls/short-array-docs
Use short array syntax across the framework's codebase
2020-05-16 10:46:05 +01:00
Daniel Hensby
080ce157ce
Fix various typos in comments 2020-05-16 10:34:53 +01:00
Michal Kleiner
21129b1624
Use short array syntax across the framework's codebase 2020-05-16 10:34:45 +01:00
Robbie Averill
f3a6922d5d
Merge pull request #9511 from creative-commoners/pulls/4/nonce-unit-test-fix
FIX Reset nonce style to prevent affecting other unit tests
2020-05-12 21:46:39 -07:00
Steve Boyd
b1b61f866e FIX Set nonce style on unit tests 2020-05-13 16:07:31 +12:00
Guy Marriott
e5d0400596
Merge pull request #9509 from brettt89/pulls/url_generator_nonce_sha1_md5 2020-05-12 10:10:16 -07:00
Brett Tasker
1d19051c10 Add sha1 and md5 hashing options in resource URL 2020-05-12 18:14:03 +12:00
Robbie Averill
6fe74fb41b
Merge pull request #9506 from mattclegg/1589076925
DOCS: Minor typo
2020-05-10 13:11:11 -07:00
Matt Clegg
153e2383e6
DOCS: Minor typo 2020-05-10 08:01:10 +05:45
Maxime Rainville
10efe79b93
DOC Explain how to configure a low level application middleware (#9504) 2020-05-07 11:22:32 +12:00
Mojmir Fendek
7dc6b36c16
Unique key for DataObject (#9400)
NEW Unique key for DataObject
2020-05-04 09:10:51 +12:00
Robbie Averill
6bd0697a71
Merge pull request #9503 from quamsta/patch-1
Fixed broken link to the module creation docs
2020-05-01 10:28:33 -07:00
Dustin Quam
e344b66dbe
Fixed broken link to the module creation docs 2020-05-01 12:19:32 -05:00
Andre Kiste
3a424747df
Merge pull request #9332 from shoosah/feature/add-error-message-into-field
Allow to add error message into a specific field
2020-05-01 15:46:29 +12:00
Andre Kiste
ec51f98adb
Merge pull request #8870 from jinjie/4
Fix: Allow editing of relation if item is created.
2020-05-01 15:37:52 +12:00
Steve Boyd
ce3dba5560
Merge pull request #9425 from open-sausages/pulls/4/in-modal-editing-changelog
DOC Document new in-modal file editing in changelogs
2020-04-29 10:54:38 +12:00
Maxime Rainville
62703d5cad DOC Document new in-modal file editing in changelogs 2020-04-29 10:28:55 +12:00
Guy Marriott
693c4cde46
Merge pull request #9499 from lekoala/patch-16 2020-04-28 12:23:28 -07:00
Thomas Portelange
2f3c0fc8dd
Update src/Control/Session.php
Co-Authored-By: Guy Marriott <guy.the.person@gmail.com>
2020-04-28 19:21:52 +02:00
Robbie Averill
8bd9f48669
Merge pull request #9501 from mattclegg/1588075087
DOCS: Fix typos & grammer
2020-04-28 09:42:03 -07:00