Damian Mooyman
48a30909f3
Merge remote-tracking branch 'origin/3.2' into 3
...
# Conflicts:
# admin/javascript/LeftAndMain.BatchActions.js
# css/UploadField.css
# forms/HtmlEditorField.php
2015-12-22 14:07:52 +13:00
Damian Mooyman
08e9908742
Merge pull request #4862 from russellshome/patch-2
...
Fix path to /thirdparty/jquery-ui-themes/smoothness/jquery-ui.css
2015-12-22 11:21:31 +13:00
Robert Petreski
110ee04244
Updated RestfulService to include PATCH
...
RestfulService now allows PATCH and also removed CURLOPT_POST
2015-12-22 09:14:19 +11:00
Russell
4d047e5cb7
Fix path to /thirdparty/jquery-ui-themes/smoothness/jquery-ui.css
2015-12-22 10:45:01 +13:00
Damian Mooyman
880a3ef0ab
Merge pull request #4793 from jonom/image-properties
...
FIX Image_Cached record class name
2015-12-22 10:09:05 +13:00
Damian Mooyman
55e1b66285
Merge pull request #4859 from chillu/pulls/noteworthy-contrib-docs
...
Note about changelog additions in contrib guide
2015-12-21 14:33:57 +13:00
Ingo Schommer
b97b604a05
Merge pull request #4837 from tractorcow/pulls/3.2/release-docs
...
Documentation on the release process
2015-12-21 11:55:19 +13:00
Ingo Schommer
e114548a48
Note about changelog additions in contrib guide
2015-12-21 11:52:08 +13:00
Damian Mooyman
c5e1922c65
Merge pull request #4857 from ivoba/patch-1
...
DOCS : Update 02_Composer.md gdmedia/ss-auto-git-ignore as dev requirement
2015-12-18 10:18:29 +13:00
Ivo Bathke
f77bac3ab0
Update 02_Composer.md
...
gdmedia/ss-auto-git-ignore as dev requirement
2015-12-17 11:57:46 +01:00
UndefinedOffset
afbb5cfed4
BUGFIX: Vimeo oEmbed endpoint redirecting to no www
2015-12-16 12:19:37 +13:00
Damian Mooyman
f8c760a7c9
Merge pull request #4855 from UndefinedOffset/vimeo_oembed_fix
...
BUGFIX: Vimeo oEmbed endpoint redirecting to no www
2015-12-16 12:01:12 +13:00
Jake Bentvelzen
0bf55cff39
Stubbed saveInto for LookupField so that data can't be saved on a form accidentally
2015-12-16 09:42:14 +11:00
UndefinedOffset
cd66917a86
BUGFIX: Vimeo oEmbed endpoint redirecting to no www
2015-12-15 17:53:57 -04:00
Damian Mooyman
3dd2d29f20
Merge pull request #4852 from dhensby/pulls/fix-deselect-multitreedropdown
...
Fixing deselect failing to change field title
2015-12-16 09:38:52 +13:00
Daniel Hensby
e443a10a5e
Fixing deselect failing to change field title
2015-12-15 11:31:55 +00:00
Jake Bentvelzen
65d7398c63
Removed validation from LookupField as it's readonly and just gets in the way of saving data in certain cases
2015-12-15 18:00:57 +11:00
Damian Mooyman
37874936b5
Merge pull request #4848 from kinglozzer/optionsetfield-no-value
...
FIX: Allow omitting a value for OptionsetField submissions (fixes #4284 )
2015-12-15 15:12:07 +13:00
Damian Mooyman
d0b1084393
Merge pull request #4847 from kinglozzer/formfields-unshift
...
NEW: Implement unshift() in field list classes (closes #4834 )
2015-12-15 09:54:11 +13:00
Loz Calver
d6d3aa3554
Remove duplicate code
2015-12-14 16:50:34 +00:00
Loz Calver
d265c9b733
FIX: Allow omitting a value for OptionsetField submissions ( fixes #4824 )
2015-12-14 16:50:22 +00:00
Loz Calver
9467ab9a7e
NEW: Implement unshift() in field list classes ( closes #4834 )
2015-12-14 16:18:57 +00:00
scott1702
78190f213d
Update icon-button-group css
2015-12-11 18:20:33 +13:00
Mateusz Uzdowski
5a21b2fb15
BUG Guard against users being added to all groups on unsaved Group.
...
If ->Members()->add() is called on an unsaved group (with ID 0), the
collateFamilyIDs() will errorneously return all root Groups thinking
it's looking for Groups with ParentID=0. As a result, the Member will be
added to all root groups, instead of just the selected group and all its
children.
2015-12-11 14:51:51 +13:00
Ingo Schommer
9e2c429591
Merge pull request #4838 from tractorcow/pulls/3/changelog
...
Add changelog for 3.3.0
2015-12-11 08:38:13 +13:00
Daniel Hensby
9dabf15faa
Merge pull request #4826 from spekulatius/patch-1
...
DOCS fixing UploadField example
2015-12-10 15:07:11 +00:00
Damian Mooyman
22d8105a56
Add changelog for 3.3.0
2015-12-10 17:48:06 +13:00
Ingo Schommer
0175167761
Merge pull request #4830 from open-sausages/pulls/3/fix-querystring-stage
...
API Disable unauthenticated get parameter access to site stage mode
2015-12-10 10:44:43 +13:00
Hamish Friedlander
b2cb82097e
Merge pull request #4836 from open-sausages/pulls/fix-versioned-canviewstage
...
BUG Fix regression in canViewStage
2015-12-09 16:30:19 +13:00
Damian Mooyman
fa0160a874
BUG Fix regression in canViewStage
2015-12-09 14:53:21 +13:00
Hamish Friedlander
1eda9151a4
Merge pull request #4831 from open-sausages/pulls/3/fix-versioned-canview
...
API Create default security permission model for versioned data objects
2015-12-09 14:17:27 +13:00
Damian Mooyman
8368ba7960
Merge pull request #4818 from nyeholt/3
...
NEW Use Config for determining Vary header
2015-12-09 13:07:44 +13:00
Damian Mooyman
6089a7c5bd
API Create default security permission model for versioned data objects
2015-12-09 11:33:53 +13:00
Daniel Hensby
9353751131
Merge pull request #4829 from SilbinaryWolf/manifest-optimizations-v2
...
Optimization: Swapped is_array for faster casting compare, shaved ~4s off flushing on 3.2ghz i5 dual core system
2015-12-08 12:12:48 +00:00
Marcus Nyeholt
fc5e584201
Format for SS3 using tabs instead of spaces
2015-12-08 15:19:24 +11:00
Damian Mooyman
38e154af0a
API Disable get parameter access to site stage mode
...
BUG Fix missing and undocumented response from Security::permissionFailure()
2015-12-07 17:39:18 +13:00
Silbinary Wolf
63dddacba7
Optimization: Swapped is_array for faster casting compare, shaved ~4s off flushing on 3.2ghz i5 dual core system
2015-12-05 19:39:37 +11:00
Silbinary Wolf
2d6b8a50b1
Fixed bug where inheriting an abstract class broke scaffoldFormFields / fieldLabels(true)
2015-12-05 18:53:29 +11:00
Damian Mooyman
903d4838bb
Documentation on the release process
2015-12-04 15:09:58 +13:00
Peter Thaleikis
7db7140a70
fixing example
2015-12-04 11:14:02 +13:00
Nivanka Fonseka
411f168f00
parse the string to be converted to group codes.
...
Two fixes.
1. parse the group code by using Convert::raw2url() as it creates duplicate records if the group code is given in upper case letters, spaces etc.
2. assigning to the $_cache_groupByCode has to be really done in the if condition rather than out of it.
2015-12-02 10:01:25 +05:30
Marcus Nyeholt
f7c270a3ba
NEW Use Config for determining Vary header
...
Existing implementation hardcodes the Vary header; swap to using Config layer
instead
Added test for changing the variable from config
2015-12-02 10:28:24 +11:00
Loz Calver
c3544fdbea
Merge pull request #4799 from tractorcow/pulls/3.2/member-validate-visibility
...
BUG Revert method visibility regression
2015-11-27 09:29:14 +00:00
Damian Mooyman
1bc7297c8f
Merge branch 'pr/4797' into 3
2015-11-27 13:55:56 +13:00
Novusvetus
6266f909e0
API Increased Permission.Code db field to 255 characters
2015-11-27 13:54:37 +13:00
Damian Mooyman
94742fa3e2
BUG Revert method visibility regression
2015-11-27 13:10:52 +13:00
Daniel Hensby
d9c38aa3cf
Merge pull request #4787 from marijnkampf/patch-6
...
Fix Fatal error on invalid image
2015-11-25 14:25:15 +00:00
Marijn Kampf
006717a3cc
Fix Fatal error on invalid image
...
If user has uploaded an invalid image the original code would crash when called from template
2015-11-25 12:17:50 +00:00
Jonathon Menz
15ae37cf03
FIX Image_Cached record class name
...
Sanitise properties before updating
2015-11-24 10:49:31 -08:00
Jono Menz
fa68b4d4c5
Merge pull request #4785 from muskie9/docs/LinkingModes
...
DOCS update LinkingModes description
2015-11-23 19:51:03 -08:00
