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
18,414 Commits 31 Branches 527 Tags 162 MiB
738f50c497
Commit Graph

110 Commits

Author SHA1 Message Date
Damian Mooyman
0f90c5b63f ENHANCEMENT Update style of CMSLogin form 2017-06-15 18:13:14 +12:00
Daniel Hensby
a65ae8353a Merge pull request #6879 from mikenz/patch-11 
MINOR: Fix mismatched brackets
 2017-05-11 11:57:46 +01:00
Mike Cochrane
efd1a32a5d MINOR: Fix brackets 2017-05-11 15:55:06 +12:00
Ingo Schommer
0d9b383631 API Removed legacy form fields (fixes #6099) 2017-05-09 11:16:41 +12:00
Aaron Carlino
c99ed2d262 Reorganise i18n keys 2017-05-08 23:34:39 +12:00
Aaron Carlino
7c67d29484 Update translations 2017-05-02 10:46:54 +12:00
Damian Mooyman
8dd3f4ce1d Fix template localisation namespaces (#6852) 2017-05-01 08:28:24 +12:00
Damian Mooyman
2fa7598261 Shift hierarchy namespace i18n key 2017-04-28 14:59:42 +12:00
Damian Mooyman
23710cf23e Run upgrader 2017-04-28 14:59:42 +12:00
Damian Mooyman
7b4b133ad8 Remove unused keys (textcollector with merge=0) 2017-04-28 14:59:42 +12:00
Damian Mooyman
fce38e0f5b Revert yml files to transifex 2017-04-28 14:59:42 +12:00
Aaron Carlino
7b7b3810e6 Merge permission translations back in 2017-04-28 14:59:42 +12:00
Aaron Carlino
20985bc484 alphabetise keys 2017-04-28 14:59:42 +12:00
Uncle Cheese
d51c4891e2 New namespaced i18n keys 2017-04-28 14:59:42 +12:00
Uncle Cheese
494cbd1875 Ran upgrader for lang files 2017-04-28 14:59:42 +12:00
Ingo Schommer
d2132e85db More specific localisations 2017-04-26 22:45:07 +12:00
Damian Mooyman
25c0efea26 Update translations 2017-04-05 16:08:16 +12:00
Saophalkun Ponlu
230e831e4b Translation for add to compaing form 2017-04-04 11:43:40 +12:00
Damian Mooyman
12d10df57a Update translations 2017-03-01 14:08:50 +13:00
Damian Mooyman
de02a3f733
Restored context parameter to i18n, and added to a “comment” key 
Rolled pluralisation functionality into the i18n::_t() method
Warnings on missing default can now be turned off
 2017-01-25 18:12:40 +13:00
Damian Mooyman
8a07c56bdf API Replace i18n message localisation with symfony/translation 
API Implement enhanced pluralisation
Remove Zend_Translate and all Zend dependencies from i18n
Deprecated $context from i18n::_t()
Warn on missing default string for i18n::_t()
 2017-01-25 17:08:12 +13:00
Ingo Schommer
85878192ff Update translations 2017-01-17 16:11:43 +13:00
Ingo Schommer
b06e10c4a8 i18n for new template strings 2017-01-09 14:55:20 +13:00
Daniel Hensby
664c0eafbe
Merge branch '3' 2016-12-28 14:30:54 +00:00
Dan Hensby
e57d7a30bd Update translations 2016-12-16 20:49:05 +00:00
Daniel Hensby
ba39e552a2
Merge branch '3' 2016-12-15 12:20:29 +00:00
Damian Mooyman
2181e3b86b
BUG Fix localisation issues 2016-12-06 11:20:10 +13:00
Daniel Hensby
c6d43b477e
Merge branch '3' 2016-11-29 13:27:49 +00:00
Dan Hensby
50f456eed8 Update translations 2016-11-21 13:27:57 +00:00
Damian Mooyman
ae037b68c6 Update translations 2016-11-03 14:53:52 +13:00
Christopher Joe
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
Damian Mooyman
acc230fc99 Update translations 2016-09-23 16:14:42 +12:00
Chris Joe
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
Paul Clarke
ea2fb1b325 Remove duplicated HTMLEditorField label variables, keep LINKTO label for language upgrade 2016-09-05 10:50:58 +12:00
Paul Clarke
d7e756c4f2 Update labels with more appropriate text 2016-09-02 16:50:13 +12:00
Christopher Joe
c1c20aaafc Breadcrumbs with new icons generated 2016-08-30 14:46:59 +12:00
Christopher Joe
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
Ingo Schommer
84cdb15a5f Simplify "add to campaign" dialog 
Talked to @clarkepaul and simplified to avoid title duplication
 2016-08-28 13:07:31 +12:00
Christopher Joe
a9bdf33ca8 Fix SingleSelect styling, added add to campaign documentation 2016-08-28 13:07:31 +12:00
Paul Clarke
b9445511b7 Bootstrap GridField 2016-08-03 18:35:18 +12:00
Chris Joe
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
Daniel Hensby
cdb0b07345
Merge branch '3' 2016-05-20 14:20:33 +01:00
Damian Mooyman
d125d4e304 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman
19daf8f974 Update translations 2016-05-12 15:37:09 +12:00
Frank Mullenger
b4cd617ee3 FIX: Renaming to HTMLEditorConfig. 
FIX: Renaming to HTMLEditorField*.

FIX: Renaming to HTMLEditorSanitiser*.
 2016-05-06 14:16:34 +12:00
Damian Mooyman
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
Ingo Schommer
c94802ea15 i18n for campaigns section 2016-04-26 15:32:09 +12: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
Jean-Fabien Barrois
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