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
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
Daniel Hensby
f2d3026e93
Merge pull request #3628 from JeremyRoundill/3.1
2016-09-30 17:16:47 +01:00
Anton Smith
ae4108bf00
BUG Content-Disposition header breaks in Firefox ( #4087 )
2016-09-29 13:25:14 +13: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
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
e617042422
Merge remote-tracking branch '3Dgoo/patch-1' into 3.4
2016-09-16 11:50:24 +01: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
Daniel Hensby
8c23b67b9f
Merge branch '3.3' into 3.4
2016-09-14 11:39:49 +01:00
Daniel Hensby
64de2223f8
Merge branch '3.2' into 3.3
2016-09-14 11:39:28 +01:00
Daniel Hensby
90a01870ea
Merge branch '3.1' into 3.2
2016-09-14 11:39:00 +01:00
Damian Mooyman
014d6db8d8
Merge pull request #5989 from dhensby/pulls/3.1/fix-sake-lf
...
FIX Force line endings to LF on sake file
2016-09-14 10:21:41 +12:00
Damian Mooyman
360d3bc331
Merge pull request #5988 from dhensby/pulls/many-many-fixture-fix
...
API Allow has_many fixtures to be declared with array format as well …
2016-09-14 09:57:56 +12:00
Ingo Schommer
23f764f8b0
Merge pull request #5991 from dhensby/docs/3.4/composer-install-docs
...
Docs/3.4/composer install docs
2016-09-13 07:50:24 +12:00
Daniel Hensby
e3ac75febd
DOCS Reference composer docs for installation instructions
2016-09-12 17:04:20 +01:00
Daniel Hensby
a14df0bc2d
FIX Force line endings to LF on sake file
2016-09-12 14:15:07 +01:00
Damian Mooyman
c6457c50e9
API Allow has_many fixtures to be declared with array format as well as many_many ( #5944 )
...
BUG Fix issue with parsing of extrafields in fixtures
BUG Fix issue in duplicate relation name, and ensure FixtureBlueprint fails on these
2016-09-12 14:01:08 +01:00
Daniel Hensby
5959419645
Merge branch '3.3' into 3.4
2016-09-07 09:21:50 +01:00
Daniel Hensby
b80dc6450a
Merge branch '3.2' into 3.3
2016-09-07 09:21:21 +01:00
Damian Mooyman
9455ced41a
Merge pull request #5959 from dhensby/pulls/3.2/bad-strpos-fix
...
FIX Bad strpos call in HTTP::register_etag()
2016-09-07 12:05:57 +12:00
Daniel Hensby
e7ecf6cf15
FIX Bad strpos call in HTTP::register_etag()
2016-09-06 23:32:57 +01:00
Damian Mooyman
a68dfd1016
Merge pull request #5937 from dhensby/pulls/3.4/fix-empty-dmyfields-validation
...
FIX Empty dmyfields on DateField now validate as true
2016-09-02 09:01:39 +12:00
Daniel Hensby
f2ed59e185
FIX Empty dmyfields on DateField now validate as true
2016-09-01 11:55:17 +01:00
Ingo Schommer
1a8348900d
Merge pull request #5899 from christopherdarling/patch-7
...
DOCS add missing commit af3412a
2016-09-01 08:17:16 +12:00
Daniel Hensby
060bf6b327
Merge branch '3.3' into 3.4
2016-08-22 16:22:37 +01:00
Daniel Hensby
088d88e978
Merge branch '3.2' into 3.3
2016-08-22 16:22:02 +01:00
Daniel Hensby
f4a6e9e517
Merge branch '3.1' into 3.2
2016-08-22 15:30:03 +01:00
Loz Calver
0f3eabcf03
Merge pull request #5902 from dhensby/pulls/relation-list-cleanup
...
Cleanup of RelationList, HasManyList and ManyManyList
2016-08-22 14:27:29 +01:00
Loz Calver
c8f49045dc
Merge pull request #5903 from dhensby/pulls/3.2/fix-bad-arraylist-sort
...
FIX ArrayList sorting now caseinsensitive
2016-08-22 14:27:10 +01:00
Daniel Hensby
229a2b9217
Merge pull request #4133 from nimeso/patch-1
2016-08-22 11:52:47 +01:00
Daniel Hensby
4998b80445
FIX ArrayList sorting now caseinsensitive
2016-08-22 11:21:50 +01:00
Daniel Hensby
8e4e2b4fa8
Merge pull request #4173 from AntonyThorpe/patch-4
...
DOCS Update 06_Tabbed_Forms.md
2016-08-19 15:49:51 +01:00
Daniel Hensby
8737ddefba
Cleanup of RelationList, HasManyList and ManyManyList
2016-08-19 10:37:58 +01:00
