Commit Graph

11074 Commits

Author SHA1 Message Date
Will Rossiter
d04ead65b8 Merge pull request #1340 from chillu/pulls/theme-enabled
API Replaced SSViewer.custom_theme with SSViewer.theme_enabled
2013-04-08 00:27:56 -07:00
Ingo Schommer
7121fc3f85 FIX Config isolation in Director::test() 2013-04-07 23:59:10 +02:00
Ingo Schommer
828ac7fe4f API Replaced SSViewer.custom_theme with SSViewer.theme_enabled
Since we can't influence the setting of configuration values,
we also can't set/unset the 'custom_theme' value based on which
theme is set. This means the 'custom_theme' value goes stale,
and we can't rely on it e.g. in FilesystemPublisher.

The 'theme_enabled' toggle is a cleaner solution to the same problem,
since the 'custom_theme' was really just a way to remember the original
theme, while still disabling it. The toggle makes this more explicit,
but also requires users of the 'theme' setting to check for it.
2013-04-07 23:59:10 +02:00
Ingo Schommer
fb17f43878 Merge pull request #1733 from wilr/open6270
FIX: nested SelectionGroups should only hide first level
2013-04-07 05:36:05 -07:00
Will Rossiter
7881f60298 FIX: nested SelectionGroups should only hide first level 2013-04-07 15:13:50 +12:00
Ingo Schommer
700453b7dc Merge pull request #1731 from wilr/open5551
FIX: Decimal field change detection.
2013-04-06 04:32:27 -07:00
Ingo Schommer
e2b42ca4c2 Fixed Versioned hook regression
Introduced by 5238e9cf48
2013-04-06 12:24:57 +02:00
Ingo Schommer
667711609b Merge pull request #1725 from s-m/templater-parser-files-sync
Sync template-parser files
2013-04-06 03:22:17 -07:00
Will Rossiter
e619329dc3 FIX: Decimal field change detection. 2013-04-06 23:20:28 +13:00
Ingo Schommer
5c82efd61d Merge pull request #1729 from ajshort/no-rule-match-404
API: Return a 404 error when no director rule is matched
2013-04-06 03:09:48 -07:00
Ingo Schommer
ff2977eee3 Merge pull request #1730 from wilr/open5489
API: add onBeforeRollback() and onAfterRollback() hooks.
2013-04-06 03:08:02 -07:00
Will Rossiter
5238e9cf48 API: add onBeforeRollback() and onAfterRollback() hooks. 2013-04-06 22:59:33 +13:00
Andrew Short
1fc780ce2b API: Return a 404 error when no director rule is matched 2013-04-06 18:19:03 +11:00
Simon Welsh
7871e5a85e Merge pull request #1727 from wilr/open6079
FIX: remove_extension should work on parameterized extensions
2013-04-05 23:30:30 -07:00
Will Rossiter
1427a0637b FIX: remove_extension should work on parameterized extensions 2013-04-06 19:29:03 +13:00
Simon Welsh
77514204ee Merge pull request #1728 from wilr/open6445
FIX: Ensure FieldList::push() doesn't eliminate key
2013-04-05 23:25:52 -07:00
Will Rossiter
69722222b4 FIX: Ensure FieldList::push() doesn't eliminate key 2013-04-06 19:16:59 +13:00
Will Rossiter
b25eda83c4 Remove reference to /images/flush.
Now a BuildTask. See /dev/tasks
2013-04-06 18:13:18 +13:00
s-m
14de34cb9b Sync template-parser files
The template-parser files were not in sync, there were some lines added
in SSTemplateParser.php from 3334eafcb1
and 0a9f3b75a9 , I readded those parts
into the SSTemplateParser-include-file and recreated the
SSTemplateParser.php to get to a synced state...
2013-04-05 19:12:54 +02:00
Ingo Schommer
1dda9ae45f Fixed extra_requirements docs 2013-04-05 15:35:30 +02:00
Ingo Schommer
bc6f18849f Merge pull request #1719 from wilr/open5793
API: Move LimitWordCount() to Varchar
2013-04-05 03:03:09 -07:00
Will Rossiter
05d4dd863d Update controller.md 2013-04-05 22:17:11 +13:00
Will Rossiter
ddb017a6ff API: Move LimitWordCount() to Varchar 2013-04-05 21:58:03 +13:00
Sean Harvey
65cb182c98 BUG Don't sort when deleting records in ManyManyList::removeAll()
This breaks databases like MSSQL which don't allow an ORDER BY with
a subquery at the same time. DELETE queries don't need to be ordered,
so we can safely remove the default.
2013-04-05 11:50:25 +13:00
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
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
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
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