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,049 Commits 31 Branches 527 Tags 162 MiB
8f31352039
Commit Graph

98 Commits

Author SHA1 Message Date
Ingo Schommer
1121603da9 Documented security pre announce mailinglist 
See https://groups.google.com/forum/#!topic/silverstripe-dev/0mjNBaSP8vE
for details
 2014-02-12 14:37:47 +13: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
Ingo Schommer
f29d51f433 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/reference/dataobject.md
	lang/es.yml
 2013-12-19 20:23:09 +01:00
Ingo Schommer
973d56e57b Updated translation docs to include JS process 2013-12-19 18:00:54 +01: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
aff36c8845 Updated security release process with identifiers 2013-08-13 01:26:24 +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
Ingo Schommer
88536998b9 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
 2013-05-31 18:08:59 +02:00
Che Van Lawrence
657c2033ae Improve docs (mostly spelling) 2013-05-29 18:23:25 +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
5f91c3724d Consistently used dollar notation in template docs (see #1794) 2013-04-26 11:48:59 +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
74df4a5627 Merge pull request #1312 from chillu/pulls/deprecation-docs 
Deprecation docs
 2013-03-21 16:35:48 -07:00
Ingo Schommer
c3854e9e4c Merge pull request #1274 from simonwelsh/update-conventions 
Update conventions
 2013-03-20 03:56:45 -07:00
Ingo Schommer
72d5f3cf17 Composer contribution fork/upstream docs (fixes #8332) 2013-03-20 11:37:41 +01:00
Ingo Schommer
05689a9421 Deprecation docs 2013-03-20 10:20:27 +01:00
Simon Welsh
97df009a41 Correct spelling 2013-03-16 00:06:10 +13:00