Damian Mooyman
d27be2b325
Merge branch '3.3' into 3
...
# Conflicts:
# javascript/GridField.js
2016-02-26 17:45:06 +13:00
Damian Mooyman
ae29576763
Merge branch '3.3.1' into 3.3
2016-02-26 17:35:42 +13:00
Damian Mooyman
a80c6e1e8c
Added 3.3.1-rc1 changelog
2016-02-26 17:30:07 +13:00
Damian Mooyman
0840f5d021
BUG Fix regressions in missing CSRF on print button
2016-02-26 17:05:56 +13:00
Damian Mooyman
2c1b934ba2
BUG Fix regression in gridfield get actions
2016-02-26 17:05:48 +13:00
Ingo Schommer
59026a7838
Merge pull request #5101 from open-sausages/pulls/3.3/fix-printbutton
...
BUG Fix regressions in missing CSRF on print button
2016-02-26 16:38:01 +13:00
Damian Mooyman
99ca2aa23d
BUG Fix regressions in missing CSRF on print button
2016-02-26 15:49:28 +13:00
Damian Mooyman
e1865151c5
Merge pull request #5098 from bummzack/5086-fix-member-validator
...
Fix for issue #5086
2016-02-26 14:39:53 +13:00
Daniel Hensby
11ad3e17c1
Merge pull request #5099 from tractorcow/pulls/3.3/gridfield-csrf-regression
...
BUG Fix regression in gridfield get actions
2016-02-26 00:48:14 +00:00
Damian Mooyman
f7caccaa7a
BUG Fix regression in gridfield get actions
2016-02-26 12:35:00 +13:00
Damian Mooyman
c4f850003b
Merge pull request #5089 from jakedaleweb/3
...
added if statement to catch NULL validators
2016-02-26 09:29:53 +13:00
Roman Schmid
f691a5da32
Improve Member_Validator to:
...
- properly check for existing members.
- allow extensions.
- remove old code and replace with new syntax and add config API.
Fix issue in Group code where Member_Validator was instantiated via "new" which didn't allow injector overrides.
Added unit-tests.
Establish a link between the member and the validator for said member.
2016-02-25 16:10:52 +01:00
Damian Mooyman
9fed5561f4
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# core/Constants.php
# dev/DevelopmentAdmin.php
2016-02-24 17:39:04 +13:00
Damian Mooyman
5f2d3f31d7
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# dev/DevelopmentAdmin.php
# docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
# lang/cs.yml
# lang/lt.yml
2016-02-24 17:29:06 +13:00
Damian Mooyman
efa13eb10a
Merge remote-tracking branch 'origin/3.3.0' into 3.3
2016-02-24 17:27:19 +13:00
Damian Mooyman
ff5ed6efeb
Merge remote-tracking branch 'origin/3.2.2' into 3.2
2016-02-24 17:03:43 +13:00
Damian Mooyman
0ec021dac8
Added 3.3.0 changelog
2016-02-24 16:30:34 +13:00
Damian Mooyman
301155b3e8
Update translations
2016-02-24 16:06:04 +13:00
Damian Mooyman
531b8b167b
Added 3.2.2 changelog
2016-02-24 15:33:02 +13:00
Damian Mooyman
50aab6d8d4
Update translations
2016-02-24 15:14:58 +13:00
Jake Ovenden
48ecb8d8f4
added if statement to catch NULL validators
2016-02-24 15:13:00 +13:00
Damian Mooyman
d51264873d
Merge pull request #5087 from scott1702/fix-nav
...
Fix incorrect height on main nav after toggle
2016-02-24 12:32:47 +13:00
Damian Mooyman
6cd66a6b13
Added 3.2.2-rc2 changelog
2016-02-24 12:01:41 +13:00
Ingo Schommer
faa94d51d5
[ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers
2016-02-24 11:33:54 +13:00
Damian Mooyman
e2c77c5a8f
[ss-2016-002] Ensure Gridfield actions respect CSRF
2016-02-24 11:33:53 +13:00
Damian Mooyman
15d4db3b4a
[ss-2015-028] Block unauthenticated access to dev/build/defaults
2016-02-24 11:32:49 +13:00
Damian Mooyman
2cc03bf97d
Merge pull request #5085 from tylerkidd/3186-versioned-config-enhancement-revised
...
ENHANCEMENT Ability to alter Versioned.versionableExtensions via config API
Fixes #5085
2016-02-24 10:59:30 +13:00
scott1702
a67b8144b0
Fix incorrect height on main nav after toggle
2016-02-24 10:23:16 +13:00
Tyler Kidd
375bbf954e
Enhancement and fix for issue #3186
2016-02-23 14:53:52 -06:00
Daniel Hensby
758c0273fa
Merge pull request #4584 from Olliepop/feature-config-charset-collation
2016-02-23 15:42:09 +00:00
Oliver Shaw
ec647ed007
UPDATE: Add support for user defined charset and collation
2016-02-23 15:40:30 +00:00
Loz Calver
8ac1b28ef8
Merge pull request #5080 from scott1702/gridfield-overflow
...
Fix dropdown cutoff on gridfield
2016-02-23 09:16:25 +00:00
scott1702
b2e30a50b1
Fix hidden dropdown on gridfield
2016-02-23 17:34:50 +13:00
Daniel Hensby
caf0ec3c5f
Merge pull request #5074 from tractorcow/pulls/3.2/fix-publish-version
...
BUG Correct behaviour of publish with $createNewVersion = true
2016-02-22 22:52:10 +00:00
Damian Mooyman
65a0981c08
BUG Correct behaviour of publish with $createNewVersion = true
...
Fixes #5040
Cleanup code to make behaviour more apparent
2016-02-23 10:15:49 +13:00
Damian Mooyman
2e037881b6
Merge pull request #5076 from flamytwista/patch-2
...
FEATURE Passing $tmpFile to extension.
2016-02-23 09:52:39 +13:00
Taras Yemtsov
01c8d38885
FEATURE Passing $tmpFile to extension.
2016-02-22 15:11:26 +03:00
Damian Mooyman
b4ea87a3bf
Merge pull request #5072 from robbieaverill/5071-new-line-after-cli-script-message
...
Fix #5071 - add newline to default no-arg message in cli-script.php
2016-02-22 16:08:27 +13:00
Robbie Averill
5d2a86db47
Fix #5071 - add newline to default no-arg message in cli-script.php
2016-02-22 13:52:12 +13:00
Damian Mooyman
94cec68c7e
Merge pull request #5065 from SpiritLevel/typo
...
typo in api link
2016-02-22 09:14:51 +13:00
David Alexander
23c6b25c6c
typo in api link
2016-02-18 23:11:31 -07:00
Damian Mooyman
17b42a3f89
Merge pull request #5032 from patricknelson/issue-5028-yaml-errors-empty
...
FIX for #5028 : Ensure empty YML configs don't break when merging them in.
2016-02-19 15:34:17 +13:00
Damian Mooyman
f1f662fd49
Merge pull request #5050 from SpiritLevel/3.2
...
DOCS 3.2 : fixing api: links now that api: tag parser working
2016-02-19 14:28:20 +13:00
Damian Mooyman
4ba2eb6244
Merge pull request #5053 from robbieaverill/patch-1
...
Typo fixes
2016-02-19 14:27:07 +13:00
Damian Mooyman
7a12a5926d
Merge pull request #5043 from jonom/image-deprecations
...
Image deprecations and optimisation
2016-02-19 13:58:54 +13:00
Damian Mooyman
3008e43942
Merge remote-tracking branch 'origin/3.2.2' into 3.2
2016-02-19 12:50:53 +13:00
Damian Mooyman
af28b0a414
Added 3.2.2-rc1 changelog
2016-02-19 11:22:10 +13:00
Damian Mooyman
3738436d0e
Update translations
2016-02-19 10:54:36 +13:00
Damian Mooyman
97089db8a6
Added 3.3.0-rc3 changelog
2016-02-18 17:29:18 +13:00
Ingo Schommer
893e49703d
[ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers
2016-02-18 17:28:54 +13:00
