tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-06 11:29:27 +02:00
Code Issues Projects Releases Wiki Activity
12,683 Commits 29 Branches 517 Tags 147 MiB
740560c487
Commit Graph

12683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
740560c487 Fixed merge errors 
- HTML identifier changes in master breaking tests
- Regression from b6b3cd9889 in GridFieldSortableHeader (var capitalisation)
 2013-12-06 15:37:51 +01:00
Ingo Schommer
b1fa2d282e Merge remote-tracking branch 'origin/3.1' 2013-12-06 13:04:56 +01:00
Will Rossiter
8ad172cff5 Merge pull request #2704 from Juanitou/patch-1 
Typography review
 2013-12-05 18:57:55 -08:00
Will Rossiter
999af8d9cf Merge pull request #2705 from ditorelo/patch-1 
Updating SearchContext documentation
 2013-12-05 18:53:42 -08:00
Diogo Freire
8f8a200496 Updating SearchContext documentation 
PaginatedList::setPageSize and PaginatedList::setTotalSize don't exist.
 2013-12-06 15:45:38 +13:00
Juan Molina
d327fc4029 Typography review 2013-12-05 21:20:49 +01:00
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
Ingo Schommer
a7ad85c2a8 Better "editable page" Behat assertion 2013-12-02 19:07:14 +01:00
Ingo Schommer
7136daa56d Merge pull request #2701 from DirtyHarri/patch-1 
Update i18n.js
 2013-12-02 09:31:12 -08:00
Ingo Schommer
808a1a13a0 Merge pull request #2702 from camfindlay/patch-1 
DOCS: Missing 's' in Mentors cause of some confusion in tutorial.
 2013-12-02 09:19:37 -08:00
camfindlay
8aaee578ca DOCS: Missing 's' in Mentors cause of some confusion in tutorial. 2013-12-02 16:05:45 +13:00
Sean Harvey
6ea59e68ad Merge pull request #2699 from wilr/restfultimeout 
FIX: allow CURLOPT_CONNECTTIMEOUT to be configured.
 2013-12-01 12:11:55 -08:00
Andreas Harrenberg
64539a051b Update i18n.js 
When looking for a translation, the fallback solution (CurrentLocale -> defaultLocale -> fallbackString) does not work for cms/javascript/CMSMain.Tree.js as localization for this part was changed to short locale names (e.g. de_DE -> de). (Don't know why...)

The original fallback solution will not find a translation for e.g. "Tree.ShowAsList" in the de-language file. For this entry there is also no fallbackString defined, so the menu in the CMS (right click on a page) is broken for each language that does not have the translation included.

I added another fallback level where the short version of the default language (en_US -> us) is searched before falling back to the fallbackstring and then finally giving up...
 2013-12-01 17:48:59 +01:00
Will Rossiter
0d493d4eff FIX: allow CURLOPT_CONNECTTIMEOUT to be configured. 2013-12-01 15:13:22 +13:00
Ingo Schommer
df2d59df1c Use more solid getValue() in Behat assertions 
getAttribute('value') behaves inconsistently with Selenium drivers
(fails on Travis and TeamCity, but works locally). Selenium2Driver
in Mink provides a JS wrapper for getting the value, which is more reliable.

This fixes "insert a link" failures, see https://travis-ci.org/silverstripe/silverstripe-cms/jobs/14281251
 2013-11-30 13:27:20 +01:00
camfindlay
fd41112d15 DOCS: Update to Tutorial 2 
Was missing allowed_actions as per 3.1 requirement.
Thanks to Stefanovic72 for posting on the forum :)
 2013-11-29 23:57:16 +01:00
Ingo Schommer
46d662fe31 Docs for Requirements::block() 
https://github.com/silverstripe/silverstripe-framework/pull/2685/files
Thanks to @Firesphere for staring this!
 2013-11-29 18:27:43 +01:00
Ingo Schommer
73eae2990f Merge pull request #2683 from tractorcow/pulls/2682-fix-gridfieldsortableheader 
BUG Fixes #2682 - Regression in #2595
 2013-11-29 09:17:39 -08:00
Ingo Schommer
bdff9566ea Merge pull request #2696 from sanjaymundhra/patch-3 
Update secrity.md
 2013-11-29 01:18:31 -08: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
Ingo Schommer
74dd0a528d Merge pull request #2695 from sanjaymundhra/patch-2 
Update Page-types.md
 2013-11-29 00:56:58 -08:00
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
Sean Harvey
3a8833ec28 Fixing broken manage-users behat test. 
"ADMIN group" is created by default, but assertions are checking
for "Admin Group".
 2013-11-29 14:51:46 +13:00
Sean Harvey
cfc009964c Fixing undefined step caused by change in behat-extensio module. 2013-11-29 14:17:04 +13:00
Ingo Schommer
eaa390b1de Merge pull request #2692 from sheadawson/formfieldhook 
MINOR added onBeforeRender extension hook to FormField
 2013-11-28 16:48:18 -08:00
sheadawson
759cb2dd6d MINOR added onBeforeRender extension hook to FormField 2013-11-29 11:20:30 +11:00
Ingo Schommer
2fbe8d325b Merge pull request #2689 from halkyon/checkboxsetfield_test 
Adding test for CheckboxSetField saving into a text DB field.
 2013-11-28 15:06:25 -08:00
Sean Harvey
761cc63e19 Adding test for CheckboxSetField saving into a text DB field. 2013-11-29 11:38:07 +13:00
Ingo Schommer
ad14996040 Merge pull request #2690 from sanjaymundhra/patch-1 
Update form.md
 2013-11-28 04:02:53 -08:00
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
Andrew Short
608745ac25 Merge pull request #2688 from wilr/spiltclasses 
Separate out SS_Query and MySQLQuery from their Database classes
 2013-11-27 15:36:53 -08:00
Will Rossiter
ed61dd848e Separate out SS_Query and MySQLQuery from their Database classes 
Coding conventions state one class per file (unless it uses an _ to indicate related classes.
 2013-11-28 11:55:25 +13:00
Damian Mooyman
7636699c9f BUG Fixes #2682 - Regression in #2595 causing gridfield headers to break on summary_fields containing field methods 2013-11-27 18:43:27 +13:00
Ingo Schommer
305fea8163 Merge pull request #2660 from icecaster/patch-1 
Scaffolded Enum Search fields dont offer a null selection
 2013-11-22 11:55:56 -08:00
Ingo Schommer
784c766ee6 Revert "Don't rely on Behat/Selenium returning 'value' for textarea" 
This reverts commit 8245125349.
 2013-11-22 20:38:56 +01:00
Ingo Schommer
7e291133a0 Merge pull request #2663 from ajshort/has-many-prepopulate 
NEW: Pre-populate and disable foreign key field on has many lists.
 2013-11-22 11:18:11 -08:00
Ingo Schommer
053258b984 Merge pull request #2595 from kinglozzer/gridfield-sort-relation 
NEW: GridField can sort on relation columns
 2013-11-22 11:14:12 -08:00
Ingo Schommer
8245125349 Don't rely on Behat/Selenium returning 'value' for textarea 
Technically a textarea DOM node doesn't have a 'value' attribute,
but rather a HTML content. This used to work, but likely broke either
by updated browser handling or updated selenium logic.
Fixes "Scenario: I can edit title and content and see the changes on draft"
 2013-11-22 20:05:17 +01:00
Ingo Schommer
556090ccfa Generic “cancel” button behaviour with History.back() 
Used in “add page” dialog. See https://github.com/silverstripe/silverstripe-cms/pull/793 for context
 2013-11-22 12:47:35 +01:00
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
Ingo Schommer
c6cf023b42 Merge pull request #2650 from Zauberfisch/GridFieldAddExistingAutocompleter 
Implove GridFieldAddExistingAutocompleter->doSearch() html output
 2013-11-21 04:42:28 -08:00
Ingo Schommer
358fd7eb4b Merge pull request #2675 from martinduparc/patch-1 
Update server-requirements.md
 2013-11-20 09:11:14 -08:00
Martin D.
b75064c09c Update server-requirements.md 
Typo fix
 2013-11-20 11:40:00 -05:00
Sean Harvey
be99d1532b Merge pull request #2674 from chillu/pulls/friendlyerror-contenttype 
FIX text/html type for Debug::friendlyError() in live mode
 2013-11-18 12:09:59 -08:00
Ingo Schommer
cbc45c0db3 Merge pull request #2671 from wilr/ssmapfixes 
API: Implement SS_Map::push() to append values.
 2013-11-18 08:06:57 -08:00
Ingo Schommer
a0dbfc61b6 FIX text/html type for Debug::friendlyError() in live mode 
Avoid unparsed HTML responses in case of httpError(4xx) or
httpError(5xx) in live mode. The SS_HTTPResponse_Exception constructor
automatically set "text/plain" a content type, which conflicts
with the later choice of Debug::friendlyError() to return HTML.

This is a hotfix, needs more work to properly separate
logic flow from presentation concerns (e.g. through request processors).
 2013-11-18 16:02:12 +01:00
Will Rossiter
0e89c4b6cd API: Implement SS_Map::push() to append values. 
FIX: SS_Map::count() not taking into account additional firstItems
 2013-11-18 20:38:57 +13:00
Sean Harvey
b48b08bb8d Merge pull request #2672 from tiaitsch85/tiaitsch85-patch-1 2013-11-18 14:37:09 +13:00
websTTer
cd3cc1b923 Fix installer isIIS() to include IIS versions greater than 7. 2013-11-18 14:34:32 +13:00