Daniel Hensby
457931d664
Merge branch '3.3' into 3
2016-05-04 23:32:10 +01:00
Daniel Hensby
32f0a637b4
Merge branch '3.2' into 3.3
2016-05-04 23:17:36 +01:00
Daniel Hensby
0884683c6b
Merge branch '3.1' into 3.2
2016-05-04 23:15:43 +01:00
Loz Calver
f6f3c89dc8
Add SSViewer_Scope constants to make it easier to work with item stacks
2016-05-04 16:50:33 +01:00
Loz Calver
24660afabd
FIX: Parameters passed to includes overwrite all scopes ( fixes #2617 )
2016-05-04 16:49:12 +01:00
Daniel Hensby
9fc4160425
Merge pull request #5348 from tractorcow/pulls/3/filterable-unsavedrelation
2016-05-04 10:50:46 +01:00
Loz Calver
36e64168a5
Merge pull request #5444 from tractorcow/pulls/3/fix-upload-size
...
BUG fix Upload_Validator getAllowedMaxFilesize
2016-05-04 09:13:00 +01:00
Christopher Darling
220290d61c
test to prove #5222
2016-05-04 12:05:02 +12:00
Tim Kung
d1c7554c1e
Upload_Validator fixing getAllowedMaxFileSize to correctly return * value
2016-05-04 12:05:02 +12:00
Damian Mooyman
5925b65547
Merge pull request #5395 from dhensby/pulls/3.3/empty-manifest-fix
...
MINOR Empty YAML config causes invalid argument error
2016-05-04 10:48:28 +12:00
Damian Mooyman
0bc5fb31c1
Merge branch 'pull/5388' into 3
2016-05-04 10:33:45 +12:00
Damian Mooyman
096f30ebe5
BUG Fix GridFieldAddExistingAutocompleter
...
This fix exchanges references to sub-components by ID with class references
Fixes #5382
2016-05-03 14:28:41 +12: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
Tim
a15e8eca72
[BUG] Updating Upload_Validator and related translatable files to change all cases of filesize spelling to file size ( #5369 )
2016-05-02 08:58:35 +12:00
Damian Mooyman
2a5ba397e6
BUG Fix SS_HTTPResponse being cast as string ( #5413 )
...
Fixes #5335
2016-05-02 08:54:19 +12:00
NightJar
89351e6c31
Fix the most egregious error for an NZ based proj. ( #5416 )
...
The Bay of Plenty Rugby team is the Steamers, and play in the NPC (National Provincial Championship), hailing from the Te Ika a Maui (North Island).
The Canterbury Crusaders (note the alliteration) hail from Te Waipounamu (South Island), and are an entry in the Super Rugby championship, which is an international affair (also known as the Super12, Super15 & most recently Super18), in which the Bay of Plenty is (most unfortunately, depending on your disposition) drafted under the Waikato region's entry with The Chiefs. Being the most popular sport and widely announced news topic in the country means that even people that don't particuarly follow rugby know this, and simple trolls (whether intentional or not) cannot be allowed to slide past quality control; for those that do can get quite upset about this kind of thing. Plus international folk can't be getting the wrong idea; Everyone knows the internet is no place for misinformation!
2016-04-29 12:07:25 +12:00
Daniel Hensby
8673ac15bc
MINOR Empty YAML config causes invalid argument error
2016-04-26 12:58:27 +01:00
Daniel Hensby
b9e5a198e8
Merge pull request #5394 from kinglozzer/3192-gf-pagination
...
FIX: GridFieldPaginator now prevents viewing pages with no results (fixes #3192 )
2016-04-26 12:44:11 +01:00
Loz Calver
61a9b2a41a
FIX: GridFieldPaginator now prevents viewing pages with no results ( fixes #3192 )
2016-04-26 09:34:03 +01:00
Damian Mooyman
da8f4a7eb6
Merge pull request #3828 from dhensby/pulls/byids-arraylist
...
API `byIDs` added to `ArrayList`
2016-04-26 17:52:22 +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
679185514d
Merge 3.3 into 3
...
Conflicts:
admin/css/screen.css.map
2016-04-26 00:24:59 +01:00
Daniel Hensby
745faebd81
Merge 3.2 into 3.3
...
Conflicts:
.travis.yml
2016-04-26 00:17:09 +01:00
Daniel Hensby
a0812f987a
Merge 3.1 into 3.2
...
Conflicts:
admin/javascript/LeftAndMain.js
control/HTTPRequest.php
docs/en/00_Getting_Started/00_Server_Requirements.md
2016-04-26 00:09:33 +01:00
Ralph Slooten
2c968d97a6
Remove invalid attributes
...
Headers do not have `type` & `name` attributes which are being inherited from the extended classes.
2016-04-26 09:45:52 +12:00
Ingo Schommer
f80bdaba3b
Merge pull request #5353 from assertchris/forms-toggle-field-comment-changes
...
Changed comments in forms\ToggleField.php
2016-04-25 22:34:57 +12:00
Daniel Hensby
fde6376996
FIX Admin bloacklisted messages using correct $.inArray check
2016-04-24 08:57:45 +01:00
Ingo Schommer
cfd6cd259d
Merge pull request #5370 from tractorcow/pulls/3/fix-behat-modal-error
...
BUG Fix error when modals are displayed
2016-04-22 11:48:01 +12:00
Damian Mooyman
fa5b8b8fb1
BUG Fix error when modals are displayed
2016-04-22 10:31:49 +12:00
Ingo Schommer
0a3e39b96c
Merge pull request #5364 from robbieaverill/feature/json-dbfield-formatting
...
FIX #5363 Add .JSON option for templates
2016-04-21 21:17:21 +12:00
JorisDebonnet
9eac541740
Enhance GD::greyscale to allow darker or lighter results, and change color weights for greyscale ( #5332 )
...
Tweaking the first three parameters (R, G, B) allows you to get a different mix of colors into grey, but it does not allow you to make the result lighter or darker because their total is normalized. This is quite a common operation on greyscaled images though, so I added a fourth parameter: brightness. It defaults to 100% so that it does not have any effect when not used (making this backwards compatible). $brightness = 50 will make it darker, $brightness = 150 will overlight it.
2016-04-21 19:26:46 +12:00
Robbie Averill
ae268ae4df
FIX #5363 Add .JSON option for templates
2016-04-21 17:01:05 +12: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
Jeffrey Guo
4f14175022
setup CMS Settings in one test step
2016-04-20 22:40:04 +12:00
assertchris
ec247cefd8
Changed comments in forms\ToggleField.php
2016-04-20 18:31:17 +12:00
Damian Mooyman
30894eb4cf
Merge pull request #5357 from assertchris/cast-heading-level-to-int-in-forms-toggle-composite-field
...
Cast heading level to int, in forms\ToggleCompositeField.php
2016-04-20 18:01:43 +12:00
Damian Mooyman
61db5c8f76
Merge pull request #5356 from assertchris/forms-toggle-composite-field-comment-changes
...
Changed comments in forms\ToggleCompositeField.php
2016-04-20 18:01:31 +12:00
Damian Mooyman
b83293d2e4
Merge pull request #5354 from assertchris/forms-toggle-field-style-changes
...
Changed style in forms\ToggleField.php
2016-04-20 18:00:59 +12:00
Damian Mooyman
697ac4c441
Merge pull request #5352 from assertchris/forms-validator-comment-changes
...
Changed comments in forms\Validator.php
2016-04-20 17:58:18 +12:00
assertchris
6fd11f584d
Cast heading level to int, in forms\ToggleCompositeField.php
2016-04-20 16:16:59 +12:00
assertchris
f6effb9347
Changed comments in forms\ToggleCompositeField.php
2016-04-20 16:02:40 +12:00
assertchris
8e7e783dd0
Changed style in forms\ToggleField.php
2016-04-20 15:00:38 +12:00
assertchris
29ee58abc3
Changed comments in forms\Validator.php
2016-04-20 14:27:50 +12:00
Daniel Hensby
f32c893546
[SS-2016-005] FIX Apply brute force protection to default admin
2016-04-19 23:20:29 +01:00
Damian Mooyman
43b00520fe
API Remove artifact datalist overrides from UnsavedRelationList
2016-04-20 08:55:32 +12:00
Daniel Hensby
f49c0b58d9
Merge pull request #5344 from sminnee/new-committers
2016-04-19 12:11:26 +01:00
Sam Minnee
82a89a94f4
Add 2 new committers, remove 1 who has left.
2016-04-19 23:05:59 +12:00
