Loz Calver
be496c4e54
Merge pull request #5530 from dhensby/pulls/empty-from-clause
...
FIX Empty from clause when joining to same base table
2016-05-12 15:56:57 +01:00
Daniel Hensby
3738d888e0
FIX Empty FROM clause
2016-05-12 12:38:05 +01:00
Loz Calver
5b275376d3
Many many bug
2016-05-12 12:38:04 +01:00
Daniel Hensby
dd554d883f
Proving bug with Deep nested many_many relations
...
When adding a filter to a many_many with a shared inheritance, the FROM table is removed and added as a LEFT JOIN which causes a syntax error.
This means `$dataList->filter('ManyManyRel.ID', array(1,2))` doesn't work.
2016-05-12 12:38:02 +01:00
Damian Mooyman
b612c0549d
Merge 3.1.19 into 3.1
2016-05-11 13:15:10 +12:00
Damian Mooyman
68dca6f6c0
Added 3.1.19 changelog
2016-05-11 11:09:20 +12:00
Damian Mooyman
60644a5be8
Update translations
2016-05-11 10:58:25 +12:00
Loz Calver
dc331347a0
Merge pull request #5506 from dhensby/pulls/3.1/fix-manymanylisttest
...
Allow ManyManyListTest to run standalone
2016-05-10 16:21:04 +01:00
Daniel Hensby
971d561633
Allow ManyManyListTest to run standalone
2016-05-10 15:24:07 +01:00
Daniel Hensby
ee5133f355
Added 3.1.19-rc1 changelog
2016-05-05 09:33:57 +01:00
Daniel Hensby
686db04a0a
Update translations
2016-05-05 02:05:54 +01:00
Daniel Hensby
92599727b9
Merge remote-tracking branch 'security/patch/3.1/ss-2016-006' into 3.1.19
2016-05-05 01:01:49 +01:00
Daniel Hensby
7af7f8dd65
Merge remote-tracking branch 'security/patch/3.1/ss-2016-005' into 3.1.19
2016-05-05 01:01:44 +01:00
Daniel Hensby
e8cfe1cc72
Merge remote-tracking branch 'security/patch/3.1/ss-2016-004' into 3.1.19
2016-05-05 01:01:37 +01:00
Daniel Hensby
09370290dc
Merge remote-tracking branch 'security/patch/3.1/ss-2016-001' into 3.1.19
2016-05-05 01:01:27 +01:00
Daniel Hensby
47c3165aa3
Merge remote-tracking branch 'security/patch/3.1/ss-2015-029' into 3.1.19
2016-05-05 01:01:15 +01:00
Damian Mooyman
71a4f1e605
Merge branch 'pull/5384' into 3.1
2016-05-02 18:16:41 +12:00
Damian Mooyman
a38eb8b784
Fix incorrect logic check
2016-05-02 18:15:39 +12:00
Damian Mooyman
e88a40853a
Merge pull request #3772 from phptek/cms/1054
...
FIX: Fixes CMS errors when viewing history on "Deleted" pages.
2016-04-26 17:21:19 +12:00
Daniel Hensby
fde6376996
FIX Admin bloacklisted messages using correct $.inArray check
2016-04-24 08:57:45 +01:00
Daniel Hensby
1ccd3926e3
[SS-2016-001] FIX Properly check backurl on CMSSecurity@success
2016-04-20 23:58:50 +01:00
Daniel Hensby
a6bd22ab2f
[SS-2016-006] FIX dont disable XSS for login forms
2016-04-20 23:57:59 +01:00
Daniel Hensby
a24c8260b1
[SS-2016-004] FIX Store current page IDs as ints
2016-04-20 23:55:59 +01:00
Daniel Hensby
f32c893546
[SS-2016-005] FIX Apply brute force protection to default admin
2016-04-19 23:20:29 +01:00
Daniel Hensby
3c0f2e8e11
[SS-2015-029] FIX Add CSFR protection to tree reorganise
2016-04-19 00:01:04 +01:00
Michael Strong
1f820b0b1c
DOCS allowed_actions access control ( #5333 )
2016-04-18 17:49:30 +12:00
Loz Calver
69858760e1
Merge pull request #5312 from dhensby/pulls/3.1/fix-5281
...
FIX Stop "success" message showing in CMS
2016-04-12 16:56:06 +01:00
Daniel Hensby
36283b86d5
FIX Stop "success" message showing in CMS
...
fixes #5281
2016-04-12 16:14:31 +01:00
Sean Harvey
3b7cfd0118
Merge pull request #5256 from tractorcow/pulls/3.1/fix-error-displayed
...
BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false
2016-04-01 12:10:22 +13:00
Damian Mooyman
6ec2656201
BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false
...
Fixes #5250
2016-04-01 11:04:06 +13:00
Loz Calver
20d116757a
Merge pull request #5217 from dhensby/pulls/3.1/docs-csv-parser
...
DOCS Fixing CSV Parser docs - fixes #5004
2016-03-21 15:02:56 +00:00
Daniel Hensby
c8f2e6702b
DOCS Fixing CSV Parser docs - fixes #5004
2016-03-21 14:22:43 +00:00
Daniel Hensby
863b737717
Merge pull request #5214 from tractorcow/pulls/3.1/fix-array-values
...
Do not hang on nested parameters in search context
2016-03-21 09:21:33 +00:00
Damian Mooyman
94b0f61957
Merge pull request #3494 from dnadesign/tabForceActive
...
fixing issue where 'ss-tabs-force-active' wasn't actually working
2016-03-21 16:53:49 +13:00
Nicola Fontana
11561aeb54
Do not hang on nested parameters in search context
...
Backport of 0b5a573#5056 to be semver compatible.
2016-03-21 15:54:22 +13:00
Damian Mooyman
cdedee130a
Merge pull request #5200 from dhensby/pulls/fix-token-redirect
...
FIX Parameter tokens now redirect to correct url if mod_rewrite is off
2016-03-21 14:45:03 +13:00
Daniel Hensby
add2ecdf8b
FIX Parameter tokens now redirect to correct url if mod_rewrite is off
2016-03-18 15:56:39 +00:00
Damian Mooyman
ba8f984940
Merge pull request #5121 from dhensby/pulls/3.1/fix-ip-from-LB
...
FIX getIP from behind a load-balancer that adds many IPs to the header
2016-03-02 10:25:02 +13:00
Daniel Hensby
817b836870
FIX getIP from behind a load-balancer that adds many IPs to the header
2016-03-01 21:07:48 +00:00
Ingo Schommer
8f0bbcbc7b
Merge pull request #4889 from dhensby/pulls/docs-version
...
DOCS Explicitly noting lack of PHP 7 support
2016-03-02 07:58:06 +13:00
Daniel Hensby
b8c8875303
DOCS Explicitly noting lack of PHP 7 support
2016-03-01 10:14:14 +00:00
Damian Mooyman
71bf14d590
Merge remote-tracking branch 'origin/3.1.18' into 3.1
2016-02-29 16:49:25 +13:00
Damian Mooyman
2147205dc1
Added 3.1.18 changelog
2016-02-29 15:10:05 +13:00
Damian Mooyman
31e04862a8
Update translations
2016-02-29 14:57:30 +13:00
Damian Mooyman
cd05068814
Merge branch '3.1.18' into 3.1
2016-02-27 20:59:51 +13:00
Damian Mooyman
b77acaeeb7
Added 3.1.18-rc2 changelog
2016-02-27 20:53:23 +13:00
Damian Mooyman
9d9a6fc0e8
Added 3.1.18-rc2 changelog
2016-02-27 20:53:15 +13:00
Damian Mooyman
387264fbbb
Update translations
2016-02-27 20:53:15 +13:00
Daniel Hensby
bd48d89642
FIX undeclared constant issue
2016-02-27 20:53:15 +13:00
Damian Mooyman
4d6e8a4dbd
Merge pull request #5102 from dhensby/pulls/fix-proxy-host-header
...
BUG Fixing undeclared constant issue
2016-02-27 20:19:11 +13:00
