Daniel Hensby
dc8c05519a
Merge pull request #7893 from open-sausages/pulls/3/the-summary-of-all-parts
2018-02-27 11:49:07 +00:00
Aaron Carlino
38a7e1c2d2
Remove short array syntax
2018-02-27 22:36:31 +13:00
Aaron Carlino
c755f77288
Fix indentation
2018-02-27 22:34:16 +13:00
Aaron Carlino
e107512063
Back port 4.0 implementation of numeric/assoc key merging for summary_fields
2018-02-27 16:42:44 +13:00
Chris Joe
1973f87c4b
Merge pull request #7892 from open-sausages/pulls/4.0/dont-log-me-out-bro
...
BUG Fix environment variable assignment
2018-02-27 13:38:26 +13:00
Christopher Joe
1cdbab45c9
Added comment about array_merge() not working
2018-02-27 09:52:42 +13:00
Aaron Carlino
0863bac29a
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-27 09:52:36 +13:00
Robbie Averill
833e6eb138
Merge pull request #7891 from DorsetDigital/patch-1
...
Update 01_Error_Handling.md
2018-02-27 09:30:35 +13:00
DorsetDigital
4974996cbe
Update 01_Error_Handling.md
...
Add use statements in initial code sample for completeness and hopefully avoid errors when code is copy & pasted
Add a 'be' to dependency injection paragraph so it reads properly
2018-02-26 19:31:44 +00:00
Loz Calver
e23353fe99
Merge pull request #7885 from dhensby/pulls/4.0/email-docs-config
...
DOCS update email docs to use correct config syntax
2018-02-26 12:32:13 +00:00
Daniel Hensby
722f2d178a
Merge branch '4.1' into 4
2018-02-26 10:57:52 +00:00
Daniel Hensby
856e89998b
Merge branch '4.0' into 4.1
2018-02-26 10:56:45 +00:00
Chris Joe
deebc78caf
Merge pull request #7890 from open-sausages/pulls/4.0/fix-tests-bootstrapping
...
BUG Fix incorrect assets created when ASSETS_PATH !== BASE_PATH . '/assets'
2018-02-26 16:16:03 +13:00
Chris Joe
225bda13f4
Merge pull request #7886 from open-sausages/pulls/4.1/dont-log-me-out-bro
...
Improve Environment::getVariables() array copy
2018-02-26 15:17:11 +13:00
Damian Mooyman
b27102f810
BUG Fix incorrect assets created when ASSETS_PATH !== BASE_PATH . '/assets'
2018-02-26 13:12:08 +13:00
Christopher Joe
f650c92436
Added comment about array_merge() not working
2018-02-26 12:24:02 +13:00
Daniel Hensby
ade88ef0ea
DOCS update email docs to use correct config syntax
2018-02-23 11:49:13 +00:00
Aaron Carlino
d91648dd6e
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-23 16:25:41 +13:00
Daniel Hensby
606f26d068
Merge pull request #7884 from JorisDebonnet/patch-1
...
Update 4.0.0.md
2018-02-22 11:55:45 +00:00
JorisDebonnet
26280f8ab9
Update 4.0.0.md
...
Fixed several small issues
2018-02-22 03:22:13 +01:00
Daniel Hensby
ced2ba1f64
API Move CSV writing/reading to league/csv library
2018-02-22 09:22:37 +13:00
Daniel Hensby
dace2f179d
Merge branch '4.1' into 4
2018-02-21 13:58:45 +00:00
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1
2018-02-21 13:40:30 +00:00
Robbie Averill
7fe8da3222
Merge pull request #7881 from oddnoc/shortcode-docs
...
DOCS: remove backticks from Markdown link
2018-02-21 15:30:56 +13:00
Fred Condo
2f2390be59
DOCS: remove backticks from Markdown link
...
Markdown does not render links within backticks.
2018-02-20 16:54:18 -08:00
Daniel Hensby
2074f8fc69
Merge pull request #7878 from open-sausages/pulls/4.0/fix-unstaged-versioned
...
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 11:44:05 +00:00
Damian Mooyman
0e26c06644
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 12:20:18 +13:00
Daniel Hensby
4f354ff89b
Merge branch '3' into 4
2018-02-19 14:12:49 +00:00
Robbie Averill
2eb5843c27
Merge pull request #7876 from Juanitou/patch-1
...
Remove broken link in 05_Common_Problems.md
2018-02-18 14:28:17 +13:00
Juan Molina
d4f413d4db
Remove broken link in 05_Common_Problems.md
...
Remove broken (and outdated) link to leftandmain.com article.
2018-02-17 23:58:42 +01:00
Christopher Joe
86addea1d2
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
2018-02-16 23:34:05 +13:00
Andrew Aitken-Fincham
de0b76dff6
ENHANCEMENT Fall back to SSViewer::get_themes when using themeResourceLoaders
2018-02-16 09:09:35 +13:00
Damian Mooyman
20c8058700
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-15 12:24:34 +13:00
Damian Mooyman
b0c742b0a9
Added 4.1.0-rc2 changelog
2018-02-15 11:29:30 +13:00
Damian Mooyman
12e701c8ed
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-15 09:28:14 +13:00
Damian Mooyman
e809c0fd62
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-02-15 09:27:51 +13:00
Loz Calver
d33fbc6add
Merge pull request #7867 from simonwinter/patch-2
...
Update validation in Developer guides
2018-02-14 09:18:26 +00:00
Chris Joe
ffddc6945a
Merge pull request #7868 from open-sausages/pulls/4.1/upgrade-test-usage
...
Update reference to TestAssetStore
2018-02-14 20:46:21 +13:00
Damian Mooyman
4e5a664183
Merge pull request #7865 from open-sausages/pulls/4.0/i-configured-this-out
...
Fix docs for configuring before/after a specific config file
2018-02-14 16:35:00 +13:00
Damian Mooyman
34233c0470
Update reference to TestAssetStore
2018-02-14 16:24:12 +13:00
Simon Winter
341bb7ede1
Update 09_Validation.md
...
I believe that ValidationResult's error method is called, addError - and not error as stated in this file.
2018-02-14 11:48:07 +13:00
Ingo Schommer
d4fc08b206
Closing bracket
2018-02-14 10:14:44 +13:00
Ingo Schommer
6fab007138
Link to UX issues
2018-02-14 10:14:22 +13:00
Daniel Hensby
e357d1e903
Merge branch '3.6' into 4.0
2018-02-13 16:32:32 +00:00
Daniel Hensby
09726333b7
Merge branch '3.6' into 3
2018-02-13 14:30:59 +00:00
Daniel Hensby
9c50b03b86
Merge branch '3.5' into 3.6
2018-02-13 14:30:29 +00:00
Daniel Hensby
690eec52c6
Merge pull request #7864 from open-sausages/pulls/4.1/fix-slashes
...
BUG Fix incorrect convert slashes argument
2018-02-13 10:52:22 +00:00
Daniel Hensby
1bec8a5d0c
Merge pull request #7850 from jonom/singleton-fix-3x
...
FIX Singleton creation
2018-02-13 08:29:47 +00:00
Jonathon Menz
c767e472dc
FIX DataObject singleton creation
...
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878 )
2018-02-12 20:30:35 -08:00
Robbie Averill
8e25a98f27
DOCS Remove extra square bracket from markdown link
2018-02-13 16:59:26 +13:00
