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
20,525 Commits 31 Branches 527 Tags 162 MiB
a8cde7d793
Commit Graph

20525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
a8cde7d793
Merge pull request #8370 from jmfederico/patch-3 
Update 01_Syntax.md - Fix How To's links
 2018-09-10 09:25:44 +02:00
Federico Jaramillo Martínez
8244fe3a48
Update 01_Syntax.md - Fix How To's links 2018-09-09 15:59:58 -05:00
Robbie Averill
28230dacad
Merge pull request #8368 from jmfederico/patch-1 
Update 05_Template_Inheritance.md - Documentation mentions themes when talking about modules.
 2018-09-09 20:05:29 +02:00
Federico Jaramillo Martínez
6e2b4c2558
Update 05_Template_Inheritance.md 
Documentation mentions themes when talking about modules.
 2018-09-09 10:07:49 -05:00
Robbie Averill
373a8afeb5 Merge branch '4.2' into 4 2018-09-06 13:26:46 +02:00
Robbie Averill
270aba4007 Merge branch '4.1' into 4.2 2018-09-06 13:26:31 +02:00
Robbie Averill
b6ff21f72a Merge branch '4.0' into 4.1 2018-09-06 13:26:13 +02:00
Robbie Averill
c5554ca287
Merge pull request #8360 from open-sausages/pulls/4/fix-http-caching 
Make sure that CMS requests disable caching
 2018-09-06 12:51:23 +02:00
Robbie Averill
b49e1e11d2
Merge pull request #8363 from nickbyfleet/patch-2 
Update 04_Directory_Structure.md
 2018-09-06 09:25:06 +02:00
Nicholas Byfleet
0a2920d7e6
Update 04_Directory_Structure.md 2018-09-06 11:43:49 +12:00
Ingo Schommer
f7d85fe794 Make sure that CMS requests disable caching 
Original author: @dhensby

Forward port from 3.7 fix at https://github.com/silverstripe/silverstripe-framework/pull/8318
 2018-09-05 11:38:41 +12:00
Maxime Rainville
cc22024e9a ADD New search component for GridFields (#1777) 2018-09-04 11:35:17 +12:00
Loz Calver
536a1c08b3
Merge pull request #8358 from creative-commoners/pulls/4.0/check-scheme 
FIX Check scheme is truthy before setting it to the request
 2018-09-03 09:31:03 +01:00
Robbie Averill
b922c0d732 FIX Check scheme is truthy before setting it to the request 2018-09-03 08:59:37 +02:00
Luke Edwards
68c2c976d4 Fix alignment test step definition (#8354) 2018-08-31 15:47:28 +12:00
Robbie Averill
94f5d32f41
Merge pull request #8351 from open-sausages/pulls/4.2/move-to-your-other-left 
BUG Use classes for TinyMCE alignment buttons
 2018-08-31 10:18:03 +12:00
Luke Edwards
234b795f89 BUG Use classes for TinyMCE alignment buttons 2018-08-31 09:02:17 +12:00
Robbie Averill
e4c1ceae59
Merge pull request #8349 from creative-commoners/pulls/4/data-object-d-art 
DOCS Updating DataObject config documentation
 2018-08-29 14:56:16 +12:00
Guy Marriott
610f17282f
DOCS Updating DataObject config documentation 2018-08-29 14:53:05 +12:00
Martin D
b1563b73bf DOCS How to specify textual name with Email::admin_email (#8337) 
* Allow use of display names with SwiftMailer

The syntax to allow display names with SwiftMailer is as follow:
`->setFrom(['john@doe.com' => 'John Doe'])`

Just like you set the `Email.admin_email`, you can set the default sender display name through the `Email.admin_email_displayname` configuration setting.

Refs:
- https://swiftmailer.symfony.com/docs/introduction.html#basic-usage
- https://docs.silverstripe.org/en/4/developer_guides/email/#administrator-emails

* Update Email.php

Simpler code using `Email.admin_email` as an associative array

* Update index.md

Added documentation showing how to add an email display name.
 2018-08-29 11:42:12 +12:00
Loz Calver
dbfc253021
Fix incorrect version number in 4.3.0 changelog 2018-08-28 09:07:22 +01:00
Maxime Rainville
dd3379e68f
Merge pull request #8075 from creative-commoners/pulls/4.0/remap-polymorphics 
FIX Polymorphic relationship class columns have obsolete class names remapped
 2018-08-28 17:03:39 +12:00
Robbie Averill
d651d0fbfc FIX Use base class (not remapping target class) when looking up whether object is versioned 2018-08-28 14:15:02 +12:00
Maxime Rainville
e8261589e8
Merge pull request #8304 from micmania1/patch-12 
BUGFIX Installer redirect to home/ (without domain)
 2018-08-28 13:47:24 +12:00
Robbie Averill
83e461abbf Merge branch '4.2' into 4 2018-08-27 16:15:57 +12:00
Robbie Averill
37a266f2f0 Merge branch '4.1' into 4.2 2018-08-27 16:14:24 +12:00
Scott Hutchinson
4da5569232 FIX ensure createFromVariables takes correct params on CLIRequestBuilder 2018-08-27 16:12:52 +12:00
Robbie Averill
66c09afc9c Merge branch '4.0' into 4.1 2018-08-27 16:12:04 +12:00
Robbie Averill
3178fbf3bb
Merge pull request #8028 from andrewandante/pulls/4.0/unset_http_scheme_on_cli 
unset http scheme on CLIRequestBuilder
 2018-08-27 16:11:42 +12:00
Robbie Averill
a87165c299
Merge pull request #8326 from creative-commoners/pulls/4.2/remove-double-encoding 
FIX Remove double escaping of HTML values in print views
 2018-08-27 13:37:32 +12:00
Luke Edwards
6164d01d65 FIX GridField delete button to offer archive action if possible (#8325) 
* FIX GridField delete button to offer archive action if possible

* Refactor archive action to versioned module

* Fix GridFieldDeleteAction test
 2018-08-24 13:13:32 +12:00
Robbie Averill
c459130986
Merge pull request #8323 from lekoala/patch-11 
email rendering should not include requirements
 2018-08-23 15:10:41 +12:00
Robbie Averill
050afd79c1
Merge pull request #8316 from anhld/anhld-patch-1 
Password changing notification issue on new member
 2018-08-23 14:03:17 +12:00
Thomas Portelange
27ac001d5b FIX email rendering should not include requirements 
If no body is defined, the email is rendered according to a template. Clearing requirements prevent unnecessary styles/scripts to be included in the html (and that needs to be processed/stripped down the line).
 2018-08-23 14:01:27 +12:00
Robbie Averill
f0e54363ff
Merge pull request #8340 from open-sausages/pulls/4/no-that-button 
Fix failing HTML button test step
 2018-08-23 11:36:53 +12:00
Luke Edwards
1b67bb08c8 Fix failing HTML button test step 2018-08-23 11:09:17 +12:00
Robbie Averill
373326e49c
Merge pull request #8324 from creative-commoners/pulls/4.2/request-before-init 
FIX Pass request to dummy controller before calling init
 2018-08-21 12:08:14 +12:00
Luke Edwards
dcebf56056 Make HTML Field button step find more lenient for conditional labels (#8328) 2018-08-21 07:44:52 +12:00
Daniel Hensby
aa153cb5c7
Merge pull request #8315 from open-sausages/pulls/4.2/changing-change 
FIX Paginating a gridfield causing a change event
 2018-08-20 17:59:50 +01:00
Daniel Hensby
90dae07493
Merge pull request #8335 from creative-commoners/pulls/4.2/correct-lost-password-links 
FIX Message when changing password with invalid token now contains correct links to login
 2018-08-20 12:22:43 +01:00
Robbie Averill
18fff5c16c Remove past tense for "log in" in expired token message 2018-08-20 22:31:23 +12:00
Robbie Averill
dbab696690 FIX Message when changing password with invalid token now contains correct links to login 
The Security controller should be used to return these links rather than the
ChangePasswordHandler
 2018-08-20 22:30:12 +12:00
Robbie Averill
735c87b709
Merge pull request #8327 from dhensby/pulls/4/application-json 
FIX text/json is not a valid mimetype
 2018-08-19 13:42:27 +12:00
Robbie Averill
4f4df135d1
Merge pull request #8333 from pine3ree/patch-3 
$has_one docs
 2018-08-19 13:42:00 +12:00
maks
b9922a7314
$has_one docs 
The ` $has_one` can be used both for `1-to-1` and `many-to-1` relations, depending on how is configured the inverse mapping on the related class. The documentation seems to suggest that `$has_one` implies a `1-to-1` relation, but then it gives an example of a `many-to-1` relationship. Since we are focusing on `$has_one` I would also put the `Player` class before the `Team` class.
 2018-08-18 15:06:08 +02:00
Robbie Averill
99d43d2211
Merge pull request #8330 from pine3ree/patch-3 
convert to short array syntax
 2018-08-18 09:29:23 +12:00
maks
160d595e22
fix trailing whitespace 2018-08-17 18:16:17 +02:00
maks
16217f3655
fix accidentaly deleted comma 2018-08-17 15:13:13 +02:00
maks
aa1e576a3f
convert to php 5.4+ array syntax 2018-08-17 15:03:46 +02:00
Robbie Averill
706f114aec
Merge pull request #8329 from andrewandante/patch-8 
Update 07_Permissions.md
 2018-08-17 14:11:48 +12:00