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
11,540 Commits 31 Branches 527 Tags 162 MiB
6ca27cd257
Commit Graph

11540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loz Calver
57e4bca55e FIX: Minor CSS issues on DatetimeField 
The two 'child' field divs with a `.field` class were adding additional
margin and borders

SCSS updates
 2013-05-20 09:59:53 +01:00
Sean Harvey
13e632d053 Merge pull request #1867 from tractorcow/3.1-urlsegmentfilter-fixes 
BUG Fixes issue with "+" characters in url.
 2013-05-20 00:36:18 -07:00
Sean Harvey
881a41cc30 Merge pull request #1957 from jedateach/uri-rewriting-patch 
FIX: Don't rewrite urls to be absolute, if they are a URI with a protocol
 2013-05-20 00:31:13 -07:00
Jeremy Shipman
b1ba8bd05b FIX: Updated protocol check to become more stringent. 2013-05-20 12:46:44 +12:00
Jeremy Shipman
d21fd1f0bb FIX: Don't rewrite urls to be absolute, if they are a URI with a protocol. 
This is determined in this fix by the existence of a colon ':', to show the uri has a protocol.
 2013-05-20 11:59:04 +12:00
Ingo Schommer
e0f4bd6113 Fixed conventions in shortcode docs 2013-05-17 14:02:33 +02:00
Ingo Schommer
306d3b0c7e Merged existing shortcode docs with new topics docs from 3.0 2013-05-17 14:01:42 +02:00
Ingo Schommer
4c7c40e8b9 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	parsers/ShortcodeParser.php
 2013-05-17 13:51:54 +02:00
Ingo Schommer
8bf2f16c75 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	README.md
 2013-05-17 13:50:40 +02: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
5e663b123b Merge pull request #1933 from g4b0/content-negotiator-default-format 
Bugfix: Added private static $defaultFormat...
 2013-05-17 01:37:15 -07:00
Ingo Schommer
9b0102b488 Merge pull request #1860 from tractorcow/3.1-beforeextend 
NEW Added beforeExtending, afterExtending, and beforeUpdateCMSFields
 2013-05-17 01:01:11 -07:00
Ingo Schommer
a87bbb2903 Updated github path 2013-05-17 00:45:52 +02:00
Ingo Schommer
faf6f12478 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-17 00:43:01 +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
Sean Harvey
0c6f32e752 Merge pull request #1949 from mateusz/tabs-refresh 
BUG All tabs are in open state when changing the name of a folder.
 2013-05-15 19:18:06 -07:00
Mateusz Uzdowski
b480886cab BUG All tabs are in open state when changing the name of a folder. 
Submitting the form via AJAX changes the DOM controlled by the tabs
widget, it needs to be notified about the change.
 2013-05-16 11:15:03 +12:00
Sean Harvey
3878806ca3 Merge pull request #1946 from halkyon/reinstate_cog_icon_batch_actions 
Put back cog icon for multi-select batch actions
 2013-05-15 16:11:19 -07:00
Damian Mooyman
6e0e3564e1 NEW Added beforeExtending, afterExtending, and beforeUpdateCMSFields to allow user code better control over interaction with extending methods 2013-05-16 10:34:45 +12: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
Sean Harvey
33be390db8 Put back cog icon for multi-select batch actions (was removed in f4b080e) 2013-05-15 21:09:19 +12:00
Sean Harvey
9f532fe976 BUG GridField action onclick assuming URL without "?" character 
Sometimes GridState URL will have a query string already appended,
e.g. "?local=en_GB", but the GridField javascript assumes there won't
be.

The result would be an action URL like:
"/my/url?locale=en_US?RelatedPage=123" which is obviously invalid.

The fix is to check that "?" exists in the GridState URL and use
"&" instead to connect the URLs if that's the case.
 2013-05-15 15:49:23 +12: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
Ingo Schommer
7bf790a5fa Merge pull request #1875 from wilr/open6473 
FIX: If CSV column mapping maps to function, keep key values
 2013-05-14 04:02:01 -07:00
Will Rossiter
7ea96504c6 Code formatting / PHPDoc cleanup 2013-05-14 22:06:02 +12:00
Will Rossiter
c8af0fd7d1 FIX: If CSV column mapping maps to function, keep key value as key. 
Fixes http://open.silverstripe.org/ticket/6473

When using CSVParser::$columnMapping to map columns to a callback action, it previously used the action name as the key value. This prevented users from defining multiple entries to the same callback. This patch retains those key values and simply runs the callback field name filter later on.
 2013-05-14 22:00:52 +12:00
Will Rossiter
cf31114813 Merge pull request #1939 from chillu/pulls/folder-creation 
Recursive folder creation in Upload
 2013-05-14 02:00:06 -07:00
Ingo Schommer
1e5d40474d Merge pull request #1940 from chillu/pulls/uploadfield-folder-label 
Added "saves into..." label to UploadField template
 2013-05-14 01:40:02 -07:00
Ingo Schommer
842dc98681 Added "saves into..." label to UploadField template 
CMS users shouldn't need to guess where their files will end up.
 2013-05-14 10:39:05 +02:00
Sean Harvey
2beb3519e4 Merge pull request #1944 from patbolo/bugfix/debug-no-controller 
FIX Avoid unnecessary user_error when no controller set for friendly err...
 2013-05-13 22:14:30 -07:00
Sean Harvey
a4f0983220 Updating docs to use SiteTree for aggregates with LastEdited example 
Using SiteTree is faster, because it doesn't do any joining of Page
to get the aggregate, even though the LastEdited field is only on
SiteTree in the case of Page.
 2013-05-14 17:12:02 +12:00
jean
3de75f396e FIX Avoid unnecessary user_error when no controller set for friendly errors in Debug class 2013-05-14 16:58:57 +12:00
Hamish Friedlander
d5bcbbd66a Merge pull request #1886 from halkyon/filesystem_sync_subsites 
BUG Fixing Filesystem::sync breaking subsite pages with same URLSegments
 2013-05-13 15:51:42 -07:00
Sean Harvey
ebac1bf06e BUG Fixing Filesystem::sync breaking subsite pages with same URLSegments 
Filesystem::sync() tries to run through all pages, without caring
which subsite the page came from. The problem with this is
code in SiteTree::validURLSegment() will return invalid information,
as it will check if the page exists, thinking it does, return false,
then the page will get a new URLSegment written, e.g. "home-2".

Instead of disabling the subsite filter in Filesystem::sync(), this
fix will just loop through each subsite and sync each subsite's pages
individually before doing the main site.
 2013-05-14 09:45:14 +12:00
Simon Welsh
1b3f817862 Merge pull request #1941 from TheFrozenFire/patch-1 
Include Zend_Locale_Format
 2013-05-13 13:12:40 -07:00
Justin Martin
644fa29e41 Include Zend_Locale_Format 
Fix Zend_Locale_Format not being included.
 2013-05-13 10:55:05 -07:00
Ingo Schommer
68af8409a5 Recursive folder creation in Upload 2013-05-13 15:47:34 +02:00
mikg0
fb5fc62604 Fix file link recognition in HtmlEditorField.js 
The new file_link format ([file_link,id=\d+]) uses a comma which was not reflected in the regex.
 2013-05-13 15:04:52 +03:00
Sean Harvey
bb6283740a Fixing broken CoreTest when using silverstripe-cache for temp folder 2013-05-13 23:39:52 +12:00
g4b0
6d7b938b7a Bugfix: Added private static $defaultFormat in order to choose default via config. Permit WCAG validation of XHTML. 2013-05-13 11:34:35 +02:00
Sean Harvey
15f7c884f8 Merge pull request #1756 from halkyon/permission_denied_hook 
BUG Security::permissionFailure() fixing permissionDenied hook inconsistency
 2013-05-13 02:15:58 -07:00
Sean Harvey
fd1aa197d5 Merge pull request #1884 from mateusz/modify-alignment 
BUG Enable dropdown so alignment on images can be updated.
 2013-05-12 15:19:03 -07:00
Ingo Schommer
8c02f10c03 Merge pull request #1874 from wilr/open6210 
API: Add sync_blacklisted_patterns for configuring files to skip in sync()
 2013-05-12 15:15:23 -07:00
Mateusz Uzdowski
fdb4a1d871 BUG Enable dropdown so alignment on images can be updated. 2013-05-13 10:08:03 +12:00
Ingo Schommer
8c9dd02d73 Merge pull request #1876 from wilr/open6449 
Suggest users install curl, tidy on their machines.
 2013-05-12 14:21:50 -07:00
Ingo Schommer
46bc588a1b Merge pull request #1877 from wilr/5577 
FIX: NumericField should work with numbers like 54,6
 2013-05-12 14:12:56 -07:00
Ingo Schommer
e135421ac8 Merge pull request #1878 from wilr/open5091 
FIX: allow cite elements in TinyMCE
 2013-05-12 14:11:22 -07:00