Commit Graph

11396 Commits

Author SHA1 Message Date
Andrew Short
ceb7e3c8a8 Merge pull request #1352 from chillu/pulls/postgres-fixes
Postgres fixes
2013-04-03 03:50:08 -07:00
Ingo Schommer
6d5925708e FIX Empty fields on SQLQuery->aggregate() with alias
Breaks Postgres otherwise, because it produces a
"SELECT *, <field> ... " statement without putting all
fields into the GROUP BY.
2013-04-03 12:22:12 +02:00
Ingo Schommer
2bc273e2a8 Consistently quote DataObject::$default_sort
Strictly speaking, no longer required since we auto-quote simple
field names in DataQuery now, but since the majority of sorts in core is
already quoted we should stay consistent.
2013-04-03 12:11:53 +02:00
Ingo Schommer
5a8a067ae8 FIX Consistently quote orderby in DataQuery->ensureSelectContainsOrderbyColumns()
Otherwise aggregate queries through DataQuery->column() fail unless the
passed in field is specifically quoted already. This fixes ManyManyListTest->testRemoveAll()
2013-04-03 12:11:53 +02:00
Ingo Schommer
fb5ef0293e Clearer docs on where SQL strings are expected to be escaped already
Also quoted some phpdoc examples, to avoid them failing by default on
stricter DB drivers like Postgres
2013-04-03 12:11:53 +02:00
Ingo Schommer
e9d55fcaf9 Correctly quote SQL in SQLQueryTest (fixes Postgresql) 2013-04-03 12:11:52 +02:00
Ingo Schommer
ff3b63f2a9 FIX Remove unnecessary DISTINCT from ManyManyList->removeAll()
Breaks Postgres if the innermost query has an ORDER BY statement as well
2013-04-03 12:11:50 +02:00
Ingo Schommer
2da1de07da Merge pull request #1359 from halkyon/forcessl_alternate_base_url
NEW Allow specifying an alternate domain to Director::forceSSL()
2013-04-03 01:58:28 -07:00
Ingo Schommer
f44d5b311e Added *.gpx and *.kml to allowed_extensions (fixes installer/#33)
Also sorted exensions alphabetically
2013-04-03 10:52:00 +02:00
Ingo Schommer
b9f628146a Fixed query quoting in SQLQueryTest 2013-04-03 10:48:55 +02:00
Sean Harvey
6eda25a090 NEW Allow specifying the secure domain to Director::forceSSL() 2013-04-03 17:47:36 +13:00
Andrew Short
120d90fd21 Merge pull request #1357 from jedateach/patch-2
Update environment-management.md
2013-04-02 20:19:59 -07:00
Andrew Short
ef0d3fc13a Merge pull request #1356 from jedateach/patch-1
Update composer.md
2013-04-02 20:18:31 -07:00
Sean Harvey
a99c829ed1 Ensure composer files aren't accessible using IIS 2013-04-03 15:59:14 +13:00
Jeremy Shipman
a57e4e8abe Update environment-management.md
Fixed "Available Constants" table at the bottom
2013-04-03 15:29:27 +13:00
Jeremy Shipman
f88fcec2a4 Update composer.md
Fixed small typos
2013-04-03 15:16:35 +13:00
Joseph Madden
df4d7428fa FIX Saving of custom meta tags (fixes #8288)
This should allow custom meta tags to be saved in the admin panel.

Also, if you use html5 video or audio the source sub tag
would have been stripped two these are all the tags that may be empty
and are valid.
2013-04-02 12:02:56 +02:00
Ingo Schommer
f0d92f7bcc Merge pull request #1094 from silverstripe-big-o/pulls/3.1-versioned-relfield
BUGFIX Versioned_Version->relField()
2013-04-02 02:49:27 -07:00
Ingo Schommer
ebca1a64ed Merge pull request #1299 from silverstripe/user-specific-temp-folder
NEW: Move temp data into a user-specific subfolder, to stop temp-permission bugs from occurring.
2013-04-02 02:44:53 -07:00
Ingo Schommer
47e02216fa Merge pull request #1342 from chillu/pulls/i18n-common-languages
API i18n::$common_languages and i18n::$common_locales converted to Confi...
2013-04-02 02:44:06 -07:00
Ingo Schommer
0b54b284bc Updated i18n docs 2013-04-02 11:43:36 +02:00
Nik Rolls
5143c8149a Form now loads correctly when ClassName is changed. 2013-04-02 11:03:49 +02:00
Ingo Schommer
ef3d974821 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/issues.md
2013-04-02 02:05:58 +02:00
Ingo Schommer
c08ab18c03 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	.travis.yml
	admin/javascript/LeftAndMain.AddForm.js
	docs/en/reference/requirements.md
2013-04-02 02:00:50 +02:00
Ingo Schommer
f5754c11aa Contribution guidelines, new bugtracker links 2013-04-02 01:51:40 +02:00
Ingo Schommer
1b83e489ef Updated bugtracker links 2013-04-02 01:19:28 +02:00
Andrew Short
cc5cfed1e5 Merge pull request #1346 from ajshort/pulls/tab-panel-padding
Include padding on padded edit form panels inside a tabset
2013-03-30 04:16:54 -07:00
Ingo Schommer
94ea56b604 Merge pull request #1349 from ajshort/pulls/urlsegment-filter-dots
API: Don't allow dots in URL segments
2013-03-30 02:30:20 -07:00
Ingo Schommer
41039cc8d3 Merge pull request #1348 from danrye/patch-3
Minor: Update "Editing Online"
2013-03-30 02:21:21 -07:00
Andrew Short
5ec85d06f6 API: Don't allow dots in URL segments 2013-03-30 19:47:17 +11:00
Dan
9b056456a1 Minor: Update "Editing Online"
Adding emphasis to the "Edit this page" feature, and ensuring it comes before the more difficult option of locating the .md file manually.
2013-03-30 03:03:50 -03:00
Ingo Schommer
afb8465d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
2013-03-29 17:37:19 +01:00
Stig Lindqvist
3aced1151f BUG: GridFieldFilterHeader only filters on last filter
GridFieldFilterHeader only filters on the last filter argument because it keeps recloning the original datalist
2013-03-29 20:06:57 +13:00
Ingo Schommer
9ed8eba253 Simplified travis builds (using external script) 2013-03-28 23:49:32 +01:00
Ingo Schommer
b90eafaf14 More straightfoward travis include/exclude 2013-03-28 23:06:30 +01:00
Ingo Schommer
3ff103a04c More straightfoward travis include/exclude 2013-03-28 22:53:55 +01:00
Ingo Schommer
4da85dc734 Simplified travis builds (external setup scripts) 2013-03-28 22:39:37 +01:00
Ingo Schommer
31f5e00a56 Simplified travis builds (external setup scripts) 2013-03-28 22:24:03 +01:00
g4b0
f033321adc Solved json obj to array issue 2013-03-28 22:06:37 +01:00
Andrew Short
10f46ba08e Include padding on padded edit form panels inside a tabset 2013-03-29 02:23:43 +11:00
Ingo Schommer
ace7c04b9e Merge pull request #1345 from ajshort/pulls/modeladmin-tabs
FIX: Set ModelAdmin tab targets to avoid creating new panels
2013-03-28 07:56:17 -07:00
Andrew Short
f2b4b95350 FIX: Set ModelAdmin tab targets to avoid creating new panels 2013-03-29 01:41:31 +11:00
Ingo Schommer
05181fce78 Merge pull request #1344 from g4b0/8330-cache-issue-in-CMSVersion
Solved json obj to array issue
2013-03-28 06:54:12 -07:00
g4b0
93428bd8f2 Solved json obj to array issue 2013-03-28 14:52:13 +01:00
Ingo Schommer
469eaee4c1 Fixed i18n.common_locales definitions 2013-03-28 09:04:36 +01:00
Andrew Short
93578c8d22 Remove incorrectly added diff file 2013-03-28 08:15:36 +11:00
Ingo Schommer
3c30c36b71 Fixed help_link config usage 2013-03-27 21:48:55 +01:00
Ingo Schommer
e97c034922 API i18n::$common_languages and i18n::$common_locales converted to Config API
They are now accessed via the Config API, and contain associative rather than indexed arrays.
Before: `array('de_DE' => array('German', 'Deutsch'))`, after: `array('de_DE' => array('name' => 'German', 'native' => 'Deutsch'))`.

Also fixed a i18n.js_i18n config accessor
2013-03-27 20:42:46 +01:00
Ingo Schommer
c1a543feb2 Merge pull request #1341 from g4b0/8347-getFieldsForImage
BUGFIX: fixed access to asset_preview_width in getFieldsForImage
2013-03-27 12:02:23 -07:00
g4b0
c63d840561 BUGFIX: fixed access to asset_preview_width in getFieldsForImage 2013-03-27 17:52:40 +01:00