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
15,856 Commits 31 Branches 527 Tags 162 MiB
060bf6b327
Commit Graph

15856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
c8f2e6702b DOCS Fixing CSV Parser docs - fixes #5004 2016-03-21 14:22:43 +00:00
Christopher Darling
96c586b39d FIX: only output $CleartextPassword if it has a value 
The $CleartextPassword value is never populated as reported https://github.com/silverstripe/silverstripe-framework/issues/3257 and in agreeance with the two comments (cc @kinglozzer) I also don't think plaintext passwords should be included in emails by default. As Loz suggests if somebody wants this it can easily be added by overriding the template.
 2016-03-21 09:48:01 +00:00
Daniel Hensby
863b737717 Merge pull request #5214 from tractorcow/pulls/3.1/fix-array-values 
Do not hang on nested parameters in search context
 2016-03-21 09:21:33 +00:00
Daniel Hensby
d2fa01fb17 Merge pull request #5215 from tractorcow/pulls/3.2/fix-folder-relativepath 
BUG Fix File::getRelativePath() failing if parent folder is renamed
 2016-03-21 09:09:12 +00:00
Damian Mooyman
78f19bd2ed Merge pull request #5175 from Firesphere/pulls/feature-set-owner-allmethods 
Enhancement: Set the owner on an extension
 2016-03-21 17:30:37 +13:00
Damian Mooyman
5f8356d686 BUG Fix File::getRelativePath() failing if parent folder is renamed 
Fixes #4993
 2016-03-21 17:22:38 +13:00
Damian Mooyman
94b0f61957 Merge pull request #3494 from dnadesign/tabForceActive 
fixing issue where 'ss-tabs-force-active' wasn't actually working
 2016-03-21 16:53:49 +13:00
Nicola Fontana
11561aeb54 Do not hang on nested parameters in search context 
Backport of 0b5a573 for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
 2016-03-21 15:54:22 +13:00
Daniel Hensby
ada12066f3 FIX Autocomplete loading spinner now showing 2016-03-21 15:15:00 +13:00
Damian Mooyman
cdedee130a Merge pull request #5200 from dhensby/pulls/fix-token-redirect 
FIX Parameter tokens now redirect to correct url if mod_rewrite is off
 2016-03-21 14:45:03 +13:00
Simon Erkelens
debe8ba2a3 Improvement: Set the owner on an extension, before getting all the available method names. 
This enhances the extensions to enable certain features like adding wrapper methods instead of having to have them on the object itself.
 2016-03-21 02:36:34 +01:00
Daniel Hensby
377c66cd49 Merge pull request #5209 from jonom/file-icons 
Restore deleted file icons
 2016-03-20 22:50:56 +00:00
Jonathon Menz
d027a96f3a Restore deleted file icons 
Reverts asset removal from commit 2923787352.
 2016-03-20 14:51:19 -07:00
Damian Mooyman
aa635f096b Merge pull request #5185 from jonom/tractorcow-pulls/3/menu-refactor 
API refactor LeftAndMain_Menu.ss into individually overridable compon…
 2016-03-21 10:10:12 +13:00
Daniel Hensby
c0d8cf3e97 Merge pull request #5208 from jonom/fix-tabs 
FIX tab wrapping
 2016-03-20 18:36:33 +00:00
Jonathon Menz
283885f091 FIX tab wrapping 
jQuery UI css specificity is different to SS so causes some conflicts. (fixes #5207)
 2016-03-20 11:09:36 -07:00
Daniel Hensby
f28dcdbb2e Merge pull request #5169 from Cheddam/patch-1 
DOCS Update 'Extend CMS Interface' documentation
 2016-03-20 07:52:59 +00:00
Garion
c59cd1e598 Update Extend_CMS_Interface.md 
Add missing `private` declaration.
 2016-03-20 13:08:23 +13:00
Daniel Hensby
250c2b5321 Merge pull request #5186 from jonom/file-icons 
NEW consistent file icons
 2016-03-19 23:56:11 +00:00
Jonathon Menz
2923787352 NEW consistent file icons 
File icons have been updated for consistency and a StripThumbnail method added to File for icon display in gridfield instances (such as file selection interface)
 2016-03-19 10:36:11 -07:00
Daniel Hensby
cbdaf890dd Merge pull request #5145 from tractorcow/pulls/3.2/fulltext-bootstrapping 
BUG Fix FulltextsearchEnable
 2016-03-19 17:17:02 +00:00
Daniel Hensby
206c765b09 Merge pull request #5182 from christopherdarling/patch-8 
DOCS: FulltextSearchable code example
 2016-03-19 10:10:04 +00:00
Daniel Hensby
add2ecdf8b FIX Parameter tokens now redirect to correct url if mod_rewrite is off 2016-03-18 15:56:39 +00:00
Daniel Hensby
0efdfa42e2 Merge pull request #5198 from JorisDebonnet/fix-enum 
Allow empty values in Enum
 2016-03-18 10:37:07 +00:00
Joris Debonnet
4c741125c5 fix #5195: allow empty values in Enum 2016-03-17 22:43:26 +01:00
Damian Mooyman
384297150a API refactor LeftAndMain_Menu.ss into individually overridable components 2016-03-15 09:34:39 -07:00
Christopher Darling
0c14bfc897 DOCS: FulltextSearchable code example 2016-03-15 11:49:12 +00:00
Garion
47179fc808 Update Extend_CMS_Interface.md 
Resurfaces details on actually creating the required handlers for custom buttons in the CMS, which were detailed in a [past version of the docs](https://github.com/silverstripe-droptables/sapphire/blob/side-by-side/docs/en/howto/extend-cms-interface.md#extending-the-cms-actions).
 2016-03-10 01:02:28 +13:00
Damian Mooyman
de044e591b Merge pull request #5156 from camfindlay/patch-38 
DOCS Added a useful code example around positioning of tabs in CMS.
 2016-03-09 12:06:34 +13:00
Daniel Hensby
ce560e7b76 Merge pull request #5144 from tractorcow/pulls/3/fix-file-parentid-search 
API Include File.ParentID in fulltext search results
 2016-03-08 17:43:49 +00:00
Loz Calver
371c84c22a Merge pull request #5158 from dhensby/pulls/imagik-installer 
FIX Imagick installer for travis and php 5.3
 2016-03-08 16:38:18 +00:00
Daniel Hensby
7c037d8034 trying to fix imagik properly 2016-03-08 15:38:30 +00:00
Cam Findlay
14044fff35 DOCS Added a useful code example around positioning of tabs in CMS. 
This useful example wasn't in the docs when I needed it. I ended up tracking this information down at http://stackoverflow.com/questions/5033028/silverstripe-how-do-i-insert-a-tab-before-another-tab

It should really be in the docs.
 2016-03-08 16:18:49 +13:00
Ingo Schommer
5609b9ae25 Merge pull request #5153 from tractorcow/pulls/3.2/imagick-travis 
BUG Don't install imagick on php 5.3
 2016-03-08 10:55:26 +13:00
Damian Mooyman
aa57427874 BUG Don't install imagick on php 5.3 2016-03-08 10:37:01 +13:00
Damian Mooyman
661e5ca03a Merge pull request #5152 from jonom/filesync-fix-3.2 
FIX file sync removes folders with dot in name
 2016-03-08 09:57:16 +13:00
Jonathon Menz
86b1c8fc28 FIX file sync removes folders with dot in name 
Prevent file extension validation being applied to folders during sync (fixes #4746)
 2016-03-07 12:27:18 -08:00
Damian Mooyman
6a2245474d BUG Fix FulltextsearchEnable 2016-03-07 14:47:20 +13:00
Damian Mooyman
8566825194 Merge pull request #5131 from dhensby/pulls/3.3/fix-help-link 
Fixing user help link
 2016-03-07 14:04:45 +13:00
Damian Mooyman
634e86f949 API Include File.ParentID in fulltext search results 
Fixes https://github.com/silverstripe-labs/silverstripe-secureassets/issues/22
 2016-03-07 13:15:40 +13:00
Damian Mooyman
f35786de0a Merge pull request #5123 from webbuilders-group/ImagickBackendFix 
BUGFIX: Deleting images with ImagickBackend fails
 2016-03-07 10:17:18 +13:00
Ingo Schommer
ef769da57b Merge remote-tracking branch 'origin/3.3' into 3 2016-03-07 08:50:18 +13:00
Ingo Schommer
49888e1bf8 Fixed core release constraint in travis.yml 2016-03-04 16:57:40 +13:00
Ingo Schommer
466ed29f0e Merge remote-tracking branch 'origin/3.3' into 3 2016-03-04 14:55:08 +13:00
Ingo Schommer
3c53da0890 Merge remote-tracking branch 'origin/3.2' into 3.3 2016-03-04 14:05:06 +13:00
Damian Mooyman
9a1793a7ef Merge pull request #5135 from chillu/pulls/3.2/dropdown-window-resize 
Fix TreeDropdownField auto-close regression
 2016-03-04 11:26:56 +13:00
Ingo Schommer
7bb6295c79 Fix TreeDropdownField auto-close regression 
Causes build failures due to Behat not being able to select
a link from a dropdown in "Insert Media".

Follow on effect from triggering a window.resize event
when the window wasn't actually resized (in order to force a layout redraw).

See https://github.com/silverstripe/silverstripe-framework/pull/5087 for context
 2016-03-03 17:54:07 +13:00
Daniel Hensby
f313d7659d Fixing user help link 2016-03-02 12:43:10 +00:00
Damian Mooyman
ba8f984940 Merge pull request #5121 from dhensby/pulls/3.1/fix-ip-from-LB 
FIX getIP from behind a load-balancer that adds many IPs to the header
 2016-03-02 10:25:02 +13:00
Daniel Hensby
817b836870 FIX getIP from behind a load-balancer that adds many IPs to the header 2016-03-01 21:07:48 +00:00