Will Rossiter
b72e8db226
Merge pull request #6495 from robbieaverill/patch-4
...
DOCS Add namespacing to environment types page
2017-01-13 19:25:35 +13:00
Damian Mooyman
1f406fa497
Merge pull request #6488 from open-sausages/pulls/4.0/campaign-regressions
...
Fix regression issues in campaigns
2017-01-13 16:53:38 +13:00
Daniel Hensby
3ea5015f8b
NEW Move to SwiftMailer powered Emails ( #6466 )
...
* API Replace existing Email and Mailer classes with SwiftMailer powered email system
* DOCS New Email docs
* Initial feedback from Damian
* Making Mailer an interface
* Templates relocated
* Round of feedback
* More robust approach to plain parts
* Revert changes to TestMailer
2017-01-13 14:48:46 +13:00
Damian Mooyman
e6ae532998
Merge pull request #6484 from open-sausages/pulls/unique-folder-enforced
...
Enforce unique Folder names, use AssetNameGenerator
2017-01-13 13:54:51 +13:00
Damian Mooyman
1049b710fe
Merge pull request #6487 from robbieaverill/bugfix/remapping-versioned-classnames
...
FIX Remap versioned ClassNames during build process
2017-01-13 12:05:22 +13:00
Robbie Averill
03e890fe5d
DOCS Add namespacing to environment types page
2017-01-13 11:52:43 +13:00
Robbie Averill
9559cb2eda
Handle Versioned implementations that do not have stages
2017-01-13 11:29:48 +13:00
Ingo Schommer
3b06e30558
Don’t add extension dot in FileNameFilter
...
File names are generally valid without an extension (although they might be disallowed by upload constraints),
so the filter should deal gracefully with them (“myfile” should return “myfile”, not “myfile.”)
2017-01-13 11:11:40 +13:00
Ingo Schommer
b1d5e97a3d
Enforce unique Folder names, use AssetNameGenerator
2017-01-13 11:11:37 +13:00
Damian Mooyman
3f1cda8510
Merge pull request #6491 from kinglozzer/mysqlquery-seek
...
FIX: MySQLQuery::seek() failed to return a row
2017-01-13 09:06:53 +13:00
Loz Calver
30d125f144
FIX: MySQLQuery::seek() failed to return a row
2017-01-12 15:34:28 +00:00
Loz Calver
3e95fc51f7
Merge pull request #6490 from colintucker/fix-empty-db-installer-bug
...
Check if $database is empty before adding prefix/suffix
2017-01-12 09:31:29 +00:00
Loz Calver
b44b8e8209
Merge pull request #6489 from robbieaverill/bugfix/fallback-layout-for-security
...
FIX Regression in using template_main to render the Security area
2017-01-12 09:20:12 +00:00
Damian Mooyman
d7c90ef2a8
Merge pull request #6473 from open-sausages/pulls/4.0/breadcrumb-flex
...
Shift react breadcrumbs to use flexbox for placement
2017-01-12 17:22:38 +13:00
Colin Tucker
d4db1f5189
Check if $database is empty before adding prefix/suffix
2017-01-12 11:24:33 +11:00
Robbie Averill
a4bc9f49d1
FIX Regression in using template_main to render the Security area
...
* Introduced in 0cf477d36
2017-01-12 13:11:40 +13:00
Christopher Joe
54c2afd019
Fix regression issues in campaigns
2017-01-12 12:31:32 +13:00
Robbie Averill
2d1d2aea79
FIX Remap versioned ClassNames during build process
2017-01-12 12:15:21 +13:00
Ingo Schommer
2a505b01db
Merge pull request #6483 from sminnee/testmailer-refactor
...
FIX: Refactor TestMailer to better be base class
2017-01-12 11:33:26 +13:00
Christopher Joe
4e257435df
Fix Shift react breadcrumbs to use flexbox for placement
2017-01-12 11:14:23 +13:00
Sam Minnee
6fc50cae5c
FIX: Refactor TestMailer to better be base class
...
This small refactoring makes TestMailer better suited as a base class
for the behat-extension’s implementation, which means that we don’t
need to coordinate cross-module commits in dhensby’ SwiftMailer work.
See https://github.com/silverstripe/silverstripe-framework/pull/6466
2017-01-12 10:22:57 +13:00
Daniel Hensby
747c0770e7
Merge pull request #6446 from robbieaverill/feature/controllers-without-underscores
...
API Allow controller discovery without underscores (PSR-2 compliance)
2017-01-11 15:27:56 +00:00
Ingo Schommer
b39c91f172
Merge pull request #6475 from open-sausages/pulls/4.0/htmleditor-button-api
...
ENHANCEMENT Remove jquery-ui button() api from default HTML editor dialog
2017-01-11 22:23:39 +13:00
Damian Mooyman
b52a963ed7
ENHANCEMENT Remove jquery-ui button() api from default HTML editor dialog
2017-01-11 17:04:20 +13:00
Robbie Averill
e4f67f6e2c
Add extra backslashes and ungreedy modifier
2017-01-11 14:49:09 +13:00
Damian Mooyman
6b5efb91fd
Merge pull request #6434 from open-sausages/features/4.0/ui-button-refresh
...
Refresh CMS UI buttons to new flat style and bootstrap classes
2017-01-11 14:22:25 +13:00
Damian Mooyman
4e138f25cc
Merge pull request #6471 from robbieaverill/bugfix/rename-template-viewer-peg
...
FIX Rename template parser from .inc to .peg so PHP doesn't include it automatically
2017-01-11 13:03:57 +13:00
Robbie Averill
62eb0e6142
FIX Rename template parser from .inc to .peg so PHP doesn't include it automatically
2017-01-11 12:36:08 +13:00
Damian Mooyman
d9034f5bfc
Remove redundant CMSSecurity.js dist file
...
Cleanup GridFieldFilterHeader / GridFieldSortableHeader
2017-01-11 12:00:01 +13:00
Damian Mooyman
ae2861d487
BUG Fix frameworkpath
2017-01-11 11:49:28 +13:00
Damian Mooyman
dcee7c99d3
Normalise indentation in GridField.js
2017-01-11 11:38:19 +13:00
Damian Mooyman
4ea614f04c
Fix linting issues
2017-01-11 10:56:17 +13:00
Damian Mooyman
63cb343cf5
BUG Fix modal animations
...
BUG Correct error type on invalid CSV import
2017-01-11 10:51:54 +13:00
Robbie Averill
36ae153995
Add Page_Controller upgrade mapping
2017-01-11 09:59:28 +13:00
Robbie Averill
6fb49224b9
FIX SSViewer should resolve templates with or without underscores
...
* Capture fully qualified class name, without "Controller"
2017-01-11 09:59:28 +13:00
Robbie Averill
c620063608
DOCS Update docs to reference PageController without an underscore, implement some PSR-2
2017-01-11 09:59:28 +13:00
Daniel Hensby
a996e20e79
Merge pull request #6450 from mikenz/page-to-sitetree
...
ENHANCEMENT: Use SiteTree instead of Page class in more places
2017-01-10 16:02:15 +00:00
Daniel Hensby
f3b6bb1470
Merge branch '3'
2017-01-10 14:31:07 +00:00
Daniel Hensby
733511565e
Merge branch '3.5' into 3
2017-01-10 12:52:06 +00:00
Damian Mooyman
b62f9b60a0
BUG Fix broken member / group import
...
BUG GridFieldImportButton no longer only works on ModelAdmin
2017-01-10 17:57:54 +13:00
Damian Mooyman
9e563ebd3a
API Moved iShouldSeeAButton to behat-extension
2017-01-10 14:39:24 +13:00
Christopher Joe
8118448a9c
Fix PHP linting issues
2017-01-10 11:34:50 +13:00
Will Rossiter
00c12cc7ed
Loading indicator on buttons now.
2017-01-10 11:05:58 +13:00
Will Rossiter
56c2363909
Implement feedback fixes
...
Enhancement Fix ModelAdmin import form not POSTing to correct form
2017-01-10 11:05:58 +13:00
Paul Clarke
cf5c055ded
Enhancement Fix Campaign admin publish button styles missing
...
API remove unused textures
Enhancement Update legacy DB icon to match new colour
Enhancement Remove Done button on import modal
2017-01-10 11:05:58 +13:00
Will Rossiter
2a7c0138f5
Move lang to root html element ( Fixes #6409 )
2017-01-10 11:05:58 +13:00
Will Rossiter
521a8217b9
Title attributes for expand / collapse panel ( Fixes #6407 )
2017-01-10 11:05:57 +13:00
Will Rossiter
2d5aa7ce0e
Fix Campaign List toggle ( Fixes #6067 )
2017-01-10 10:59:55 +13:00
Will Rossiter
7c76d2cb09
Fix show formatting help not appearing ( #6423 )
2017-01-10 10:57:58 +13:00
Paul Clarke
e893fc4c51
Enhancement improve secondary action colours
...
Enhancement add accessibility info to page number
Enhancement new font icons added, improve trash icon and increase icon size of close
Enhancement improve title of gridfield search trigger
Enhancement add title to button to open gridfield search and improve gridfield search styles
API Shortcode fails if no parent
API JQuery-UI classes removed
Enhancement centre actions tabs within dropup in more-actions
Enhancement fix IE input height issue and fix for safari of icons in buttons with hidden text (e.g. pagination)
Enhancement only show external link on hover
2017-01-10 10:55:34 +13:00
