664c0eafbe
Merge branch '3'
2016-12-28 14:30:54 +00:00
e57d7a30bd
Update translations
2016-12-16 20:49:05 +00:00
ba39e552a2
Merge branch '3'
2016-12-15 12:20:29 +00:00
2181e3b86b
BUG Fix localisation issues
2016-12-06 11:20:10 +13:00
c6d43b477e
Merge branch '3'
2016-11-29 13:27:49 +00:00
50f456eed8
Update translations
2016-11-21 13:27:57 +00:00
ae037b68c6
Update translations
2016-11-03 14:53:52 +13:00
d7ded0fb4a
Add status flag to File and Image Edit Form
...
API extension hook "getIsModifiedOnStage" renamed to "updateIsModifiedOnStage", also moved "getIsDeletedFromStage", "getIsModifiedOnStage" and "getIsAddedToStage" from SiteTree class to Versioned data extension class
2016-10-06 10:30:52 +13:00
acc230fc99
Update translations
2016-09-23 16:14:42 +12:00
08a39f5f93
Update file edit form ( #6024 )
...
* Added Created field to File/Image editor
* switch default input value to null
Fix react errors and added a field description
* API Use new DBField::getSchemaValue()
2016-09-20 12:56:45 +12:00
ea2fb1b325
Remove duplicated HTMLEditorField label variables, keep LINKTO label for language upgrade
2016-09-05 10:50:58 +12:00
d7e756c4f2
Update labels with more appropriate text
2016-09-02 16:50:13 +12:00
c1c20aaafc
Breadcrumbs with new icons generated
2016-08-30 14:46:59 +12:00
b77d21c25a
Fix pages add to campaign, improved FormActions error handling, Popover focus highlight and refactored AddToCampaignModal to FormBuilderModal
...
tweaked tests to suit new generic FormBuilderModal, changed FormAction handler to throw a promise instead
2016-08-28 13:07:32 +12:00
84cdb15a5f
Simplify "add to campaign" dialog
...
Talked to @clarkepaul and simplified to avoid title duplication
2016-08-28 13:07:31 +12:00
a9bdf33ca8
Fix SingleSelect styling, added add to campaign documentation
2016-08-28 13:07:31 +12:00
b9445511b7
Bootstrap GridField
2016-08-03 18:35:18 +12:00
dfe375e87e
Fix MemberDatetime helper description, and shifted them to templates ( #5766 )
...
* Fix MemberDatetime helper description, and shifted them to templates
* added descriptionTemplate for setting the description
* Unit test for description with templates
2016-07-06 09:16:27 +01:00
cdb0b07345
Merge branch '3'
2016-05-20 14:20:33 +01:00
d125d4e304
Update translations
2016-05-19 14:48:39 +12:00
19daf8f974
Update translations
2016-05-12 15:37:09 +12:00
b4cd617ee3
FIX: Renaming to HTMLEditorConfig.
...
FIX: Renaming to HTMLEditorField*.
FIX: Renaming to HTMLEditorSanitiser*.
2016-05-06 14:16:34 +12:00
d52db0ba34
Merge 3 into master
...
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
2016-04-29 17:50:55 +12:00
c94802ea15
i18n for campaigns section
2016-04-26 15:32:09 +12:00
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
7907d20da7
BUG changing all cases of filesize spelling to file size
2016-03-29 13:38:24 +13:00
bab1f230bf
NEW Cross device "Remember Me" feature
...
At the moment, using the "Remember me" function on more than one device will only work with the last device used. Previous devices will not auto login.
This PR introduces a new DataObject for storing hashed tokens against multiple devices. Developers can configure if logging out should discard all tokens, or only the one used on the device logging out; token expiry date is 90 days by default but configurable. For added security, the old behaviour can still be enforced if multiple tokens are not desired.
See silverstripe#1574 for additional background
2016-02-10 09:42:08 +13:00
69c9ad1428
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/scss/_style.scss
# css/AssetUploadField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
# lang/fi.yml
2016-01-25 16:15:41 +13:00
75493e79ff
Update translations
2016-01-25 15:06:55 +13:00
e4222d8186
Add default action from batch actions
2016-01-22 16:02:27 +13:00
d8ea6ceccc
Update translations
2016-01-21 14:22:35 +13:00
e6b877df27
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# control/Director.php
# control/HTTP.php
# core/startup/ParameterConfirmationToken.php
# docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
# docs/en/00_Getting_Started/04_Directory_Structure.md
# docs/en/00_Getting_Started/05_Coding_Conventions.md
# docs/en/01_Tutorials/01_Building_A_Basic_Site.md
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/01_Tutorials/04_Site_Search.md
# docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
# docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
# docs/en/02_Developer_Guides/13_i18n/index.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
# docs/en/03_Upgrading/index.md
# docs/en/changelogs/index.md
# docs/en/howto/customize-cms-menu.md
# docs/en/howto/navigation-menu.md
# docs/en/index.md
# docs/en/installation/index.md
# docs/en/installation/windows-manual-iis-6.md
# docs/en/misc/contributing/code.md
# docs/en/misc/contributing/issues.md
# docs/en/misc/module-release-process.md
# docs/en/reference/dataobject.md
# docs/en/reference/execution-pipeline.md
# docs/en/reference/grid-field.md
# docs/en/reference/modeladmin.md
# docs/en/reference/rssfeed.md
# docs/en/reference/templates.md
# docs/en/topics/commandline.md
# docs/en/topics/debugging.md
# docs/en/topics/email.md
# docs/en/topics/forms.md
# docs/en/topics/index.md
# docs/en/topics/module-development.md
# docs/en/topics/modules.md
# docs/en/topics/page-type-templates.md
# docs/en/topics/page-types.md
# docs/en/topics/search.md
# docs/en/topics/testing/index.md
# docs/en/topics/testing/testing-guide-troubleshooting.md
# docs/en/topics/theme-development.md
# docs/en/tutorials/1-building-a-basic-site.md
# docs/en/tutorials/2-extending-a-basic-site.md
# docs/en/tutorials/3-forms.md
# docs/en/tutorials/4-site-search.md
# docs/en/tutorials/5-dataobject-relationship-management.md
# docs/en/tutorials/building-a-basic-site.md
# docs/en/tutorials/dataobject-relationship-management.md
# docs/en/tutorials/extending-a-basic-site.md
# docs/en/tutorials/forms.md
# docs/en/tutorials/index.md
# docs/en/tutorials/site-search.md
# main.php
# model/SQLQuery.php
# security/ChangePasswordForm.php
# security/MemberLoginForm.php
# tests/control/ControllerTest.php
# tests/core/startup/ParameterConfirmationTokenTest.php
# tests/model/SQLQueryTest.php
# tests/security/SecurityTest.php
# tests/view/SSViewerTest.php
# view/SSTemplateParser.php
# view/SSTemplateParser.php.inc
# view/SSViewer.php
2016-01-20 13:16:27 +13:00
952896e638
Update translations
2015-12-23 13:22:38 +13:00
1e1a7a345c
Merge remote-tracking branch 'origin/3'
...
Conflicts:
control/Director.php
filesystem/File.php
filesystem/GD.php
filesystem/ImagickBackend.php
forms/HtmlEditorField.php
javascript/UploadField_uploadtemplate.js
model/Image.php
model/Image_Backend.php
model/fieldtypes/Enum.php
templates/AssetUploadField.ss
tests/model/ImageTest.php
tests/search/FulltextFilterTest.php
2015-11-03 14:23:16 +13:00
1f64631bfc
Update asset admin toolbar
2015-10-23 17:39:42 +13:00
0cd3569fb9
Update translations
2015-10-06 18:33:16 +13:00
3f85c57013
Move 'upload new file' section to main files area
...
Optimise and fix drag drop on upload fields
Combine 3 tabs from the 'insert media' dialog box into 1
2015-09-28 12:02:33 +13:00
00caeb700d
Added 3.1.14 changelog
...
Update translations
2015-09-15 10:58:15 +12:00
92f9af1984
Update translations
2015-09-02 11:15:53 +12:00
53c40a94fa
API Enable re-authentication within the CMS if a user session is lost
...
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
2014-10-14 15:19:48 +13:00
627e3cdf11
Revert entity name change
...
Partially reverts b0f38f4990
2013-12-19 23:13:13 +01:00
23371b01aa
"lost password" translation master ( fixes #2725 )
2013-12-19 20:00:59 +01:00
ca0c56e203
Updated translation masters
...
Fixed two inconsistenties with missing namespaces in templates.
2013-12-19 19:51:25 +01:00
b0f38f4990
Change default message to be credential agnostic.
2013-10-11 11:22:15 +13:00
dc7e2df20a
Corrected translation references in templates
...
Were using old entity naming scheme (*.ss) instead
of underscored version which doesn't create a new YML
namespace. This means all existing translations should indeed be used.
Was already fixed in master, but not in 3.1
2013-10-06 23:25:47 +02:00
750b5b4079
Updated translation master file
2013-08-09 14:18:10 +12:00
afe06661ef
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
admin/templates/Includes/ModelAdmin_ImportSpec.ss
admin/templates/Includes/ModelAdmin_Tools.ss
admin/templates/LeftAndMain.ss
admin/templates/ModelSidebar.ss
i18n/i18n.php
templates/ComplexTableField.ss
templates/ComplexTableField_popup.ss
templates/FileIFrameField_iframe.ss
templates/Includes/GridFieldItemEditView.ss
templates/Includes/TableListField_PageControls.ss
templates/RelationComplexTableField.ss
templates/TableField.ss
templates/TableListField.ss
2013-08-07 17:14:47 +02:00
eee32b7f3c
Update en.yml
...
Added missing string Security.LOSTPASSWORDHEADER
2013-08-07 11:06:20 +02:00
00ffe72944
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
issues with unknown locales in Zend's CLDR database
2013-08-07 00:25:16 +02:00
b58e2dbe3a
Member.lock_out_delay_mins configurable, password security docs
2013-07-11 09:47:28 +02:00
95a206290f
Updated translations
2013-06-03 00:07:59 +02:00
933fbf8ea4
l10n key to make "yes" and "no" translatable (see #1749 )
2013-04-12 01:11:24 +02:00
6c7e3afab3
Updated translations
2013-01-21 12:57:15 +01:00
661a4a2492
Removed direct sprintf() usage from _t() calls
...
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
2012-12-21 11:46:38 +01:00
3b59d4a762
Updated translations
2012-12-17 11:45:09 +01:00
50d6296a7d
Updating default en.yml translations
2012-11-07 11:42:08 +13:00
1861751ff3
Updated translations
2012-11-05 11:42:15 +13:00
71c20be997
Updating default en.yml with updated entities
2012-11-05 11:16:14 +13:00
434f03df79
Updated translations
2012-09-12 10:55:24 +02:00
ea9041df54
Localization for "cancel" button in GridFieldDetailForm
2012-09-11 14:36:07 +02:00
0a6a3fa936
i18n for file type descriptors (see #7798 )
2012-08-27 00:02:52 +02:00
3b592122fd
i18n for "select an anchor" string (see #7798 )
2012-08-26 23:58:31 +02:00
f0340e698f
Updated translations
2012-08-20 22:01:36 +02:00
5f94d23000
ENHANCEMENT: Ntfcatn. image embedding(trac #7438 )
...
Adding an additional warning / notification message, when author embedds an external image.
2012-08-16 21:03:37 +02:00
701da8b822
Updated translations; i18n for fieldLabels
2012-08-15 20:30:30 +02:00
94b739e847
Updated translations
2012-08-12 22:49:51 +02:00
52e05f27bb
BUG Re-added singular/plural name i18n entities
...
Previously "hidden" by inability of i18nTextCollector
to autoload classes in order to introspect them.
2012-08-06 14:03:51 +02:00
981352d126
Updated translations
2012-07-25 13:26:51 +12:00
86a2ff501a
MINOR Updated translations master
2012-06-25 00:50:40 +02:00
5462cdaab2
MINOR Removing "." from the end of validation messages
2012-06-01 13:13:06 +12:00
e017813e6e
MINOR: Updated en langfile
2012-05-25 10:40:12 +12:00
bb29ff3611
FEATURE: Allow adding media to the CMS using oEmbed
2012-05-24 17:00:21 +12:00
063f6bcff5
MINOR Updated language master
2012-05-21 08:24:55 +02:00
6bb1218760
MINOR: Update entities via collector script.
2012-05-18 16:15:13 +12:00
c1f7e0ed48
BUGFIX #7298 Fixed incorrect message in GridFieldDetailForm from en.yml language file.
2012-05-10 15:46:54 +12:00
f2d2f5bb0e
MINOR Changed CMS section name from "Users" back to its 2.4 label, "Security". Mainly to avoid breadcrumb weirdnesses when having a "Users/Users/My User" path. Signed off by Paul.
2012-05-08 11:25:47 +02:00
f7e19ca680
BUGFIX i18nTextCollector finds templates recursively, not only in <module>/templates folder. Added master language entities which were previously overlooked due to this bug.
2012-05-03 17:45:25 +02:00
7b18d9d0da
MINOR Switching _t() calls from sprintf() to using injection parameters ( #7170 )
2012-05-01 22:17:00 +02:00
f48346d458
MINOR Regenerating lang master files with fixed entity collection logic (fixes "CMSPagesController" menu title in interface)
2012-04-27 10:12:09 +02:00
2c3c410823
MINOR Updating language master files (slightly different format due to generation through i18nTextCollector, rather than the i18n_yml_converter module)
2012-04-27 00:02:35 +02:00
baae13c672
MINOR Fixing default en string for FROMCOMPUTER
2012-04-19 12:01:09 +12:00
63d91f9a26
BUGFIX Fixing broken labels in UploadField
2012-04-19 11:58:06 +12:00
92054fbc07
ENHANCEMENT Updated YML translations from translate.ss.org, removed unapproved langs with little or no translations, updated master strings, fixed line break problem in lang files generated by i18nYMLConverter module
2012-04-18 13:36:52 +02:00
5bb31c4e81
BUGFIX Stop "Insert Link" or "Insert Image" header disappearing inside the HtmlEditorField toolbar
...
when clicking a link type
2012-04-17 15:47:40 +12:00
1aa919d3a7
MINOR Fixed broken SecurityTest, missing entry in en.yml for ERRORWRONGCRED
2012-04-16 12:48:26 +12:00
f61dbfda09
MINOR Updated lang file to new generated YML format
2012-04-15 18:09:02 +02:00
6c1c98e3b3
MINOR Converted YML lang files
2012-04-15 17:17:14 +02:00
Daniel Hensby
Daniel Hensby
Damian Mooyman
Dan Hensby
Christopher Joe
Chris Joe
Paul Clarke
Ingo Schommer
Frank Mullenger
Tim Kung
Jean-Fabien Barrois
scott1702
Damian Mooyman
Will Rossiter
Sam Minnee
wernerkrauss
Sean Harvey
mightycoco
Roland Lehmann
Hamish Friedlander
Simon Welsh