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,673 Commits 31 Branches 527 Tags 162 MiB
303f695751
Commit Graph

15673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ingo Schommer
8f0bbcbc7b Merge pull request #4889 from dhensby/pulls/docs-version 
DOCS Explicitly noting lack of PHP 7 support
 2016-03-02 07:58:06 +13:00
Ryan McLaren
2079844647 BUGFIX: fixes "Uncaught ImagickException: Can not process empty Imagick object" when deleting an image 2016-03-01 12:19:23 -04:00
Daniel Hensby
b8c8875303 DOCS Explicitly noting lack of PHP 7 support 2016-03-01 10:14:14 +00:00
Ingo Schommer
ff5fd7a944 Merge pull request #5112 from tractorcow/pulls/3.2/update-docs-process 
Improve documentation on documentation
 2016-03-01 20:24:11 +13:00
Damian Mooyman
2e856e6315 Merge pull request #5103 from hailwood/patch-3 
API Populate foreign key before getting CMS fields
 2016-03-01 15:43:08 +13:00
Damian Mooyman
d31a921fad Merge pull request #5110 from hdpero/patch-1 
Update it.yml - parse error on line 321 (323)
 2016-03-01 14:10:17 +13:00
Damian Mooyman
22c0025d47 Improve documentation on documentation 2016-03-01 12:18:11 +13:00
Petar Simic
dcb83f0c6e Update it.yml - parse error on line 321 (323) 
Error while building Italian version of framework. There is a wrong formatting in line 321 (ex. 323).
 2016-02-29 18:28:07 +01:00
Damian Mooyman
7312692a09 Merge branch '3.3' into 3 2016-02-29 17:30:20 +13:00
Damian Mooyman
393a4788bf Merge branch '3.2' into 3.3 2016-02-29 17:29:41 +13:00
Damian Mooyman
f7d49df258 Merge tag '3.2.3' into 3.2 
Release 3.2.3

# Conflicts:
#	lang/cs.yml
 2016-02-29 17:27:00 +13:00
Damian Mooyman
ee6c08a0e4 Merge remote-tracking branch 'origin/3.3' into 3 2016-02-29 17:16:13 +13:00
Damian Mooyman
24a6c53645 Merge branch '3.2' into 3.3 
# Conflicts:
#	admin/code/ModelAdmin.php
#	lang/cs.yml
#	lang/lt.yml
#	lang/sk.yml
 2016-02-29 17:03:22 +13:00
Damian Mooyman
4fbf0b0863 Merge remote-tracking branch 'origin/3.3.1' into 3.3 2016-02-29 17:01:26 +13:00
Damian Mooyman
2c1f837442 Merge branch '3.1' into 3.2 
# Conflicts:
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
#	docs/en/02_Developer_Guides/00_Model/10_Versioning.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
#	docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/14_Files/index.md
#	lang/cs.yml
#	lang/fi.yml
#	lang/sk.yml
 2016-02-29 16:59:20 +13:00
Damian Mooyman
71bf14d590 Merge remote-tracking branch 'origin/3.1.18' into 3.1 2016-02-29 16:49:25 +13:00
Damian Mooyman
fb58233201 Added 3.3.1 changelog 2016-02-29 15:23:25 +13:00
Damian Mooyman
9050761f17 Added 3.2.3 changelog 2016-02-29 15:22:39 +13:00
Damian Mooyman
2147205dc1 Added 3.1.18 changelog 2016-02-29 15:10:05 +13:00
Damian Mooyman
a20654b49b Update translations 2016-02-29 15:01:55 +13:00
Damian Mooyman
3f18b2f8cd Update translations 2016-02-29 15:01:10 +13:00
Damian Mooyman
31e04862a8 Update translations 2016-02-29 14:57:30 +13:00
mikeyc7m
be2769244f fix to support facebook autodiscover 
the autodiscover function was failing on facebook because it returned the wrong match. also added a thumbnail lookup for facebook.
 2016-02-29 12:19:34 +11:00
Damian Mooyman
6c74481462 Merge pull request #5104 from ntd/pr3 
FIX Do not hang on nested parameters in search context
 2016-02-29 10:29:05 +13:00
Nicola Fontana
29b35c7ccf Do not hang on nested parameters in search context 
Backport of 0b5a57389b for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
 2016-02-28 21:40:34 +01:00
Matthew Hailwood
5810ecf7b9 Populate foreign key before getting CMS fields 
In it's current state you need to revert to something like `Session::get('CMSMain.currentPage')` to get the foreign key of what the item you are creating relates to (e.g. a Book => has_many Author) - if you create a new Author you may need to reference the owning Book in the `getCMSFields` function.

This is just a small quality of life buff that populates that foreign key before calling `getCMSFields()` rather than after.

This should not break backwards compatibility in any way and isn't exactly a new feature so could be considered a bug fix.
 2016-02-28 20:56:10 +13:00
Damian Mooyman
2b26511faa Merge branch '3.3' into 3 2016-02-27 21:20:15 +13:00
Damian Mooyman
8a8d82cc57 Merge branch '3.3.1' into 3.3 
# Conflicts:
#	lang/cs.yml
 2016-02-27 21:19:29 +13:00
Damian Mooyman
14aa497b80 Merge branch '3.2.3' into 3.2 2016-02-27 21:11:57 +13:00