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,728 Commits 31 Branches 527 Tags 162 MiB
3620d01998
Commit Graph

12728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
34c5cb8d1b Added index docs to DataObject 
Thanks to @oddnoc for getting this started, see
https://github.com/silverstripe/silverstripe-framework/pull/2686
 2013-12-13 12:09:48 +01:00
Ingo Schommer
c811556ea5 Removed debug code 2013-12-13 10:04:26 +01:00
Ingo Schommer
8d796cbea0 Merge pull request #2679 from micmania1/2658-get-templates-with-suffix 
API: moved getTemplatesWithSuffix functionality out into a SSViewer
 2013-12-12 13:39:13 -08:00
Sean Harvey
d81c3570af Merge pull request #2714 from chillu/pulls/validate-write-message 
Leave original ValidationException intact in write()
 2013-12-10 16:36:13 -08:00
Ingo Schommer
be5484b1d2 Leave original ValidationException intact in write() 
If we want DataObject->validate() to be used instead of
the form layer, we should allow for validation errors
to be passed through unchanged to the controller layer
so we can present them to the user. The context of
which class is written should be apparent from the stacktrace
of the exception.
 2013-12-11 00:41:05 +01:00
Ingo Schommer
3566581a86 Added .content styles to debug.css, removed fieldset styling 2013-12-10 16:51:07 +01:00
Hamish Friedlander
050115f431 FIX Dont pop up basic auth dialog when trying to flush and isDev=1, just redirect to Security/login like normal 2013-12-10 10:35:03 +13:00
Will Rossiter
d3838410e3 Merge pull request #2708 from chillu/pulls/addsearchparams 
Merge query strings in $.path rather than duplicating
 2013-12-08 20:27:52 -08:00
Firesphere
82fe21ff23 Merge branch 'feature/force_write_js_to_bottom' of https://github.com/Firesphere/silverstripe-framework into feature/force_write_js_to_bottom 2013-12-07 15:48:00 +01:00
Firesphere
41371fea72 NEW Force the javascripts to be put before the closing body tag 2013-12-07 15:47:31 +01:00
Firesphere
14447b167a IMPROVEMENT/FEATURE Forcefully write javascripts to the end of the HTML if wanted. 
It's defaulted to false. But when set to true, the JS is written to the end of the HTML, even though there are earlier scripts.
This results in faster page-loading if the JS isn't needed earlier-on.
 2013-12-07 15:47:27 +01:00
Firesphere
261aae3b8b Git is complaining about a non-existing commit 2013-12-07 15:43:38 +01:00
Firesphere
bdf0130eda NEW Force the javascripts to be put before the closing body tag 2013-12-07 15:39:07 +01:00
Firesphere
f9e9614a4f IMPROVEMENT/FEATURE Forcefully write javascripts to the end of the HTML if wanted. 
It's defaulted to false. But when set to true, the JS is written to the end of the HTML, even though there are earlier scripts.
This results in faster page-loading if the JS isn't needed earlier-on.
 2013-12-07 15:39:05 +01:00
Ingo Schommer
41031900f9 Merge query strings in $.path rather than duplicating 
Fixes common duplications like ?locale=en_US&locale=en_US,
triggered e.g. by gridfield's showDetailView().

See https://github.com/silverstripe/silverstripe-translatable/issues/154
 2013-12-07 11:14:46 +01:00
Sean Harvey
ac1220758e Merge pull request #2707 from wilr/enums 
Tidy up enum matching where classname is missing
 2013-12-06 15:44:57 -08:00
Will Rossiter
20e082d00e Tidy up enum matching where classname is missing 2013-12-07 12:18:58 +13: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
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
Andrew Short
b7b041b435 FIX: Only unregister the relevant class when adding an extension. 
This fixes an issue where the Config instance could not be injected, as
it would be immediately cleared.
 2013-12-01 22:25:19 +11:00
Andrew Short
aeb8814ddc Don't set all injector instances to the global instance. 2013-12-01 22:24:40 +11:00
micmania1
b89ab1eb16 Added SSViewer::get_templates_by_class() to make the functionality in LeftAndMain::getTemplatesWithSuffix() more open. 2013-12-01 07:42:37 +00: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
madmatt
bebe0f6e37 Updating @package and @subpackage doc tags 2013-11-29 17:49:30 +13:00
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