Daniel Hensby
2a3768266e
Merge branch '3.3' into 3.4
2016-10-27 16:15:43 +01:00
Daniel Hensby
a97ebf93de
Merge branch '3.2' into 3.3
2016-10-27 16:15:10 +01:00
Daniel Hensby
5f4f07a256
Merge branch '3.1' into 3.2
2016-10-27 16:14:01 +01:00
Loz Calver
68866ad31f
Merge pull request #6238 from nfauchelle/patch-2
...
Remove double quotes so example is not parsed.
2016-10-27 09:05:36 +01:00
Nick
d1c29d6595
Remove double quotes so example is not parsed.
...
[Notice] Undefined variable: map
Since it's using double quotes it tries to process $map, $key and $value
2016-10-27 09:06:11 +13:00
zauberfisch
c4aed0c081
Added $showSearchForm to ModelAdmin
2016-10-26 11:35:52 +00:00
Matthew Hailwood
7778357b03
Switch Mandrill recommendation to sparkpost. ( #6196 )
...
Now that Mandrill has become a paid part of Campaign Monitor it makes sense for us to recommend the free alternative SparkPost.
The package I've linked to is by the same author as the original Mandrill package.
2016-10-25 13:26:56 +13:00
Nicola Fontana
4d327f81fd
DOCS Specify that the selectors change the scope ( #6213 )
...
Follow up of issue #4015 .
2016-10-21 09:15:27 -07:00
Damian Mooyman
0f8f9f2732
Merge pull request #6199 from jonom/fix-ambiguous-field
...
FIX Ambiguous column SQL error
2016-10-19 17:57:32 +13:00
Jonathon Menz
b0445f72e4
FIX Ambiguous column SQL error
...
Specify the table for the field we’re fetching, in case a joined table has a field with the same name
2016-10-18 21:35:37 -07:00
Daniel Hensby
9a6121c867
Merge branch '3.4' into 3
2016-10-16 22:56:37 +01:00
Daniel Hensby
66e6b016c0
Merge pull request #6181 from jonom/docs-additions
...
Docs additions
2016-10-16 14:17:04 +01:00
Jonathon Menz
d2c0b98bc5
DOCS Clarify nested cache block restrictions
...
Fixes #6078
2016-10-13 14:52:41 -07:00
Jonathon Menz
646d34ec48
DOCS Non-extendable classes
...
Closes #6129
2016-10-13 09:39:46 -07:00
Jonathon Menz
bfdac2b7b6
DOCS Template debugging
2016-10-13 09:39:10 -07:00
Jonathon Menz
e9a75a54d9
DOCS Partial caching of relationships
...
Fixes #6177
2016-10-13 09:38:49 -07:00
Jonathon Menz
a893e2aa0f
DOCS How to increase partial cache expiry
...
Closes #3649
2016-10-13 09:37:52 -07:00
Damian Mooyman
7aa257594f
Merge pull request #3935 from dhensby/pulls/bigint-support
...
Added MySQL support for Bigint.
2016-10-12 10:20:45 +13:00
Daniel Hensby
4c7ba731be
Merge branch 'open-sausages/pulls/3.4/fix-checkbox-datalist' into 3.4
2016-10-11 20:16:33 +01:00
Damian Mooyman
7368deca8f
BUG Fix issue with SS_List as datasource for dropdown field
...
BUG Fix validation issue with CheckboxSetField
Fixes #6166
2016-10-11 14:58:48 +13:00
Daniel Hensby
5580100ade
Merge pull request #6157 from madmatt/patch-2
...
Make __call() clearer that a method may be non-public
2016-10-07 12:40:48 +01:00
Matt Peel
5a2591ec7d
Make __call() clearer that a method may be non-public
...
Resolves #6151
2016-10-06 14:01:38 +13:00
Daniel Hensby
420cbadaac
Merge pull request #6149 from jonom/sort-fix-2
...
FIX Revert natural sort
2016-10-04 23:43:10 +01:00
Damian Mooyman
17c6580d3a
Merge pull request #6138 from dhensby/pulls/3.4/fix-sessions-on-alternate-base-urls
...
FIX Absolute alternate_base_url no longer breaks session cookies
2016-10-05 11:26:27 +13:00
Jonathon Menz
797be6ac82
FIX Revert natural sort
...
More backwards compatible and more consistent with ORM sorting (fixes #6124 )
2016-10-04 13:56:12 -07:00
Daniel Hensby
6dde5ce571
FIX Absolute alternate_base_url no longer breaks session cookies
2016-10-04 14:21:32 +01:00
Daniel Hensby
111ab5f0af
Merge pull request #6137 from lekoala/patch-4
...
Have a clear error message
2016-10-04 14:13:00 +01:00
Thomas Portelange
3d8db488d4
Have a clear error message
...
Because it's really annoying not knowing which field causes the error
2016-10-04 12:24:29 +02:00
Loz Calver
f1894b9712
Merge pull request #6132 from jonom/docs-template-global-provider
...
DOCS Introduce TemplateGlobalProvider
2016-10-04 09:03:52 +01:00
Jonathon Menz
24f8f2715c
DOCS Introduce TemplateGlobalProvider
2016-10-03 09:36:47 -07:00
Daniel Hensby
5e9d16646d
Merge branch '3.4' into 3
2016-10-03 10:24:32 +01:00
Daniel Hensby
f2d3026e93
Merge pull request #3628 from JeremyRoundill/3.1
2016-09-30 17:16:47 +01:00
Stephan van Diepen
95b66d19b2
Added MySQL support for Bigint.
...
Conflicts:
model/MySQLDatabase.php
2016-09-30 16:38:25 +01:00
Anton Smith
ae4108bf00
BUG Content-Disposition header breaks in Firefox ( #4087 )
2016-09-29 13:25:14 +13:00
jeffreyguo
801574b9b0
Update index.md ( #4020 )
...
MINOR: wording correction
2016-09-29 13:21:17 +13:00
Ingo Schommer
53501c73bc
Merge pull request #5909 from timkung/tabset-opentabfromurl-fix
...
Fixing TabSet.js error when expected elements are not available
2016-09-26 17:14:04 +13:00
Andrew Aitken-Fincham
ad0d68d133
add IPUtils.php to control and implement symfony IpUtils ( #6062 )
2016-09-26 12:44:55 +13:00
Daniel Hensby
6022012481
Merge branch '3.4' into 3
2016-09-23 16:33:45 +01:00
Will Rossiter
796ca2171d
Merge pull request #6044 from jsirish/patch-1
...
Docs - sort by random instructions
2016-09-21 07:46:18 +12:00
Jason Irish
dcc51ec479
Docs - sort by random instructions
...
Added instructions for sorting per database type. `RAND()` throws errors in PostgreSQL and SQLite
2016-09-20 14:16:22 -05:00
Daniel Hensby
32d1856d40
FIX Debug::caller() will now handle errors from outside function calls ( #6029 )
2016-09-20 09:03:22 +12:00
Daniel Hensby
e93a376332
Merge pull request #6025 from tony13tv/patch-3
...
FIX: Frontend UploadField wouldn't call ssdialog
2016-09-19 11:31:01 +01:00
Cristian Torres
d2d770c6fb
FIX: Frontend UploadField wouldn't call ssdialog
...
As in front end jQuery would be redefined by users custom version. Also the script should use the scope variable ```$``` as it represents the instance of jQuery with all the requirements loaded.
2016-09-18 19:37:44 -06:00
Daniel Hensby
cb2352548d
Merge branch '3.4' into 3
2016-09-16 14:22:31 +01:00
Daniel Hensby
71cc5d83e6
Revert "Merge remote-tracking branch '3Dgoo/patch-1' into 3.4"
...
This reverts commit e617042422995d07756d
2016-09-16 14:21:16 +01:00
Daniel Hensby
beeed8155a
Merge branch '3.4' into 3
2016-09-16 11:56:01 +01:00
Daniel Hensby
e617042422
Merge remote-tracking branch '3Dgoo/patch-1' into 3.4
2016-09-16 11:50:24 +01:00
Damian Mooyman
b87c668bf4
API support dblib ( #5996 )
2016-09-16 11:39:29 +12:00
Thomas Portelange
995d07756d
cache currentUser query ( #6007 )
...
* cache currentUser query
Various modules can call a lot of time Member::currentUser(). We can avoid querying the database multiple times. Cache is implemented as a static array inside the method and store the data byID, in case the currentUserID changes within the same request (not very likely, but..)
2016-09-15 15:45:40 +01:00
3Dgoo
cd8904e045
Fixing button destroy bug
...
When you want to add a button to the CMS but don't want LeftAndMain to apply jQuery UI button to it we add the `data-button="true"` attribute to our button.
The `onadd` function checks that this attribute does not exist before calling `this.button()`.
The `onremove` incorrectly checks that this attribute does exist before calling `this.button('destroy')`. This should be checking that this attribute does not exist, just like the `onadd` function.
What this causes is when you have a button with the `data-button` attribute a button is not created, but when you leave the page `destory` gets called on an item which doesn't exist. We end up with the following error:
> Uncaught Error: cannot call methods on button prior to initialization; attempted to call method 'destroy'
The other issue with this logic is buttons are never getting destroyed when `onremove` is called.
The whole issue is caused by a missing `!` in the if statement. This change adds it in to fix the problem.
2016-09-15 08:23:22 +09:30
