Daniel Hensby
|
066dff4123
|
Merge pull request #4890 from spekulatius/patch-1
DOCS fixing typo
|
2016-01-05 14:35:17 +03:00 |
|
Peter Thaleikis
|
45dc510da7
|
fixing typo
|
2016-01-06 00:33:22 +13:00 |
|
Daniel Hensby
|
4335d8ed22
|
FIX Members with no ID inherit logged in user permission
|
2016-01-05 08:16:18 +00:00 |
|
Ingo Schommer
|
70897834c9
|
Corrected release docs merge pipeline
|
2016-01-05 14:08:49 +13:00 |
|
Damian Mooyman
|
4d3f709bff
|
Merge pull request #4885 from scott1702/fix-contrast
color updates to meet contrast requirements
|
2016-01-05 13:34:29 +13:00 |
|
Sam Minnée
|
9644c01178
|
Merge pull request #4886 from chillu/pulls/release-process-docs-changes
Release process docs changes
|
2016-01-05 11:36:42 +13:00 |
|
Ingo Schommer
|
90837d4aa2
|
Release docs: Mention IRC, Behat and milestones
|
2016-01-05 11:27:46 +13:00 |
|
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
|
bb09340605
|
Merge pull request #4876 from SilbinaryWolf/remove-validation-from-lookupfield
Added unit test to ensure LookupField can't save into a DataObject
|
2016-01-05 10:18:36 +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 |
|
Damian Mooyman
|
ad9d293122
|
Merge pull request #4872 from powtac/3
Typo
|
2016-01-05 09:54:37 +13:00 |
|
Daniel Hensby
|
5470f23e2f
|
Merge pull request #4873 from xini/fix-compositefield-extraclass
FIX extraClass() method to match parent method
|
2016-01-04 20:32:53 +00: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 |
|
Jake Ben
|
c07dcaa3af
|
Added unit test to ensure LookupField can't save into a DataObject
|
2015-12-24 14:30:50 +11:00 |
|
Christopher Darling
|
ef4a75ad43
|
DOCS: fixed 3.2.0 changelog DataList code sample
|
2015-12-23 13:13:32 +00:00 |
|
Florian Thoma
|
e94c0fa221
|
FIX extraClass() method to match parent method
|
2015-12-23 21:06:00 +11:00 |
|
Simon Brüchner
|
7ec09b5fde
|
Typo
|
2015-12-23 09:32:26 +01: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
|
b987b5d5da
|
Merge remote-tracking branch 'origin/3.3' into 3
|
2015-12-23 14:33:16 +13:00 |
|
Damian Mooyman
|
1466a9cd84
|
Alias 3 branch as 3.4
|
2015-12-23 14:22:41 +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
|
a9efe4d253
|
Merge pull request #4865 from jacobbuck/empty_x_include_headers
BUG Change Requirements::include_in_response() to not add empty 'X-Include-JS' or 'X-Include-CSS' headers
|
2015-12-22 14:45:02 +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 |
|
Jacob Buck
|
b6627a2f7c
|
BUG Change Requirements::include_in_response() to not add empty
'X-Include-JS' or 'X-Include-CSS' headers.
|
2015-12-22 13:58:07 +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 |
|