Daniel Hensby
d8430f549d
Address feedback
2018-06-20 14:46:50 +12:00
Damian Mooyman
6da72d686f
Maybe fix it?
2018-06-20 14:46:50 +12:00
Damian Mooyman
a116b5dad8
BUG FIx manual resetDBSchema() calls breaking the database
2018-06-20 14:46:50 +12:00
Damian Mooyman
fbfd454d65
ENHANCEMENT Ensure test DB is flushed on either DDL or transaction-disabled tests
...
Fixes #8182
2018-06-20 14:46:50 +12:00
Damian Mooyman
53dded8cff
API Remove @internal from new 4.2 methods
2018-06-15 13:14:42 +12:00
Robbie Averill
5fa5abf295
Merge branch '4.1' into 4
...
# Conflicts:
# src/Forms/DateField.php
2018-06-15 11:52:07 +12:00
Damian Mooyman
b636587945
Respect semver and add tests
2018-06-15 11:04:12 +12:00
Damian Mooyman
310a259c5f
Add locale to Format
...
Fix up some regressions
2018-06-14 17:28:16 +12:00
Damian Mooyman
3ce8ab3adc
Improve handling of deprecated apis
2018-06-14 13:01:27 +12:00
Damian Mooyman
687d0a6af1
Refactor everything out of HTTP and into separate middlewares
2018-06-13 17:56:47 +12:00
Damian Mooyman
02ae2e7ed0
BUG Fix internal date formatting inheriting default locale
...
Fixes #8097
2018-06-13 13:32:11 +12:00
Daniel Hensby
ec956a682d
API Moving tests to use transactions
2018-06-13 09:35:45 +12:00
Damian Mooyman
77a45c0dbc
Merge remote-tracking branch 'origin/4.1' into 4
...
# Conflicts:
# src/Forms/HTMLEditor/HTMLEditorSanitiser.php
# src/ORM/DataObjectSchema.php
# src/ORM/Queries/SQLSelect.php
# src/View/Parsers/ShortcodeParser.php
2018-06-11 10:19:04 +12:00
Robbie Averill
d842225df6
FIX Codesniffer style violations with comments
2018-06-11 09:55:18 +12:00
Daniel Hensby
e260319823
Merge branch '4.0' into 4.1
2018-06-08 23:05:24 +01:00
Daniel Hensby
e1450b5e82
Merge pull request #8147 from kinglozzer/mysql-pdo-attr
...
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103 )
2018-06-08 13:06:03 +01:00
Damian Mooyman
29f9b1c18f
Fix linting issues
2018-06-08 11:38:36 +12:00
Loz Calver
66f57bd4da
FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver ( fixes #8103 )
2018-06-07 10:26:00 +01:00
Damian Mooyman
0aa13da0d9
BUG Backport bugfix for belongs_many_many with many_many through.
...
Partial backport of #7928
Fixes #8131
2018-06-06 09:43:04 +12:00
Damian Mooyman
2510935b53
Merge pull request #8065 from dhensby/pulls/4/mmtl-jointable
...
NEW Add getJoinTable to MMTL
2018-06-01 10:33:46 +12:00
Robbie Averill
e0993043f8
Merge branch '4.1' into 4
2018-05-30 15:08:39 +12:00
Robbie Averill
c8b0bc0ad7
Merge branch '4.0' into 4.1
...
# Conflicts:
# src/ORM/DataObject.php
# tests/php/ORM/DataObjectDuplicationTest.php
# tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Robbie Averill
ea16e28aa7
Merge branch '4.1' into 4
2018-05-28 18:33:56 +12:00
Robbie Averill
6d98a912c9
Merge branch 'heads/4.1.1' into 4.1
2018-05-28 18:26:20 +12:00
Robbie Averill
3a537bc745
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:50:07 +12:00
Robbie Averill
722202fef4
Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
...
# Conflicts:
# src/Control/Director.php
2018-05-24 15:41:11 +12:00
Daniel Hensby
1a57c7c1d0
NEW Add getJoinTable to MMTL
2018-05-14 11:19:24 +01:00
Robbie Averill
cd716fb61b
Switch check for is_string
2018-05-14 17:05:31 +12:00
Damian Mooyman
2e13ae746f
[ss-2018-006] Prevent code execution in template value resolution
2018-05-14 17:05:31 +12:00
Daniel Hensby
d5e2d3fa67
Merge branch '3.6' into 4.0
2018-05-01 21:47:17 +01:00
JorisDebonnet
1d3e83838d
Fix phpdoc for relation method (namespace)
2018-04-30 02:10:33 +02:00
UndefinedOffset
d17f424541
Changed checked for UnsavedRelationList to ManyManyList
2018-04-18 12:15:16 -03:00
UndefinedOffset
fe4b90edc0
FIX: Duplicating many_many relationships looses the extra fields in 4.0
2018-04-18 11:49:20 -03:00
Damian Mooyman
be8287fef8
BUG Prevent failover / extensions interfering with composite field properties ( #7988 )
2018-04-06 14:48:24 +12:00
Damian Mooyman
5ff6874dbc
Merge remote-tracking branch 'origin/4.1' into 4
2018-04-04 17:38:26 +12:00
Damian Mooyman
99426cdb05
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-04-04 17:36:45 +12:00
Damian Mooyman
878dc1f86d
BUG Change inverse polymorphic inference to silent-empty instead of explicit error
2018-03-29 09:38:07 +13:00
Andreas Lindahl
dd44deacb4
Fix for "too few parameters" error when using DBMultiEnum
2018-03-28 16:42:12 +02:00
Damian Mooyman
257ff69e32
API Implement many_many through polymorphic (from only) ( #7928 )
...
* API Support many_many through polymorphic relations (from side only)
Fixes #7911
Fixes #3136
* Add extra docs and allow optional arguments
* ENHANCEMENT Enable quiet to be turned off
* BUG Fix issue with manymanythroughlist duplication
2018-03-22 10:26:25 +13:00
Daniel Hensby
fb945690b1
Merge pull request #7875 from sminnee/devbuild-record-count
...
Suggested feature: dev/build record count
2018-03-14 14:26:49 +00:00
Daniel Hensby
fd449618b2
Merge branch '4.1' into 4
2018-03-14 14:11:03 +00:00
Daniel Hensby
ec6ff71107
Merge branch '4.0' into 4.1
2018-03-14 14:09:40 +00:00
Daniel Hensby
d28a1b5cfc
Merge branch '3.6' into 4.0
2018-03-14 14:08:41 +00:00
Damian Mooyman
8b9c292509
Merge remote-tracking branch 'origin/4.1' into 4
2018-03-13 14:26:39 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-03-13 14:26:18 +13:00
Damian Mooyman
4d424dd340
ENHANCEMENT get_by_id: alternate signature to allow MyDataObject::get_by_id($id)
2018-03-01 14:02:40 +00:00
Roman Schmid
40c2e299a0
Fix "mb_stripos(): Empty delimiter" warning when no search-keywords are given for DBText::ContextSummary.
...
Add unit-test to cover that case.
2018-03-01 11:39:30 +01:00
Daniel Hensby
9006daf20b
Cleaning up PR and adding tests
2018-02-28 13:31:56 +00:00
Joris Debonnet
559254407f
get_by_id: alternate signature to allow MyDataObject::get_by_id($id)
2018-02-28 13:09:12 +00:00
Daniel Hensby
dace2f179d
Merge branch '4.1' into 4
2018-02-21 13:58:45 +00:00
