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
8,919 Commits 31 Branches 527 Tags 162 MiB
c41ff29d70
Commit Graph

8919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnee
6bb1218760 MINOR: Update entities via collector script. 2012-05-18 16:15:13 +12:00
Sam Minnee
70a5b49dd6 MINOR: Fixed i18n coding for LeftAndMain save and delete. 2012-05-18 16:15:13 +12:00
Sean Harvey
b65dff0fbe BUGFIX Allowing actions related to coverage tests 2012-05-18 16:05:05 +12:00
Sean Harvey
4f42b2e773 Merge pull request #461 from mateusz/entwines3 
BUGFIX: add missing onunmatches causing exceptions in entwine
 2012-05-17 19:29:38 -07:00
Mateusz Uzdowski
97e00a35dd BUGFIX: add missing onunmatches causing exceptions in entwine 2012-05-18 14:27:09 +12:00
Sean Harvey
d782c37044 Merge pull request #457 from mateusz/entwines2 
Refactor JS entwines
 2012-05-17 19:14:10 -07:00
Sean Harvey
e98572e3a3 Merge pull request #460 from robert-h-curry/6993-gridfield-not-clicking-on-ipad 
BUGFIX: Force iOS Safari to send through click events on gridfield rows.
 2012-05-17 19:11:33 -07:00
Robert Curry
38e4bfd150 BUGFIX: Force iOS Safari to send through click events on gridfield rows. (fixes #6993) 2012-05-18 14:00:23 +12:00
Marcus Nyeholt
b269badfbe FEATURE: Added dependency injector for managing creation of new objects and their dependencies. 
API CHANGE: Pass Object::create() calls to Injector::create().
API CHANGE: Add "RequestProcessor" injection point in Director, that Director will call preRequest() and postRequest() on.
 2012-05-18 12:39:57 +12:00
Mateusz Uzdowski
6e436b54f4 BUGFIX: change namespace for the tree so all matchers are executed 
.cms-tree.multiple matcher would not execute, because .cms-tree from
another file is overriding it (and the element is marked as resolved by
entwine). We need to move it to a separate namespace.
 2012-05-18 12:27:30 +12:00
Mateusz Uzdowski
37399f88db BUGFIX: add missing _super calls to all matchers and unmatchers 
Otherwise some matchers might not be triggered as expected.
 2012-05-18 12:27:30 +12:00
Mateusz Uzdowski
3d0876c8f5 BUGFIX: put all CMS JS code into 'ss' namespace. 
Conflicts:

	admin/javascript/LeftAndMain.js
	javascript/GridField.js
 2012-05-18 12:27:30 +12:00
Sam Minnée
3412a0e58d Merge pull request #456 from normann/trac/7324 
trac 7324: Disable GridField pagination links when only one page is visible
 2012-05-17 17:18:22 -07:00
Normann Lou
5290b81c55 ENHANCEMENT: don't show the paginating elements in the paginator when only one page, and keep 'view 1 - 5 of 5' there 2012-05-18 11:31:33 +12:00
Sean Harvey
d8b5b97e28 MINOR Upgrade notes on TinyMCE upgrade and how to resolve a common issue 2012-05-18 10:56:34 +12:00
Sean Harvey
18a92f922b Merge pull request #454 from adrexia/7215-Fix-design-toggle-searchfields-gridfield 
BUGFIX: GridField filter
 2012-05-17 15:19:46 -07:00
Sean Harvey
78423c1bd0 BUGFIX Ensure HTTP::get_mime_type() checks the full path in 
file_exists() before using the finfo class
 2012-05-18 09:22:02 +12:00
Sean Harvey
c9bcfd49ec BUGFIX Only use finfo if the file exists, otherwise the MIME type 
detection won't work, such as in the case of HTTPRequest::send_file()
 2012-05-17 14:54:30 +12:00
Sean Harvey
e2aa635323 BUGFIX Ensure GridFieldExportButton uses "text/csv" as the MIME type 2012-05-17 14:54:29 +12:00
Naomi Guyer
f0c61c20df BUGFIX: GridField filter 
Make sure the new class is used consistently, and has the correct css
applied to it.
 2012-05-17 11:15:53 +12:00
Ingo Schommer
eeef41e91f SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205) 2012-05-16 14:59:42 +02:00
Ingo Schommer
8f2ede8fcf MINOR Fixed syntax errors from SQLQuery/DataQuery cleanup 2012-05-16 13:17:19 +02:00
Ingo Schommer
4da9e72eed Merge branch 'master' of github.com:silverstripe/sapphire 2012-05-16 13:09:42 +02:00
Sean Harvey
8407c76b82 Merge pull request #451 from chillu/security-docs 
Improved security docs around DataList, SQLQuery
 2012-05-16 03:48:50 -07:00
Ingo Schommer
dfa01c8ce1 Merge pull request #446 from adrexia/sapphire 
---

MINOR: SCSS refactoring
1. Refactored some gridfield styles to enable reuse (created a mixin file to hold mixins that generate specific css objects/elements).
2. Made some scss comments use // so they wouldnt appear in generated css

ENHANCEMENT: Gridfield usability (fixes 7215)
1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates (spans were being inserted inside spans), and adjusted styles. Added extra class to template
5. Added "filter by ..." placeholder text to input fields

Conflicts:
	css/GridField.css
 2012-05-16 12:29:13 +02:00
Ingo Schommer
3a11c690ed MINOR Updated security documentation (phpdoc and markdown) around new DataList and SQLQuery APIs, additional automatic escaping on some stricter inputs like column names 2012-05-16 11:59:22 +02:00
Ingo Schommer
6e99e187b4 MINOR Css coding conventions for CMS 2012-05-16 11:38:20 +02:00
Ingo Schommer
51eb70781b Merge pull request #450 from adrexia/file-upload-status 
BUGFIX: Re-add status for successful upload
 2012-05-16 00:42:00 -07:00
Ingo Schommer
c01cfddc66 Merge pull request #449 from adrexia/broken-pagination 
BUGFIX: Fix pagination buttons
 2012-05-16 00:35:28 -07:00
Naomi Guyer
b2fc117983 BUGFIX: Re-add status for successful upload 2012-05-16 18:10:12 +12:00
Naomi Guyer
7363d8bc47 BUGFIX: Fix pagination buttons 
Disable ability to click on disabled pagination buttons
 2012-05-16 17:39:00 +12:00
Naomi Guyer
6c8dbe1a56 BUGFIX: Fix where filter appears 
Make filter only appear in GridFields that include the
GridFieldFilterHeader component
 2012-05-16 16:50:11 +12:00
Sean Harvey
4e8b1538a2 Merge pull request #447 from ajoneil/blowfish-fix 
BUGFIX: Fix checking for flawed blowfish encryption
 2012-05-15 21:42:01 -07:00
Andrew O'Neil
becdd85421 BUGFIX: Fix checking for flawed blowfish encryption 2012-05-16 16:40:12 +12:00
Naomi Guyer
458171ff92 ENHANCEMENT: Gridfield usability (fixes 7215) 
1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates
(spans were being inserted inside spans), and adjusted styles. Added
extra class to template
5. Added "filter by ..." placeholder text to input fields
 2012-05-16 12:18:23 +12:00
Naomi Guyer
5a023f985d MINOR: SCSS refactoring 
1. Refactored some gridfield styles to enable reuse (created a mixin
file to hold mixins that generate specific css objects/elements).
2. Made some scss comments use // so they wouldn't appear in generated
css
 2012-05-16 12:18:00 +12:00
Ingo Schommer
f01ca808db MINOR More robust path concat in HtmlEditorField.js (means it doesn't break with translatable module enabled) 2012-05-16 00:10:08 +02:00
Sean Harvey
5010d95cfa Merge pull request #442 from halkyon/installer_check_finfo 
BUGFIX Warn if finfo not available in the installer
 2012-05-15 14:20:52 -07:00
Sean Harvey
e3a3f52e93 Merge pull request #441 from silverstripe-scienceninjas/mime-type-failover 
MINOR Failover to configuration if the finfo module doesn't exists when getting file mime-type.
 2012-05-15 14:20:36 -07:00
Ingo Schommer
4d97f75e15 MINOR Fixed form reset styles 2012-05-15 22:15:36 +02:00
Ingo Schommer
9326d9e60e BUGFIX Fixing SQLQuery->getFilter() usage of non-existent method (removed during refactoring of pull request), more accurate deprecation notice 2012-05-15 21:29:43 +02:00
Ingo Schommer
d57ede8f44 MINOR Fixed query param concatenation in LeftAndMain.js 2012-05-15 21:28:55 +02:00
Ingo Schommer
5ff282e20a MINOR Allow extending LeftAndMain->SiteTreeAsUL() (specifically used to add the language drop down for the 'translatable' module) 2012-05-15 21:28:38 +02:00
Ingo Schommer
8e39e7dfba MINOR Allow extension of LeftAndMain->Link() 2012-05-15 21:27:32 +02:00
Sean Harvey
b1104dac25 BUGFIX Don't try lazy loading fields when the record ID is set to something non-numeric, otherwise you'll get a SQL error. 2012-05-15 17:18:50 +12:00
Stig Lindqvist
7d9cf5b365 MINOR Use File::get_file_extension for fallback mime-type detection 2012-05-15 10:03:00 +12:00
Stig Lindqvist
ea8eb7bad4 MINOR: Changed the configuration values for mime-type detection 2012-05-15 10:02:06 +12:00
Ingo Schommer
0a6ec3d9c9 Merge pull request #443 from halkyon/sapphire 
---
 2012-05-14 15:33:48 +02:00
Ingo Schommer
ce3b2fc3af Merge pull request #440 from Zauberfisch/sapphire 
---

fixed missing cancel icon in UploadField cancel button
 2012-05-14 15:15:51 +02:00
Ingo Schommer
d42ea5a9d6 BUGFIX Encoding multibyte characters in custom X-Status HTTP headers used in CMS (headers don't allow multibyte data) 2012-05-14 15:13:49 +02:00