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
12,677 Commits 31 Branches 527 Tags 162 MiB
6176d65bd2
Commit Graph

278 Commits

Author SHA1 Message Date
Ingo Schommer
6176d65bd2 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	forms/gridfield/GridFieldSortableHeader.php
	model/DataList.php
	model/fieldtypes/Enum.php
 2013-12-02 20:49:34 +01:00
sanjay
a0abeab6d5 Update secrity.md 
The following line is repeated in the section "Don't allow access to .yml files "

See [Apache](/installation/webserver) and [Nginx](/installation/nginx) installation documentation for details 
specific to your web server
 2013-11-29 14:45:53 +05:30
sanjay
c931b6f58a Update Page-types.md 
In the TEMPLATES ....sub-heading..Adding Database Fields ..
     
      IN the line below..
Every time you run db/build to recompile the manifest........

change db/build to dev/build.
 2013-11-29 11:55:23 +05:30
sanjay
61689bca8b Update form.md 
Under the heading ...THE FORM....
 Instantiating a form....
$controller..
  replace and to an.
 2013-11-28 16:27:01 +05:30
Ingo Schommer
70207b0c98 Merge pull request #2626 from Zauberfisch/filterByCallback 
filterByCallback added to SS_Filterable interface and implemented in ArrayList
 2013-11-21 05:34:36 -08:00
Zauberfisch
d9b74874fc added filterByCallback() to interface SS_Filterable and all implementing classes 2013-11-21 13:03:18 +00: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
91f6039eed Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/Director.php
 2013-11-05 10:15:40 +01:00
Ingo Schommer
65b4407337 FIX "Draft" stage to fix dev/build, Versioned docs (fixes #2619) 2013-11-03 21:27:26 +01: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
Ingo Schommer
68888f9105 Merge pull request #2592 from kinglozzer/docs-localhost-urls 
Update docs to consistently use http://localhost/ (fixes #1919)
 2013-10-23 12:37:53 -07:00
Loz Calver
01746d175a Update docs to consistently use http://localhost/ (fixes #1919) 2013-10-23 20:24:52 +01:00
Ingo Schommer
d02df71680 Document how to enable TinyMCE context menu 
Required since https://github.com/silverstripe/silverstripe-framework/pull/2591
 2013-10-23 19:59:17 +02:00
Ingo Schommer
b56ca812dc Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/security/MemberTest.php
 2013-10-23 14:53:29 +02:00
Ingo Schommer
634f73c710 Merge pull request #2395 from ARNHOE/patch-1 
i18n documentation - added note for caching in multi language modules
 2013-10-23 03:02:06 -07:00
Ingo Schommer
25b6175e67 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	forms/FormField.php
 2013-10-20 13:52:56 +02:00
Ingo Schommer
be09129742 $i18nScriptDirection template placeholder 
Optional RTL support based on Zend_Locale data.
Not set in CMS by default because it breaks the layout
quite badly without deep CSS modifications.
 2013-10-16 00:05:33 +02:00
Devlin
5ea314d012 FIX PasswordValidator->characterStrength() Documentation 2013-10-15 12:44:50 +02:00
Ingo Schommer
b5cee452b5 Merge pull request #2495 from madmatt/patch-1 
Update datamodel.md to use an array argument to Enum instead of the more...
 2013-10-10 04:13:09 -07:00
Ingo Schommer
b367dd6237 API Removed Member.LastVisited and Member.NumVisits 2013-10-10 12:35:07 +02:00
Ingo Schommer
6e8ec778c3 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	lang/en.yml
 2013-10-07 16:19:40 +02:00
Ingo Schommer
795d3e4b3b Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	dev/install/install.php5
	docs/en/index.md
	tests/core/CoreTest.php
 2013-10-07 16:18:20 +02:00
madmatt
951152e1c6 Update datamodel.md to use an array argument to Enum instead of the more error-prone string 
The previous argument to the Enum was: 
"Status" => "Enum('Active, Injured, Retired')"

This would cause issues where the 'Injured' and 'Retired' statuses would actually be stored in the database as ' Injured' and ' Retired' respectively, at least in 3.0.

Using an array() to specify the enum, and using normal array syntax (albeit within a string) is less likely to cause errors.
 2013-10-05 00:53:08 +13:00
Sean Harvey
0e5eb54fb5 Updating unit and integration testing documentation. 
Updating introduction summary, and fixing broken links.
 2013-10-04 14:29:14 +13:00
Sean Harvey
5e5a2f8845 Merge pull request #2288 from chillu/pulls/browser-spellcheck 
API Disable discontinued Google Spellcheck in TinyMCE (#2213)
 2013-10-03 14:42:45 -07: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
2e3511bc5f Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	docs/en/changelogs/3.0.6.md
	forms/Form.php
	forms/FormField.php
	forms/TreeDropdownField.php
 2013-09-27 18:50:47 +02:00
moveforward
dd0296413f Fixed typo 2013-09-26 14:41:40 +12:00
Dan Brooks
6145e5914b Don't think the syntax highlighter likes my indentation with spaces. 2013-09-24 21:09:30 +01:00
Dan Brooks
3e5f788ddc Squashing previous corrections into one commit along with a couple more 
corrections to the docs, including changing the example seen in
fixtures.md
 2013-09-24 19:21:04 +01:00
Ingo Schommer
be8ee992b7 getCMSValidator() docs 2013-09-18 14:32:38 +02:00
Dan Brooks
6afad377cb Changes to topics/testing 2013-09-12 18:22:46 +01:00
Ingo Schommer
03d1d58148 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/code/SecurityAdmin.php
	css/AssetUploadField.css
	docs/en/topics/configuration.md
	security/PermissionRole.php
 2013-09-12 17:33:36 +02:00
ARNHOE
68141b6ca0 i18n documentation - added note for caching in multi language modules 2013-09-07 16:10:52 +02:00
Ingo Schommer
9872a52a8d SecurityToken docs 2013-09-05 12:54:31 +02:00
Damian Mooyman
55a7cf6040 Documentation for belongs_to 2013-08-30 10:47:11 +12:00
jbridson
65ad51024d BUGFIX: fixed grammatical errors and formatting issues 2013-08-26 12:18:35 +12:00
Will Rossiter
0ac9eff829 Fix typo in form method name. 2013-08-25 10:59:26 +12:00
Ingo Schommer
a4c6ae3e90 Merge remote-tracking branch 'origin/3.1' 2013-08-22 13:56:33 +02:00
Peter Evjan
76cf3c3ed9 Corrected parameters in model relations example 
An identifier needs to be specified when creating an object with relations, but the example had omitted that.
 2013-08-18 13:24:54 +10:00
Ingo Schommer
542728cd94 Merge remote-tracking branch 'origin/3.1' 2013-08-03 19:47:32 +02:00
Ingo Schommer
31e8ec3795 Docs: Consistent arg quoting in <% require %> (#1614) 2013-08-03 18:44:32 +02:00
Ingo Schommer
0e7231ff60 API Disable discontinued Google Spellcheck in TinyMCE 
Replaced by browser-based spellchecking if available (Chrome, Firefox),
with instructions on how to use PSpell as an alternative.
 2013-08-03 16:16:45 +02:00
Hamish Friedlander
d44024b1cf Merge branch 'origin/3.1' 2013-07-24 13:29:55 +12:00
Will Rossiter
58a2eb0155 Versioned documentation typo (Thanks aragonne) 2013-07-19 18:14:53 +12:00
Hamish Friedlander
0a79ac3592 Merge branch 'origin/3.1' 
Conflicts:
	templates/forms/CheckboxSetField.ss
	templates/forms/FormField_holder.ss
	templates/forms/OptionsetField.ss
 2013-07-19 16:25:38 +12:00
Hamish Friedlander
d38bd7d5cb Merge branch 'origin/3.0' into 3.1 2013-07-19 14:18:49 +12:00
Hamish Friedlander
1298d4a5bd FIX Prevent DOS by checking for env and admin on ?flush=1 (#1692) 2013-07-19 12:24:32 +12:00
Ingo Schommer
d4a1e6d294 BUG Prevent clickjacking in CMS and Security controllers (fixes #2215) 2013-07-14 22:44:09 +02:00
Ingo Schommer
b58e2dbe3a Member.lock_out_delay_mins configurable, password security docs 2013-07-11 09:47:28 +02:00