Ingo Schommer
fb660225c2
Behat: Wait until CMS loading overlay is removed
...
This makes tests more robust at the expense of an additional
check with every step. The "ajax steps" logic works similarly,
but does not respect the loading indicator. While this logic
waits for a short time after ajax requests are finished,
in some cases that isn't enough time for the browser to
process the response and remove the loading indicator.
Since the "ajax steps" logic applies to operations outside of the CMS
as well, we can't add the loading indicator check there.
2016-03-29 17:24:47 +13:00
Ingo Schommer
7ba4b5b6ef
Merge pull request #5241 from timkung/pulls/upload-validator-filesize-spelling
...
BUG changing all cases of filesize spelling to file size
2016-03-29 16:15:27 +13:00
Tim Kung
7907d20da7
BUG changing all cases of filesize spelling to file size
2016-03-29 13:38:24 +13:00
Daniel Hensby
2b261e226c
Merge pull request #5228 from christopherdarling/patch-4
...
DOCS: DataList::filter() broken examples
2016-03-26 21:20:34 +00:00
Daniel Hensby
3a932c963f
Merge pull request #5230 from kinglozzer/1684-textfield
...
Deprecate TextField::InternallyLabelledField() (closes #1684 )
2016-03-26 21:14:33 +00:00
Loz Calver
d9798af30c
Deprecate TextField::InternallyLabelledField() ( closes #1684 )
2016-03-26 11:07:33 +00:00
Christopher Darling
4dfe2955e3
DOCS: DataList::filter() broken examples
...
missing ' from 'bob'
2016-03-24 21:32:49 +00:00
Daniel Hensby
0ce257495b
Merge pull request #5226 from timkung/pulls/upload-validator-filesize-spelling
...
DOCS Upload_Validator fixing file size spelling
2016-03-24 09:41:35 +00:00
Tim Kung
7867c51388
Upload_Validator fixing file size spelling
2016-03-24 15:45:58 +13:00
Daniel Hensby
602b07f403
Merge pull request #5194 from christopherdarling/patch-9
2016-03-22 11:14:49 +00:00
Daniel Hensby
affb3dba03
Merge branch 'patch-9' of https://github.com/christopherdarling/silverstripe-framework into christopherdarling-patch-9
2016-03-22 11:13:35 +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
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
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
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
206c765b09
Merge pull request #5182 from christopherdarling/patch-8
...
DOCS: FulltextSearchable code example
2016-03-19 10:10:04 +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
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
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
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
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
