Commit Graph

15387 Commits

Author SHA1 Message Date
Ingo Schommer
ce1a069885 Clarify RC wording in release docs
An RC is technically only one of a few "pre-release" labels (alpha, beta, rc)
2016-01-05 11:27:45 +13:00
Ingo Schommer
7c3fd7de13 Note required commands in release docs 2016-01-05 11:27:45 +13:00
scott1702
b64d73dcbf color updates to meet contrast requirements 2016-01-05 11:20:30 +13:00
Damian Mooyman
df297b28b4 Merge pull request #4874 from christopherdarling/patch-7
DOCS: fixed 3.2.0 changelog DataList code sample
2016-01-05 10:10:53 +13:00
Stephan Bauer
95e96fa2b2 BUG jquery.jstree patched to improve drag-and-drop handling (fixes #4881) 2016-01-03 23:20:22 +01:00
Gordon Anderson
f61cedc03c Update to 00_Unit_Testing
Additional section with instructions on running tests using in memory SQLite,
2015-12-30 13:29:32 +07:00
Christopher Darling
ef4a75ad43 DOCS: fixed 3.2.0 changelog DataList code sample 2015-12-23 13:13:32 +00:00
Sam Minnée
751264fd6a Merge pull request #4871 from tractorcow/pulls/3.2/better-release-instructions
Improve release process instructions
2015-12-23 16:50:46 +13:00
Damian Mooyman
0dfa8ca7b2 Improve release process instructions 2015-12-23 16:45:34 +13:00
Damian Mooyman
5507ce89c6 Copy upgrade notes from 3.3.0.md 2015-12-23 14:12:02 +13:00
Damian Mooyman
70bb3d92c7 Added 3.3.0-beta1 changelog 2015-12-23 13:38:55 +13:00
Damian Mooyman
952896e638 Update translations 2015-12-23 13:22:38 +13:00
Damian Mooyman
4d2340a392 Merge pull request #4868 from kinglozzer/4854-i18n-meta
FIX: Get locale from <html> element for i18n.js (fixes #4854)
2015-12-23 10:27:32 +13:00
Loz Calver
706877d72e FIX: Get locale from <html> element for i18n.js (fixes #4854) 2015-12-22 14:14:17 +00:00
Sam Minnée
ea5f72c176 Merge pull request #4867 from tractorcow/pulls/3/merge-bugs
BUG Workaround for issues in testing versioned
2015-12-22 18:40:16 +13:00
Damian Mooyman
fce82519bd BUG Workaround for issues in testing version 2015-12-22 17:47:53 +13:00
Damian Mooyman
19b10044ec Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 17:05:07 +13:00
Damian Mooyman
6ac83f02c9 Merge pull request #4819 from SilverStripers/3
parse the string to be converted to group codes.
2015-12-22 16:53:31 +13:00
Damian Mooyman
5dbb9c1da0 Merge branch 'pr/4499' into 3 2015-12-22 16:50:22 +13:00
jpvdpoel
0d9080097e Adding nl_BE and fr_BE as common_locales 2015-12-22 16:49:43 +13:00
Damian Mooyman
959c84cf6f Merge pull request #4827 from SilbinaryWolf/fix-fieldLabels-abstract-class-bug
Fixed bug where inheriting an abstract class broke scaffoldFormFields / fieldLabels(true)
2015-12-22 16:42:54 +13:00
Damian Mooyman
d63441623a Merge pull request #4612 from johndalangin/patch-4
Added cookie_secure configuration directive
2015-12-22 16:36:05 +13:00
Damian Mooyman
66b3a6a2c5 Merge pull request #4840 from mateusz/guard
BUG Guard against users being added to all groups on unsaved Group.
2015-12-22 16:29:09 +13:00
Damian Mooyman
b38f316a80 Merge pull request #4851 from SilbinaryWolf/remove-validation-from-lookupfield
BUG Resolve issue with readonly LookupField failing validation
2015-12-22 16:28:01 +13:00
Damian Mooyman
9f7eff1128 Merge pull request #4866 from nickspiel/patch-1
Fixing link to themes page
2015-12-22 16:26:12 +13:00
Damian Mooyman
9fcca5c7e2 Merge pull request #4842 from open-sausages/icon-tabs
Update icon-button-group css
2015-12-22 16:20:38 +13:00
Damian Mooyman
3bc44d271e Merge pull request #4864 from robpetreski/patch-2
Updated RestfulService to include PATCH
2015-12-22 14:54:01 +13:00
Damian Mooyman
4e3d6f9118 Fix merge regressions from 3.2 -> 3 2015-12-22 14:35:05 +13:00
Nick Spiel
8c49cff71e Fixing link to themes page
The link to the themes page was broken.
2015-12-22 12:30:20 +11:00
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