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
11,864 Commits 31 Branches 527 Tags 162 MiB
07db2e1fd1
Commit Graph

11864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
07db2e1fd1 Only allow positive start values in PaginatedList 
Otherwise the ORM query will fail.
 2013-08-28 17:34:40 +02:00
Ingo Schommer
b404e55533 Added link to translation CI 2013-08-22 18:02:02 +02:00
Ingo Schommer
eb311691be Fixed 3.1-specific switchToWindow() behat feature 2013-08-22 14:10:54 +02:00
Ingo Schommer
4a3a88710f Merge remote-tracking branch 'origin/3.1.0' into 3.1 
Conflicts:
	dev/BehatFixtureFactory.php
	model/Hierarchy.php
	tests/behat/features/bootstrap/FeatureContext.php
	tests/core/CoreTest.php
 2013-08-22 13:00:25 +02:00
Ingo Schommer
40c239076b Merge remote-tracking branch 'origin/3.0' into 3.1.0 
Conflicts:
	model/Hierarchy.php
 2013-08-22 12:55:47 +02:00
Ingo Schommer
54edc0ddac Fix Behat window switching in chrome 
Workaround only, see https://groups.google.com/forum/#!topic/behat/QNhOuGHKEWI
 2013-08-22 12:49:38 +02:00
Ingo Schommer
aa9403b5b0 Merge pull request #2352 from mateusz/loadfragment 
API Provide a thin alternative to loadPanel/submitForm.
 2013-08-22 01:15:42 -07:00
Mateusz Uzdowski
1f8feb5efc API Provide a thin alternative to loadPanel/submitForm. 
This is needed in some situations when we only want to update a
small single component, sometimes even using a different controller to
the one implied in the URL.

An example here is reloading dynamically the subsite dropdown without
reloading the entire page, updating a filter sidebar or suchlike.
 2013-08-22 15:16:13 +12:00
Ingo Schommer
0c859b8587 Merge pull request #2348 from simonwelsh/scrut 
Scrutinizer fixes
 2013-08-21 04:43:12 -07:00
Simon Welsh
c66cc952d2 Correct line length and indentation 2013-08-21 21:27:16 +12:00
Simon Welsh
2c0d03b2d6 Exclude docs and images foldes from Scrutinizer 2013-08-21 21:02:12 +12:00
Simon Welsh
4cb98f1afd Only have Scrutinizer check PHP files 2013-08-21 21:02:12 +12:00
Ingo Schommer
4af619e5a0 Merge pull request #2347 from simonwelsh/3.1 
Scrutinizer fixes
 2013-08-21 01:22:36 -07:00
Simon Welsh
151baeede1 Correct line length and indentation 2013-08-21 18:54:05 +12:00
Simon Welsh
ba6fde6816 Exclude docs and images foldes from Scrutinizer 2013-08-21 18:53:58 +12:00
Simon Welsh
4db6520357 Only have Scrutinizer check PHP files 2013-08-21 17:57:31 +12:00
Sean Harvey
abe09c79e5 Merge branch '3.1.0' into 3.1 2013-08-21 10:39:27 +12:00
Sean Harvey
c461ed51d6 Merge pull request #2346 from hafriedlander/fix/flush_when_secure 
FIX flush when secure
 2013-08-20 15:35:00 -07:00
Hamish Friedlander
a2026add04 FIX flushing on non-dev when Session::cookie_secure is true 2013-08-21 09:50:07 +12:00
Mateusz U
afd3e3f0d0 Merge pull request #2345 from hafriedlander/fix/performance 
Couple of performance fixes - eliminate un-necessary redraws and preview updating
 2013-08-20 14:40:22 -07:00
Hamish Friedlander
0ca4969cda FIX Dont update preview iframe if hidden 
Updating the iframe src when the iframe isnt visible in IE8 causes a
view disconcerting font glitch (and it slows down navigation anyway),
so if the iframe isnt visible, delay setting the src until it is
 2013-08-21 09:29:28 +12:00
Hamish Friedlander
c59305d6d4 FIX Multiple redraw calls on navigation 2013-08-21 09:29:28 +12:00
Ingo Schommer
a6da1f5570 Merge pull request #2294 from wilr/fixgridexport 
FIX: Remove limit on GridField export
 2013-08-20 14:08:18 -07:00
Ingo Schommer
46362175f0 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-08-20 20:59:31 +02:00
Ingo Schommer
a592c36adf Merge remote-tracking branch 'origin/3.0' into 3.1.0 
Conflicts:
	docs/en/changelogs/index.md
 2013-08-20 20:49:01 +02:00
Ingo Schommer
699cbfe851 Merge branch '3.1.0' into 3.1 
Conflicts:
	thirdparty/jquery-entwine/dist/jquery.concrete-dist.js
	thirdparty/jquery-entwine/spec/SpecRunner.html
	thirdparty/jquery-entwine/spec/spec.entwine.eventcapture.js
	thirdparty/jquery-entwine/spec/spec.entwine.namespaces.js
	thirdparty/jquery-entwine/src/domevents/jquery.entwine.domevents.addrem.js
	thirdparty/jquery-entwine/src/jquery.entwine.eventcapture.js
	thirdparty/jquery-entwine/src/jquery.entwine.js
	thirdparty/jquery-entwine/src/jquery.focusinout.js
 2013-08-20 16:58:40 +02:00
Ingo Schommer
a2f9af54c7 Merge pull request #2340 from hafriedlander/fix/memleaks 
Fix some memory leaks in 3.1.0 admin
 2013-08-20 07:28:14 -07:00
Ingo Schommer
2fd5558a70 Fixed "insert image" behat feature 
Was using wrong button label, and ignoring the
"unsaved changes" warning dialog
 2013-08-20 16:19:30 +02:00
Ingo Schommer
351c1168b6 Merge pull request #2314 from mateusz/required-attrs 
HTML5 required attributes on default fields, add validator to the login form
 2013-08-20 06:40:58 -07:00
Ingo Schommer
79d633a320 Merge pull request #2335 from evjan/3.1 
Corrected parameters in model relations example
 2013-08-20 06:28:35 -07:00
Ingo Schommer
99da5cd198 Merge pull request #2336 from hafriedlander/fix/flush_30 
FIX Double slashes in ParameterConfirmationToken
 2013-08-20 06:26:44 -07:00
Ingo Schommer
a1419b2f7e Updated entwine dependency 
And removed unnecessary files, just adds
to the security surface of the webroot.
 2013-08-20 15:19:51 +02:00
Ingo Schommer
6627a19994 Merge branch 'context-menu' of https://github.com/adrexia/framework into adrexia-context-menu 
Conflicts:
	admin/scss/_tree.scss
 2013-08-20 15:04:02 +02:00
Hamish Friedlander
68d8ec31a5 FIX Memory leaks in jstree drag & drop 2013-08-20 16:07:54 +12:00
Hamish Friedlander
fda4b91d06 FIX Make sure CurrentXHR is set back to null on completion 2013-08-20 15:49:37 +12:00
Hamish Friedlander
e282f0b661 FIX Two memory leaks with HtmlEditorField 
We werent calling tinyMCE.Editor.destroy, which is needed to
clean up event bindings. The advanced theme also wasnt cleaning
up after itself on destroy properly
 2013-08-20 15:49:04 +12:00
Hamish Friedlander
13377ee4bd Update jQuery Entwine to latest to pull memory leak fix 2013-08-20 15:17:50 +12:00
Naomi Guyer
e6b06cade4 BUG: Context menu too long - CSS only (Fixes CMS #811) 2013-08-20 11:35:22 +12:00
Hamish Friedlander
4a7aef0e25 FIX Double slashes in ParameterConfirmationToken 2013-08-19 11:35:34 +12: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
Will Rossiter
1621d6afde Merge pull request #2316 from chillu/pulls/editor-brokenlink 
Render broken link in HtmlEditorField
 2013-08-17 17:01:14 -07:00
Will Rossiter
c7bdfcd76a Merge pull request #2293 from robert-h-curry/empty-arraylist 
Preempt fatal errors when making some function calls on an empty ArrayList
 2013-08-17 16:53:48 -07:00
Ingo Schommer
3690ae1658 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	docs/en/changelogs/index.md
 2013-08-16 17:12:12 +02:00
Ingo Schommer
02cc662aaf More specific entwine rule for delete alert in GridField 
The rule didn't apply in Firefox because of how it handles specificity,
so made it a bit more specific (added "button" and ".action")
 2013-08-16 16:06:31 +02:00
Ingo Schommer
d325551079 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-08-16 13:36:34 +02:00
Ingo Schommer
de3b1b22d3 Fixed behat tests for confirming grid field dialogs 2013-08-16 13:34:23 +02:00
Ingo Schommer
362d35742f Fixed behat tests to confirm file deletion dialog 2013-08-16 13:34:23 +02:00
Naomi Guyer
fb67181366 BUG: Context menu too long - CSS only (Fixes CMS #811) 2013-08-16 13:34:23 +02:00
Ingo Schommer
acc07e67ea Merge pull request #2318 from micmania1/2317-gridfieldfilterheader-duplicate-fields 
Added gridField->getName() to field names to avoid duplication
 2013-08-15 15:44:17 -07:00
Sean Harvey
ee509c905c Merge pull request #2326 from chillu/pulls/mysql-create-db-utf8 
UTF8 defaults for MySQLDatabase->createDatabase()
 2013-08-15 15:40:35 -07:00