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
13,778 Commits 31 Branches 527 Tags 162 MiB
0b1f297873
Commit Graph

60 Commits

Author SHA1 Message Date
Damian Mooyman
0b1f297873 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
 2014-11-18 12:45:54 +13:00
Michael Strong
a401db2d34 Duplicated content 
For some reason the quick fire dos and donts were duplicated.
 2014-10-15 12:47:55 +13:00
Nicolaas
ea62bf9eed Adding link to UserVoice 2014-09-26 11:07:38 +12:00
Ingo Schommer
5c9e88b9a0 Updated contrib docs, mention "DO NOT MERGE" pull requests 
These should be avoided because they undermine the process of
peer review and merging in github, we should strive to have
zero open pull requests, as opposed to treating it as a stage
for work in progress. Intermediary code review can happen in github forks instead.

Also remove some checklist items which were based on the Trac bugtracker,
e.g. its not longer possible to assign yourself to issues because
of github's limited permission abilities.
 2014-08-25 08:29:25 +12:00
Mateusz Uzdowski
8bf3853887 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
 2014-08-14 09:08:26 +12:00
Ingo Schommer
48dd233050 Removed link to outdated docs mailinglist 2014-07-28 08:56:21 +12:00
Ingo Schommer
4af9143d3b Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/code.md
 2014-02-07 16:43:22 +13:00
Kirk Mayo
632884252b NEW: Updating out of date URLs in the framework source code and docs 2014-02-07 15:10:44 +13:00
camfindlay
39ed36dad6 Typo, duplicate silverstripe-documentation 2014-01-09 19:53:42 +13:00
Simon Welsh
39d42e4ea3 Merge branch '3.1' 2014-01-09 08:22:47 +13:00
Sriram Venkatesh
efa309c977 Corrects Broken Link 2014-01-09 08:20:34 +13:00
Andrew Short
bedf292612 Merge branch '3.1' 
Conflicts:
	docs/en/reference/execution-pipeline.md
	lang/nl.yml
 2013-11-11 18:18:25 +11:00
Ingo Schommer
2575450cc5 Added "be inclusive" sentence to contrib docs 2013-10-30 23:33:42 +01:00
Ingo Schommer
328a98dd25 Note about API changes on master 2013-10-28 21:01:12 +01:00
Ingo Schommer
f65629ab73 "House rules" docs 2013-10-25 12:49:51 +02:00
Ingo Schommer
2c145cd454 API JS i18n files with short locale names, generated by build task 
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.

See b59f3858af for generator logic.

Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
 2013-10-25 12:05:46 +02:00
Loz Calver
01746d175a Update docs to consistently use http://localhost/ (fixes #1919) 2013-10-23 20:24:52 +01:00
Ingo Schommer
fad8926785 Better definition of "pre-release" branch in docs 2013-10-22 16:20:00 +02:00
Ingo Schommer
927dd6c606 Removed duplicate "quickfire" section in docs 2013-10-22 16:20:00 +02:00
Ingo Schommer
455e550d9a Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/topics/testing/create-silverstripe-test.md
	forms/Form.php
	i18n/i18n.php
	model/Image.php
 2013-09-27 19:22:14 +02:00
Ingo Schommer
b404e55533 Added link to translation CI 2013-08-22 18:02:02 +02:00
Ingo Schommer
2a35f2f928 Merge remote-tracking branch 'origin/3.1' 2013-08-07 17:34:11 +02:00
Ingo Schommer
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
Ingo Schommer
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
Simon Welsh
fbce9fd7cd Merge branch '3.1' 
Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js
 2013-07-05 10:22:58 +12:00
Simon Welsh
d844c74e3c Merge branch '3.0' into 3.1 
Conflicts:
	.travis.yml
	control/HTTP.php
	email/Mailer.php
	tests/control/HTTPTest.php
 2013-07-05 10:17:14 +12:00
Ingo Schommer
2a4fd90316 Docs: Note about branch merging 2013-06-25 10:35:30 +02:00
Ingo Schommer
94b4237372 Merge remote-tracking branch 'origin/3.1' 2013-06-19 11:17:33 +02:00
Will Rossiter
8fca3799c3 Update module development, remove outdated release steps 2013-06-15 12:06:25 +12:00
CheeseSucker
89a272b291 [MINOR] Changed so that ä is displayed as ä as intended by author. 2013-06-15 02:23:01 +03:00
CheeseSucker
9c6b58d206 Fixed typo. 2013-06-15 00:28:02 +02:00
Sam Minnee
d97ca43cd0 Merge branch '3.1' 
Conflicts:
	README.md
	dev/install/install.php5
	forms/ConfirmedPasswordField.php
	tests/forms/FormTest.php
 2013-05-23 19:01:58 +12:00
Ingo Schommer
a87bbb2903 Updated github path 2013-05-17 00:45:52 +02:00
Ingo Schommer
a35de54882 Updated github path 2013-05-17 00:41:16 +02:00
Ingo Schommer
f8ee3e1b73 Merge pull request #1742 from svandragt/patch-1 
Clarified the context of the step-by-step process
 2013-04-14 13:27:16 -07:00
Ingo Schommer
f514067f2f Updated commit message usage to reflect github best practices 2013-04-11 17:35:55 +03:00
Ingo Schommer
0343a77d30 Merge remote-tracking branch 'origin/3.1' 2013-04-11 11:42:04 +02:00
Sander van Dragt
7b49425e16 Clarified the context of the step-by-step process 
Also limited the dependency on branching of 'master' to make the example more versatile and consistent with the best practice in this document.
 2013-04-09 16:51:20 +02:00
Matt Lewandowsky
d613ba0593 Provide guidance for cross-repo issue referencing 2013-04-05 04:57:09 -07:00
Ingo Schommer
a0f0e9bce3 Update translation.md 2013-04-04 17:44:40 +03:00
Ingo Schommer
ef3d974821 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
 2013-04-02 02:05:58 +02:00
Ingo Schommer
f5754c11aa Contribution guidelines, new bugtracker links 2013-04-02 01:51:40 +02:00
Dan
9b056456a1 Minor: Update "Editing Online" 
Adding emphasis to the "Edit this page" feature, and ensuring it comes before the more difficult option of locating the .md file manually.
 2013-03-30 03:03:50 -03:00
Ingo Schommer
b0d3f7f3a2 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	api/RSSFeed.php
	dev/SapphireTest.php
	tests/control/RequestHandlingTest.php
 2013-03-26 10:46:41 +01:00
Ingo Schommer
72d5f3cf17 Composer contribution fork/upstream docs (fixes #8332) 2013-03-20 11:37:41 +01:00
Andrew Short
bc941c18b6 Merge branch '3.1' 2013-03-15 21:58:37 +11:00
Dan
7d35d899fb Fixed link and added branch direction 
Broken link to edit docs, perhaps should link to repo instead of directory to avoid having a branch in the URL.  Also added blurb to clarify what branch doc edits should occur in.
 2013-03-08 10:24:49 -05:00
Ingo Schommer
ce66bc1eaf Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/travis/before_script
 2013-02-27 13:34:03 +01:00
Ingo Schommer
67b2d3faa0 Added note on module translations 2013-02-20 13:32:27 +01:00
Ingo Schommer
786d0516da More docs on CMS issue reporting 2013-01-22 15:10:50 +01:00