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,507 Commits 31 Branches 527 Tags 162 MiB
efbc3b3a81
Commit Graph

13507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Naomi Guyer
46a5ee7d1d CSS: Fix upload field display for preview open 2014-07-25 16:15:49 +12:00
Damian Mooyman
81c0a3499b BUG Remove caching of statements due to risk of instability 
This would cause segfaults in rare situations where statements are reused
 2014-07-25 14:14:59 +12:00
Damian Mooyman
bdec3158ba Merge pull request #3319 from wilr/movetogetoptions 
Moved option list generation to separate method
 2014-07-25 12:51:32 +12:00
Will Rossiter
5a14b7227c Moved checkboxset option list generation to separate method 
This allows subclasses and extensions time to modify the list of options and their configuration without having to override the entire Field method.

A more flexible way to implement silverstripe#3311
 2014-07-25 11:27:14 +12:00
Simon Welsh
76eb3dbfa6 Merge pull request #3306 from tractorcow/pulls/3.2/fix-postgresql 
BUG Fix ORM issues in PostgreSQL / ManyManyList
 2014-07-23 11:15:36 +10:00
Damian Mooyman
0433ba1642 BUG Revert some changes to ManyManyList 
BUG Fix incompatibility in Member_GroupList
Fix regressions in merges from 3.1
BUG Fix Security failing on test classes
BUG Fix postgresql compatibility
Clarify sql encoding of table names
 2014-07-23 12:38:41 +12:00
Damian Mooyman
350ee4d421 Merge pull request #3277 from kopymark/patch-3 
Fix for joins code block
 2014-07-23 08:54:18 +12:00
Mateusz U
59e7f777a2 Merge pull request #3312 from tractorcow/pulls/3.1/extend-htmleditor-parentid 
API Let extensions control folder selector in HtmlEditorField_Toolbar
 2014-07-22 10:20:17 +12:00
Damian Mooyman
4453caf32b API Let extensions control folder selector in HtmlEditorField_Toolbar 2014-07-21 15:52:10 +12:00
Damian Mooyman
4ceadec123 Merge pull request #3308 from camfindlay/patch-9 
DOCS Setting allowed_extensions in YAML
 2014-07-21 08:22:08 +12:00
Cam Findlay
6f08484a90 DOCS Setting allowed_extensions in YAML 
3.1 compatible docs in place of #3267
 2014-07-20 14:25:21 +12:00
Simon Welsh
b7015cca46 Merge pull request #3297 from senorgeno/3282-orm-left-join-sub-select 
BUG #3282: Added ability to subselect with in left or inner join
 2014-07-18 19:15:39 +10:00
Sean Harvey
2a76be490d Merge pull request #3304 from kinglozzer/pulls/filefield-validator-shortcuts 
Move validator “shortcut” methods from UploadField to FileField (fixes #3258)
 2014-07-18 10:04:57 +12:00
Loz Calver
a322f93971 Move validator shortcut methods from UploadField to FileField 2014-07-17 21:40:30 +01:00
Mateusz U
613722053c Merge pull request #3299 from stojg/pull/if-user-logged-out-causes-500-error 
BUG If user is logged out getHtmlEditorConfigForCMS() gets called on non object
 2014-07-17 15:15:30 +12:00
Stig Lindqvist
ac64d258b7 BUG If user is logged out getHtmlEditorConfigForCMS() gets called on non object 
This can happen if the auto-logout feature logs a user out and the user then tries to open another admin or
do an pjax call.
 2014-07-17 14:45:22 +12:00
Damian Mooyman
f16306d843 Merge pull request #3286 from mateusz/destroy-checks 
BUG Make UI widget destroys more consistent to avoid exceptions.
 2014-07-17 14:34:29 +12:00
Mateusz Uzdowski
b34aaca2e8 BUG Fix several issues around onmatch/onunmatch entwines. 
1. Add missing _super calls.

2. Make UI widget destroys more consistent to avoid exceptions.
Selectable would throw an exception in the GridField.js if destroy
called from onunmatch - at that stage jQuery UI would have had called
the destroy already. Add a guard, and change to onremove, which triggers
before the element is removed from DOM.

3. DOM traversal fails after the element is removed from DOM.
Onunmatch triggers after the removal of the element from the DOM, which
makes DOM traversal fail. Use onremove instead, which triggers while the
element is still in DOM.
 2014-07-17 14:14:52 +12:00
Senorgeno
df6a8b6fb6 BUG #3282: Added ability to subselect with in left or inner join 2014-07-17 13:27:28 +12:00
Sean Harvey
cfe8e15da9 Merge pull request #3268 from camfindlay/wamp-docs 
Updating the WAMP docs to latest version and include composer installation notes
 2014-07-17 10:29:39 +12:00
Cam Findlay
081087c977 Updating the WAMP docs to include composer installation and apache 2.4 fix - delete index.php 
Now uses GFM for code blocks.
 2014-07-17 09:58:14 +12:00
Simon Welsh
c14d58f585 Merge branch '3.1' 
Conflicts:
	.travis.yml
	model/ManyManyList.php
	model/fieldtypes/DBField.php
 2014-07-16 21:24:02 +10:00
Simon Welsh
8a3eebf289 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	i18n/i18n.php
 2014-07-16 21:18:07 +10:00
Simon Welsh
cc9603d6a2 Fatal errors should always return false 
This allows PHP to set the exit code on fatals.
 2014-07-16 21:03:55 +10:00
Simon Welsh
1a63fa5b17 Merge pull request #2859 from kinglozzer/gd-resize-crash-mast 
API: Prevent large images from repeatedly crashing PHP on resize
 2014-07-16 20:15:45 +10:00
Loz Calver
791ee7171b API: Prevent large images from repeatedly crashing PHP on resize 2014-07-16 09:18:51 +01:00
Damian Mooyman
80270c521d Merge pull request #3293 from marijnkampf/patch-2 
Removed trailing : from yml example causing error
 2014-07-16 07:24:26 +12:00
Marijn Kampf
3fc371b24a Removed trailing : from yml example causing error 
[Warning] Illegal offset type

Line 597 in \framework\view\Requirements.php
 2014-07-15 09:59:43 +01:00
Damian Mooyman
50a2816c69 Merge pull request #3283 from halkyon/static_fix 
Fixing function that should be declared as static.
 2014-07-11 15:59:35 +12:00
Sean Harvey
3c0967efc0 Fixing function that should be declared as static. 2014-07-11 15:23:44 +12:00
Simon Welsh
28d9b16325 Correct source of Travis status image 2014-07-11 10:36:41 +10:00
Adam Judd
171eb42c9e Fix for joins code block 2014-07-09 22:31:41 +09:30
Simon Welsh
ece95d3580 Merge pull request #1360 from tractorcow/3.2-pdo-connector 
API New Parameterised Database ORM for Silverstripe 3.2. Ticket #7429
 2014-07-09 16:21:37 +10:00
Damian Mooyman
d8e9af8af8 API New Database abstraction layer. Ticket #7429 
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
 2014-07-09 18:04:05 +12:00
Hamish Friedlander
eed2293f31 Merge pull request #3275 from silverstripe/revert-3272-config_fix 
Revert "BUG Config::merge_array_low_into_high() ignores falsey values"
 2014-07-09 10:53:33 +12:00
Damian Mooyman
c26df0b3c6 Revert "BUG Config::merge_array_low_into_high() ignores falsey values" 2014-07-09 09:57:25 +12:00
Sean Harvey
50214abf7f Merge pull request #2998 from torleif/patch-4 
Fix: WYSIWYG now returns valid HTML in tables
 2014-07-08 19:56:16 +12:00
Damian Mooyman
ae7d7516f6 Merge pull request #3272 from halkyon/config_fix 
BUG Config::merge_array_low_into_high() ignores falsey values
 2014-07-08 15:59:22 +12:00
Sean Harvey
16e546300f BUG Config::merge_array_low_into_high() ignores falsey values 
Specific case: LeftAndMain::$session_keepalive_ping = true cannot be
set to false in config.yml for some cases because the value is ignored
when merge_array_low_into_high() is processing the config arrays.
 2014-07-08 15:18:26 +12:00
Sean Harvey
d1d295056b Merge pull request #3265 from stevie-mayhew/images-force-resample 
FEATURE allow force resampling on images
 2014-07-07 11:27:16 +12:00
Sean Harvey
2f188fecc5 Merge pull request #3269 from tractorcow/pulls/3.1/convert-js-enhancements 
Better encoding of javascript
 2014-07-07 09:22:49 +12:00
Damian Mooyman
c30111eee3 Better encoding of javascript 
Fixes #2988
 2014-07-07 09:01:53 +12:00
Damian Mooyman
66b3d1cae7 Upgrading TinyMCE dependency from 3.5.8 to 3.5.11 2014-07-05 15:06:26 +12:00
Sean Harvey
7e45980530 Merge pull request #3266 from tractorcow/pulls/3.1/debug-view 
API Debug::dump in CLI no longer generates HTML. Uses colours.
 2014-07-05 14:48:00 +12:00
Damian Mooyman
3c5e51a9f1 API Debug::dump in CLI no longer generates HTML. Uses colours. 
API Column size is configurable in DebugView
 2014-07-05 14:37:06 +12:00
Sam Minnée
14faf95f35 Fixed wrong variable name in modeladmin docs 2014-07-05 14:34:42 +12:00
Sam Minnée
ac9a6cbc62 Merge pull request #3169 from JorisDebonnet/patch-3 
Update modeladmin.md
 2014-07-05 14:33:49 +12:00
Stevie Mayhew
1d86fe4f52 FEATURE allow force resampling on images 2014-07-05 14:29:01 +12:00
Sam Minnée
2a3eebf6df Merge pull request #3261 from oceanmountain/patch-1 
Update templates.md
 2014-07-05 14:23:20 +12:00
Hamish Friedlander
c5f41a7d20 Merge pull request #3246 from tractorcow/pulls/3.1/remove-basicauth-isdev 
BUG using isDev query string no longer triggers basic auth
 2014-07-05 12:57:12 +12:00