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,134 Commits 31 Branches 527 Tags 162 MiB
1189322b41
Commit Graph

8134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnée
1189322b41 Merge pull request #302 from robert-h-curry/7113-nested-controls-breaking-last 
BUGFIX: Issue #7113: Recalculate itemIteratorCount when popping viewer state.
 2012-04-11 17:19:46 -07:00
Robert Curry
695ae711e7 MINOR: Issue #7113: Add test for nested loops. 2012-04-12 11:56:49 +12:00
Sam Minnée
d34d57a034 Merge pull request #303 from mateusz/os-7126 
BUGFIX: remove form auto-detection from the generic JS state handler.
 2012-04-11 16:51:36 -07:00
Sam Minnée
b435d0a3d2 Merge pull request #288 from jmwohl/patch-1 
For png images with transparency, the imagesaveaplpha() needs to be set ...
 2012-04-11 16:33:02 -07:00
Mateusz Uzdowski
452a507cc9 BUGFIX: remove form auto-detection from the generic JS state handler. 
Forms take care of PJAX state on their own in the submit and load functions (os-7126)
 2012-04-12 11:31:28 +12:00
Sam Minnée
168eaf72d8 Merge pull request #300 from silverstripe-scienceninjas/feature/ssviewer-enhancements 
Feature/ssviewer enhancements
 2012-04-11 16:29:22 -07:00
Robert Curry
0daa76d0b7 BUGFIX: Issue #7113: Recalculate itemIteratorCount when popping viewer state. 2012-04-12 11:16:41 +12:00
Ingo Schommer
6a10ed19c1 MINOR Added TinyMCE language pack 2012-04-11 18:05:29 +02:00
Ingo Schommer
e045ffeb29 Merge pull request #205 from AngryPHPNerd/sapphire 
---

In SS-2.4 you can prefix files with an underscore to exclude them from manifest this can be useful for backups of old classes or huge data files.

I think this behaviour should be readded.

(I will add a unit test for this ...)
 2012-04-11 17:32:34 +02:00
Ingo Schommer
a3d99b082d MINOR Resetting Security::$database_is_ready state during tests (regression from a9509a610d) 2012-04-11 17:22:55 +02:00
Ingo Schommer
ca24120a5e MINOR Install screen visual tweaks, more visible disabled state on install button, conditional version number (to avoid it showing without a version), referencing new theme in install screen, using new layout in install progress screen as well 2012-04-11 16:49:31 +02:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration' 
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
 2012-04-11 16:31:12 +02:00
Ingo Schommer
aed5e93da2 Merge pull request #301 from stojg/database-is-ready-checks 
MINOR Security::database_is_ready() check are doing duplicate DB queries...
 2012-04-11 06:38:22 -07:00
Ingo Schommer
6cd91ff449 Merge pull request #299 from ajoneil/sapphire 
---

Conflicts:
	forms/NumericField.php
 2012-04-11 15:36:35 +02:00
Ingo Schommer
fb12dbe075 Merge pull request #298 from silverstripe-big-o/sapphire 
---

...s CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs.

- There are a couple changes to dropdown widths for the filter side panel in Big-o integration branch already.

Conflicts:
	admin/code/ModelAdmin.php
	admin/css/screen.css
 2012-04-11 15:20:25 +02:00
Ingo Schommer
5ea080a585 Merge pull request #296 from halkyon/old_js_validation_remnants 
MINOR Removing old client side validation remains - NumericField.js
 2012-04-11 06:15:25 -07:00
Ingo Schommer
800d5fbc01 Merge pull request #291 from halkyon/pg_fixes 
MINOR Fixed failing tests on pgsql
 2012-04-11 06:14:57 -07:00
Stig Lindqvist
a9509a610d MINOR Security::database_is_ready() check are doing duplicate DB queries for Members. 
The will make sure that if the database has been ready once, it is ready for the rest of the request
 2012-04-12 00:29:35 +12:00
Stig Lindqvist
5750eb02b1 Merge pull request #295 from halkyon/redirectorpage_changes 
MINOR Removed RedirectorPage.js (has been moved to cms module)
 2012-04-11 04:10:23 -07:00
Paul Clarke
4f23ac1722 ENHANCEMENT Installer styling, moving away from blackcandy 2012-04-11 22:51:10 +12:00
Hamish Friedlander
5c336329b6 MINOR: When Up called and we are at the top of the scope, throw a useful error, not just an index undefined error 2012-04-11 22:08:05 +12:00
Stig Lindqvist
6f76d42bb2 Merge pull request #290 from stojg/pull/passwordencryptor-config 
API CHANGE Use Config for registering default password encryptors
 2012-04-11 02:59:24 -07:00
Hamish Friedlander
556950de47 MINOR: Add some basic docs on new include feature 2012-04-11 21:57:28 +12:00
Hamish Friedlander
21bf409b7b BUGFIX: Pass arguments through to subtemplates when rendering those too 2012-04-11 21:50:06 +12:00
Hamish Friedlander
e4a043ac0b ENHANCEMENT: Allow arguments to be passed to templates via an array passed to SSViewer#process and via keyword=value pairs in the <% include %> tag 2012-04-11 21:34:27 +12:00
Hamish Friedlander
40ca21e6e5 MINOR: Remove bugfix that is (a) unnessecary because the key is already just sha hashes, underscores and numbers and (b) broken because it strips the open and close quotes from the key 2012-04-11 21:30:57 +12:00
Sam Minnee
adf658c91f BUGFIX: Removed obsolete field File.Sort 2012-04-11 18:13:13 +12:00
Andrew O'Neil
716ff9dcfa MINOR: Ensure all form fields have FieldHolder() with identical signature to FormField::FieldHolder(). Fixes E_STRICT warnings. 2012-04-11 18:07:55 +12:00
Will Rossiter
d982047545 Merge pull request #297 from halkyon/js_cleanup 
MINOR Remove empty Security_login.js file.
 2012-04-10 23:00:03 -07:00
Andrew O'Neil
142a073ce3 MINOR: Fix E_STRICT warning in SSViewer 2012-04-11 17:36:56 +12:00
Andrew O'Neil
4be59a8d45 MINOR: Ensure all form fields Field() method has the same signature as FormField::Field(). Fixes E_STRICT warnings. 2012-04-11 17:33:36 +12:00
Andrew O'Neil
d368f3605b MINOR: Remove default paramenter from handleRequest() so it complies with the interface correctly. Fixes E_STRICT warning. 2012-04-11 17:20:49 +12:00
Andrew O'Neil
daab8f4cbc MINOR: Consistently use DataObjectInterface for saveInto() on FormField subclasses. Fixes E_STRICT notice 2012-04-11 17:00:57 +12:00
Andrew O'Neil
f811103243 MINOR: Remove redundant setDisabled() methods - this method already exists in FormField. Fixes E_STRICT notice. 2012-04-11 16:17:44 +12:00
Sean Harvey
4d97e8867b MINOR Removed useless Security_login.js file which doesn't have any 
content and isn't used anywhere.
 2012-04-11 16:03:57 +12:00
Jeremy Bridson
98399f7779 BUGFIX:Trac #6854 / #7115 - fixed styling issues with filter panel across CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs. 2012-04-11 16:00:56 +12:00
Sean Harvey
3e307e00fe MINOR Removing old remains of NumericField.js validation which was 
removed in 9f3344b355
 2012-04-11 15:55:07 +12:00
Sean Harvey
da9dfca132 MINOR Removed RedirectorPage.js (has been moved to cms module where 
RedirectorPage.php resides)
 2012-04-11 15:33:38 +12:00
Andrew O'Neil
75c5134bc9 BUGFIX: Fix Money::setValue() using old api 2012-04-11 15:30:38 +12:00
Andrew O'Neil
bdb312c665 API CHANGE: DBField::hasValue() conflicts with ViewableData::hasValue(), use DBField::exists() instead. 2012-04-11 14:48:06 +12:00
Andrew O'Neil
501c8f3f31 MINOR: Fix E_STRICT notices in php-peg 2012-04-11 14:40:27 +12:00
Andrew O'Neil
c5aa074bff BUGFIX: Fix E_STRICT errors not being reported 2012-04-11 14:39:02 +12:00
Jeremy Bridson
84388a4119 ENHANCEMENT:SSF-124 - changed how the border radius was applied on the gridfield header. border radius is now applied to the first and last th in the first row in <thead>. 2012-04-11 13:45:37 +12:00
Jeremy Bridson
b58183ff1b MINOR:Trac #7116 - added a set width to dropdowns in filter side panel for IE8 2012-04-11 11:43:53 +12:00
Jeremy Bridson
285773746d BUGFIX:SSF-124 / Trac#7105 - fixed issue with gridfield columns being too narrow. 2012-04-11 10:48:24 +12:00
Sam Minnee
213a08aac7 BUGFIX: Ensure site works if executed in a chrooted enviornment where BASE_PATH is '/'. (#4069) 2012-04-11 10:30:34 +12:00
Ingo Schommer
a64715beeb BUGFIX Calling tinyMCE.init() in sync with entwine rules to avoid uncached loading interfereing with call order (fixes #6877) 2012-04-10 21:41:00 +02:00
Jeremy Bridson
8292075174 BUGFIX:consolidated the btn_icons folder with the btn_icon folder in ../sapphire/admin/images 2012-04-10 14:17:47 +02:00
Jeremy Bridson
75c0937ab3 BUGFIX:removed reference to compass generated sprite and added direct reference to the png file. 2012-04-10 14:16:07 +02:00
Julian Seidenberg
2c5c3eed20 MINOR: regenerating compass icons 2012-04-10 14:16:00 +02:00