Commit Graph

11895 Commits

Author SHA1 Message Date
ARNHOE
68141b6ca0 i18n documentation - added note for caching in multi language modules 2013-09-07 16:10:52 +02:00
Ingo Schommer
8864256601 Merge pull request #2391 from halkyon/orderby_limit_aggregate
BUG Fixing SQLQuery::aggregate() adding ORDER BY when no limit.
2013-09-06 02:21:30 -07:00
Sean Harvey
95bb799e6f BUG Fixing SQLQuery::aggregate() adding ORDER BY when no limit.
DataQuery::initialiseQuery() will add a default sort to a query,
and when calling up an aggregate it will make a query like this
which doesn't make sense:

SELECT MAX("LastEdited") FROM "Member" ORDER BY "ID"

In this case there is no need to add the ORDER BY, and it will
break databases like MSSQL in cases such as
GenericTemplateGlobalProvider
which provides a default List() function for adding aggregates
into SSViewer template cacheblocks.

If we add a limit, however, then it does make sense:

SELECT MAX("LastEdited") FROM "Member" ORDER BY "ID" LIMIT 10

This fixes SQLQuery::aggregate() to NOT add an ORDER BY to an
aggregate call if there is no limit.
2013-09-06 18:11:11 +12:00
Sean Harvey
e43ca931d6 Merge pull request #2343 from chillu/pulls/security-404
Returning 404 on /Security, instead of Controller.ss template
2013-09-05 18:56:23 -07:00
Ingo Schommer
ef2fc46eb2 Merge pull request #2386 from adrexia/tinymce-image-resize
BUG: Image resize allows skewing of image in IE (fixes CMS #791)
2013-09-05 04:08:06 -07:00
Ingo Schommer
9872a52a8d SecurityToken docs 2013-09-05 12:54:31 +02:00
Naomi Guyer
52ef14a9ec BUG: Image resize allows skewing of image in IE (fixes CMS #791)
Including this plugin seemed like the most complete solution to this
problem, and allows it to be removed when tinymce is upgraded (assuming
they have fixed this issue). Uses a compressed version of the
advimagescale fork from sourceforge
(http://sourceforge.net/p/tinymce/plugins/186/), as it allowed for
multiple tinymce instances.
2013-09-04 15:01:46 +12:00
Will Rossiter
daa0b3cb79 Merge pull request #2383 from ryanwachtl/patch-1
Update requirements.md
2013-09-02 23:20:36 -07:00
Ryan Wachtl
15a1d96e5b Update requirements.md
Missing semicolon in example code.
2013-09-03 01:18:58 -05:00
Ingo Schommer
1f84db1c54 Merge pull request #2357 from phptek/cms-access-checkbox-toggle
BUGFIX: CMS permissions checkbox won't untoggle once selected
2013-09-02 03:15:34 -07:00
Will Rossiter
0a795952b9 Merge pull request #2377 from phptek/issue/2375
UploadField showed 2 descriptions in CMS
2013-09-01 22:57:29 -07:00
Russell Michell
0f1ae7a00b BUGFIX:
- Fixes issue with CMS permissions checkbox, which won't un-toggle checked-checkboxes, after being clicked a 2nd time
2013-09-02 12:46:31 +12:00
Russell Michell
a1b04cb371 BUGFIX: Issue #2375
- UploadField showed 2 descriptions in CMS with one call to setDescription().
- Removed UploadField-specific template ref to $Description, in favour of using the "default" in FormField_holder.ss
2013-09-02 12:31:33 +12:00
Ingo Schommer
5f0329c6f2 Re-added entwine src/ in order to use inspector in dev mode 2013-08-30 10:12:50 +02:00
Ingo Schommer
93ea066f53 Remove TreeDropdownField placeholder support (see #2364)
It breaks the semantics of getValue(), leading to a broken field.
Regression from 8b5f89f. In the end, placeholder support is
considered "progressive enhancement", the search box should
be pretty obvious to IE8/IE9 users either way, given the main
field label is called "choose or search".
2013-08-30 09:50:07 +02:00
Ingo Schommer
20b49e215c Merge pull request #2136 from nedmas/fix-remove-export-button-padding
FIX: GridField button styling
2013-08-30 00:24:21 -07:00
Ingo Schommer
b2f207af30 Merge pull request #2223 from tractorcow/3.1-belongs_to-docs
Documentation for belongs_to
2013-08-29 16:34:37 -07:00
Damian Mooyman
55a7cf6040 Documentation for belongs_to 2013-08-30 10:47:11 +12:00
Ingo Schommer
4ff7b43c44 Merge pull request #2364 from adrexia/tree-dropdown-search
API: Treedropdownfield showsearch default true, provide better ui
2013-08-29 05:00:14 -07:00
Will Rossiter
cd8e643357 Merge pull request #2369 from PutmanMedia/pulls/paginatedlist-getvar
Only allow positive start values in PaginatedList
2013-08-29 02:10:56 -07:00
Naomi Guyer
8b5f89f3b9 API: Treedropdownfield showsearch default true, provide better ui
Set search option true on treedropdown fields by default, to provide a
fallback solution when trees fail to render (too many children errors)

Provide better indication/more meaningful styling to search (match
chosen styles for consistency)
2013-08-29 16:21:04 +12:00
Ingo Schommer
07db2e1fd1 Only allow positive start values in PaginatedList
Otherwise the ORM query will fail.
2013-08-28 17:34:40 +02:00
Ingo Schommer
eaa78b98b8 Merge pull request #2366 from johannesx75/Cached-Images-Path2
BUG Cached images stored in wrong folder
2013-08-28 06:48:49 -07:00
Ingo Schommer
f23526d08f Merge pull request #2362 from tazzydemon/3.1
Update ImagickBackend.php
2013-08-28 02:16:58 -07:00
Ingo Schommer
fad800550d Merge pull request #2360 from ARNHOE/3.1-debugzindex
FIX Make sure that debug always shows up first
2013-08-28 02:13:22 -07:00
Johannes Hammersen, x75
b8495da5d9 BUG Cached images stored in wrong folder
If multiple image manipulations are performend the resulting cached image is stored in assets/_resampled because the cached version of the image has no ParentID, which cacheFilename needs to set the correct path.
2013-08-26 10:16:42 +02:00
tazzydemon
ca2e7dad49 Update ImagickBackend.php 2013-08-25 11:37:00 +12:00
Will Rossiter
0ac9eff829 Fix typo in form method name. 2013-08-25 10:59:26 +12:00
Arno Poot
2df060e1be FIX Make sure that debug always shows up first 2013-08-24 12:14:11 +02:00
Mateusz Uzdowski
137aa53156 Return jQuery deferred object from LeftAndMain's loadFragment. 2013-08-23 09:39:38 +12:00
Ingo Schommer
b404e55533 Added link to translation CI 2013-08-22 18:02:02 +02:00
Ingo Schommer
eb311691be Fixed 3.1-specific switchToWindow() behat feature 2013-08-22 14:10:54 +02:00
Ingo Schommer
4a3a88710f Merge remote-tracking branch 'origin/3.1.0' into 3.1
Conflicts:
	dev/BehatFixtureFactory.php
	model/Hierarchy.php
	tests/behat/features/bootstrap/FeatureContext.php
	tests/core/CoreTest.php
2013-08-22 13:00:25 +02:00
Ingo Schommer
40c239076b Merge remote-tracking branch 'origin/3.0' into 3.1.0
Conflicts:
	model/Hierarchy.php
2013-08-22 12:55:47 +02:00
Ingo Schommer
54edc0ddac Fix Behat window switching in chrome
Workaround only, see https://groups.google.com/forum/#!topic/behat/QNhOuGHKEWI
2013-08-22 12:49:38 +02:00
Ingo Schommer
aa9403b5b0 Merge pull request #2352 from mateusz/loadfragment
API Provide a thin alternative to loadPanel/submitForm.
2013-08-22 01:15:42 -07:00
Mateusz Uzdowski
1f8feb5efc API Provide a thin alternative to loadPanel/submitForm.
This is needed in some situations when we only want to update a
small single component, sometimes even using a different controller to
the one implied in the URL.

An example here is reloading dynamically the subsite dropdown without
reloading the entire page, updating a filter sidebar or suchlike.
2013-08-22 15:16:13 +12:00
Ingo Schommer
0c859b8587 Merge pull request #2348 from simonwelsh/scrut
Scrutinizer fixes
2013-08-21 04:43:12 -07:00
Simon Welsh
c66cc952d2 Correct line length and indentation 2013-08-21 21:27:16 +12:00
Simon Welsh
2c0d03b2d6 Exclude docs and images foldes from Scrutinizer 2013-08-21 21:02:12 +12:00
Simon Welsh
4cb98f1afd Only have Scrutinizer check PHP files 2013-08-21 21:02:12 +12:00
Ingo Schommer
4af619e5a0 Merge pull request #2347 from simonwelsh/3.1
Scrutinizer fixes
2013-08-21 01:22:36 -07:00
Simon Welsh
151baeede1 Correct line length and indentation 2013-08-21 18:54:05 +12:00
Simon Welsh
ba6fde6816 Exclude docs and images foldes from Scrutinizer 2013-08-21 18:53:58 +12:00
Simon Welsh
4db6520357 Only have Scrutinizer check PHP files 2013-08-21 17:57:31 +12:00
Sean Harvey
abe09c79e5 Merge branch '3.1.0' into 3.1 2013-08-21 10:39:27 +12:00
Sean Harvey
c461ed51d6 Merge pull request #2346 from hafriedlander/fix/flush_when_secure
FIX flush when secure
2013-08-20 15:35:00 -07:00
Hamish Friedlander
a2026add04 FIX flushing on non-dev when Session::cookie_secure is true 2013-08-21 09:50:07 +12:00
Mateusz U
afd3e3f0d0 Merge pull request #2345 from hafriedlander/fix/performance
Couple of performance fixes - eliminate un-necessary redraws and preview updating
2013-08-20 14:40:22 -07:00
Hamish Friedlander
0ca4969cda FIX Dont update preview iframe if hidden
Updating the iframe src when the iframe isnt visible in IE8 causes a
view disconcerting font glitch (and it slows down navigation anyway),
so if the iframe isnt visible, delay setting the src until it is
2013-08-21 09:29:28 +12:00