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,305 Commits 31 Branches 527 Tags 162 MiB
3c6ba1c322
Commit Graph

10305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
2e2c9226a4 Merge pull request #1934 from simonwelsh/scrut 
Add code-sniffs other than line length to scrutinizer
 2013-05-22 15:52:28 -07:00
Simon Welsh
b9d5f27194 Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
Will Rossiter
17ac2e36fc Merge pull request #1864 from tomzen/patch-1 
Have 'Configuration Reference' link point to uploadfield page
 2013-05-21 03:38:20 -07:00
Ingo Schommer
76cef06440 Merge pull request #1948 from chillu/pulls/shortcode-docs 
Improved shortcode docs
 2013-05-17 04:50:09 -07:00
Ingo Schommer
146b5a81cb Improved shortcode docs 2013-05-17 13:49:46 +02:00
Ingo Schommer
a35de54882 Updated github path 2013-05-17 00:41:16 +02:00
Ingo Schommer
79cf1faf53 Merge remote-tracking branch 'origin/2.4' into 3.0 
Conflicts:
	README.md
	composer.json
	docs/en/installation/from-source.md
	docs/en/misc/contributing.md
	model/Database.php
 2013-05-17 00:37:30 +02:00
Ingo Schommer
5796ed225e Updated github path 2013-05-17 00:35:28 +02:00
Sam Minnee
b401d39aec NEW: Move temp data into a user-specific subfolder, to stop temp-permission bugs from occurring. 
Anyone who has run "sudo -u www-data ./framework/sake dev/build" knows that SilverStripe's temp
folder permissions can be very brittle.  This patch resolves this by making the temp folder
user-specific.

To minimise directory pollution it first creates a chmod 777 parent folder with the same name
as the current folder.  It then creates a subfolder of this with the same name as the current
user.

The positive impact of this change is that sake can be used without fear of messing up file
permissions.  This means, among other things, that we can put a Composer post-update-cmd into
the installer to run dev/build.  Progress!

The negative impact is that you will get two caches if you run sake as a different user.  However,
that is much better than the current situation - which is a bunch of bugs - and if you're concerned
about that, you still have the option of running sake as www-data.
 2013-05-15 12:54:55 +02:00
Daniel Hensby
9a6a6ec75d Arbitrary placement of _ss_environment.php in parent folders 
Removes hardcoding to three levels
 2013-05-14 13:39:43 +02:00
Sean Harvey
813749e909 Fixing array to string conversion in dev/build for PHP 5.4 2013-05-12 21:28:17 +12:00
Will Rossiter
f45621b07e Fix typo in templates documentation 2013-05-10 21:32:39 +12:00
tomzen
e64420433a Have 'Configuration Reference' link point to uploadfield page 
Oops.
 2013-05-09 11:30:20 +02:00
Ingo Schommer
ced199b877 Direct writing of "Security.token" through dev/generatesecuretoken 2013-05-09 10:31:49 +02:00
Ingo Schommer
4188668e68 Merge pull request #1842 from tomzen/patch-1 
Add link to Config. Reference from the Config. Overview section to aid n...
 2013-05-08 00:45:43 -07:00
Ingo Schommer
4de032b364 Merge pull request #1848 from a2nt/patch-1 
FIX File class typo
 2013-05-07 15:30:55 -07:00
Tony Air
00b8ffd05f FIX File class typo 2013-05-08 01:27:34 +07:00
tomzen
19071761b7 Add link to Config. Reference from the Config. Overview section to aid navigation a little 2013-05-07 11:13:27 +02:00
Simon Welsh
a5d69f2bf5 Update page-type-templates.md 2013-05-03 15:04:30 +12:00
Will Rossiter
a5dd2434c0 Merge pull request #1776 from chillu/pulls/composer-require-docs 
Added --no-update hint to composer docs
 2013-04-30 22:09:44 -07:00
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
Ingo Schommer
a2394331af composer/installer dep workaround 
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
 2013-04-30 19:08:50 +03:00
Ingo Schommer
ff63d7ae26 Merge pull request #1821 from oddnoc/csvbulkloader-findexisting-2.4 
Use the correct variable as the key into $record
 2013-04-30 06:48:54 -07:00
Fred Condo
433b883c6b 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:27:27 -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
colymba
41c0f8080e FIX Only block root vendor folder 
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.
 2013-04-27 16:03:35 +03: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
Ingo Schommer
f86ca423ca Added --no-update hint to composer docs 2013-04-18 16:08:08 +02: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