tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
10,230 Commits 31 Branches 527 Tags 162 MiB
bef2905bfd
Commit Graph

10230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
bef2905bfd Merge pull request #1820 from oddnoc/csvbulkloader-findexisting-3.0 
Use the correct variable as the key into $record
 2013-04-30 09:24:07 -07:00
Fred Condo
68cf2f5db7 Use the correct variable as the key into $record 
It was using $fieldName, which is the CSV field name, not the database
field name. This prevents duplicate detection from working. It now
properly uses $SQL_fieldName
 2013-04-29 17:25:16 -07:00
Ingo Schommer
7803d982bb Merge remote-tracking branch 'origin/2.4' into 3.0 
Conflicts:
	.travis.yml
	composer.json
 2013-04-30 00:43:30 +02:00
Ingo Schommer
c26b83ebfb Less trademark-encumbered doc icons (fixed #1787) 
Thanks to http://p.yusukekamiyamane.com/
 2013-04-30 00:41:58 +02:00
Ingo Schommer
5f91c3724d Consistently used dollar notation in template docs (see #1794) 2013-04-26 11:48:59 +02:00
Ingo Schommer
b211f22bf9 FIX JSONDataFormatter wrong relation identifiers (fixes #1795) 2013-04-26 11:40:24 +02:00
Will Rossiter
c8d98861c0 Update template documentation to include DataList methods 
https://github.com/silverstripe/sapphire/pull/1799.
 2013-04-25 11:54:10 +12:00
Trevor
50d2c26230 Issue #1775 Add reference to $Me in loop and update occurence of Children with $ prefix. 2013-04-23 10:01:00 +02:00
Ingo Schommer
a303a39d71 Allow SS_DATABASE_NAME in _ss_environment.php configuration 
Makes setups which are completely driven by that file a bit easier
to automate, particularly if the same codebase is deployed
multiple times (e.g. to a staging and live instance)
 2013-04-22 14:14:32 +02:00
Ingo Schommer
26a6ac47a3 Merge pull request #1788 from sminnee/perf-fix-in-viewabledata-obj 
Performance fix in calls to CompositeDBField::setValue()
 2013-04-22 00:53:09 -07:00
Sam Minnee
9ba26a04c4 Added test for lazy-loading edge-case in Money field. 2013-04-22 11:50:57 +12:00
Sam Minnee
eb583c5f14 NEW: Added DataObject::getQueriedDatabaseFields() as faster alternative to toMap() 
API: CompositeDBField::setValue() may be passed an object as its second argument, in addition to array.

These changes provide a 15% - 20% performance improvement, and as such justify an small API change in the 3.0 branch. It will likely affect anyone who has created their own composite fields, which is fortunately not all that common.
 2013-04-21 13:39:11 +12:00
Will Rossiter
e13ce9b98f Merge pull request #1774 from SticksTucker/patch-1 
Include AllPages() form method to $allowed_actions
 2013-04-17 22:17:30 -07:00
SticksTucker
8033955d35 Include AllPages() form method to $allowed_actions 2013-04-18 13:22:42 +10:00
Ingo Schommer
9a17e3494f DateField.js event selector regression (fixes #1528) 
See 19a8545076
 2013-04-16 09:54:30 +02:00
Ingo Schommer
933fbf8ea4 l10n key to make "yes" and "no" translatable (see #1749) 2013-04-12 01:11:24 +02:00
Ingo Schommer
a68fb1f096 Fixed /admin/pages/publishall link in docs 2013-04-09 23:00:27 +02:00
Ingo Schommer
e26090a840 Avoid double encoding Date->Formati18n() 
See https://github.com/silverstripe/sapphire/pull/1314
Thanks to @ivoba
 2013-04-09 11:04:45 +02:00
Simon Welsh
d5b9ce71c3 Merge pull request #1738 from ss23/patch-1 
Update form-validation.md
 2013-04-08 23:45:32 -07:00
Stephen Shkardoon
1a95be7e60 Update form-validation.md 
Minor typo, missing a '
 2013-04-09 18:44:47 +12:00
Sam Minnée
39a4aabcdc Merge pull request #778 from patbolo/bugfix/7853 
FIX 7853
 2013-04-08 16:08:23 -07:00
Sam Minnée
6dec0592e8 Merge pull request #848 from chillu/pulls/4754 
BUG Exclude framework/dev from text collection (fixes #4754)
 2013-04-08 16:06:52 -07:00
Sam Minnée
a6929f11b2 Merge pull request #1185 from chillu/pulls/augment-lazy-versioned 
Versioned lazy loading fixes (backport from 3.1)
 2013-04-08 16:04:50 -07:00
Sam Minnée
ff2f75535b Merge pull request #1347 from stojg/gridfieldfilterheader-last-filter-only 
BUG: GridFieldFilterHeader only filters on last filter
 2013-04-08 15:16:33 -07:00
Will Rossiter
8e82ef186d Merge pull request #1337 from adrexia/patch-1 
BUG: update deprecated 'live' jquery to 'on'
 2013-04-08 00:41:02 -07:00
Ingo Schommer
a0f0e9bce3 Update translation.md 2013-04-04 17:44:40 +03:00
Ingo Schommer
9a52dae207 Removed LOLCAT locale from installer (fixes #1457) 2013-04-04 11:18:40 +02:00
Ingo Schommer
ed19bbc3ba Removed LOLCAT locale - sadly not supported by our translation infrastructure (fixes #1457) 
It breaks the CMS when selected. If there's interest in maintaining it, we can re-add.
 2013-04-04 11:03:37 +02:00
Ingo Schommer
0242686a7a Requirements acces to files with query strings (fixes #7735) 
Originally authored by florian.thoma, tests added
by Ingo Schommer. Also removed query params from
file paths before calling mtime() on it.

See https://github.com/silverstripe/sapphire/pull/1023
 2013-04-03 16:39:59 +02:00
Sean Harvey
a99c829ed1 Ensure composer files aren't accessible using IIS 2013-04-03 15:59:14 +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
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
Ingo Schommer
41039cc8d3 Merge pull request #1348 from danrye/patch-3 
Minor: Update "Editing Online"
 2013-03-30 02:21:21 -07: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
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
3ff103a04c More straightfoward travis include/exclude 2013-03-28 22:53:55 +01:00
Ingo Schommer
31f5e00a56 Simplified travis builds (external setup scripts) 2013-03-28 22:24:03 +01:00
Ingo Schommer
43d4224286 Require cms in 2.4 composer.json (which is used in travis) 2013-03-28 22:18:08 +01:00
Ingo Schommer
05d1305497 Simplified travis builds (external setup scripts) 2013-03-28 22:10:35 +01:00
g4b0
f033321adc Solved json obj to array issue 2013-03-28 22:06:37 +01:00
Naomi Guyer
19a8545076 BUG: update deprecated 'live' jquery to 'on' 
'live' has been deprecated since jquery v 1.7.0, and has been removed
in the latest 2 versions of jquery
 2013-03-27 15:09:49 +13:00
Hamish Friedlander
600d9cff53 API Make Object::config use late static binding 
Can now be used in instance scope, like:
  $this->config()->db
and in static scope, like:
  Page::config()->db
 2013-03-26 00:37:47 +01:00
Ingo Schommer
3f2b6a518f FIX Don't silently unset ParentID in "add page" dialog 
Happened when changing the page type, because the "selectedNode"
property isn't set in all cases
 2013-03-25 23:40:35 +01:00
Ingo Schommer
0a283eacb8 FIX Unset internal metadata on TreeDropdownField setValue() 
Otherwise the hidden field value and metadata will get out of sync.
Most commonly used together with setTitle('') as well.
 2013-03-25 23:39:37 +01:00
Ingo Schommer
42a422775e Fixed path in docs 2013-03-24 22:47:01 +01:00
Ingo Schommer
74df4a5627 Merge pull request #1312 from chillu/pulls/deprecation-docs 
Deprecation docs
 2013-03-21 16:35:48 -07:00
Ingo Schommer
ea0cedb3da Removed internal/outdated/speculative docs from requirements.md 2013-03-21 12:44:34 +01:00
Ingo Schommer
2787d360c1 FIX "Insert Link" and other TinyMCE loading bugs (fixes #8327) 
Caused by SS loading a URL with html entities (&)
through the Requirements API, which only works when directly
inserted into the HTML template (standard behaviour),
but garbles the URL GET parameters when loaded via the jQuery.ondemand
JavaScript/XHR logic.

It didn't fail the request, just meant that tiny_mce_gzip.php wasn't
getting all the required options from the GET parameters.
And since this newly loaded file contains the same JS globals,
it would override previously loaded (correct) state.
 2013-03-20 17:58:17 +01:00
Ingo Schommer
74014650ed Merge pull request #1205 from UndefinedOffset/3.0 
BUG Fixed issue with cms help toggles not functioning correctly
 2013-03-20 05:47:05 -07:00