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,551 Commits 31 Branches 527 Tags 162 MiB
23148b959a
Commit Graph

8551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
23148b959a Merge pull request #402 from ohararyan/sapphire 
---

http://open.silverstripe.org/ticket/7214

Added watermark to show current state of preview.
Removed button styling from Draft and Preview and added styling to show current selected state.

Designs signed off by Paul

Conflicts:
	admin/css/screen.css
 2012-05-07 13:01:00 +02:00
Ingo Schommer
f56097a29b Merge pull request #386 from adrexia/sapphire 
---

Includes:
* Changes to chosen to include a custom function that will let the drop-down rise-up if there is room and it would otherwise drop beneath the size of the window (changes in coffeescript, jquery output, and chosen css)
* Changes in SCSS to stop the automatic addition of scrollbars, and to limit the extra space at the bottom of the filter div

Issues remaining:
* jLayout is calculating the height of the filter div incorrectly. It is assuming the div is around 70px longer than it is. This height assumption is linked somehow to chosen, as initiating the select box results in a correct height calculation.
 2012-05-07 11:21:23 +02:00
Ingo Schommer
bed5655d5e Merge pull request #409 from normann/sapphire 
---

Add page icons to the tree node in TreeDropdownField in page add form.
 2012-05-07 11:02:59 +02:00
Sean Harvey
7c272d3139 MINOR SQLQuery doc cleanup 2012-05-07 17:11:10 +12:00
Sean Harvey
3bc1da0543 MINOR Tidy up of SQLQuery constructor docs and default args, limit is 
stored internally as an array, not a string.
 2012-05-07 17:07:30 +12:00
Sean Harvey
bb9ffd2eb1 ENHANCEMENT SQLQuery::selectField() returns a SQLQuery object to be 
consistent with how the other add/set methods work.
MINOR Fixing DbDatetimeTest to use the correct selectField to select an
alias
 2012-05-07 16:59:42 +12:00
Stig Lindqvist
a16b75d459 Merge pull request #405 from halkyon/member_changes2 
API CHANGE Removed Member_SignupEmail and deprecate sendInfo() on Member
 2012-05-06 21:47:05 -07:00
Sean Harvey
e50f90bf8e BUGFIX Ensure end bracket for HAVING clause is put in the right place 2012-05-07 16:36:05 +12:00
Normann Lou
cd13c0e178 BUGFIX: updating the value of a tree dropdown field, its title is not updated accordingly if using TreeTitle as the drropdown item title 2012-05-07 15:43:25 +12:00
Sam Minnée
5f5197b4c1 Merge pull request #407 from normann/trac/7173 
trac 7173, Add "level up" list entry to CMS page list view
 2012-05-06 20:35:38 -07:00
Sam Minnée
0a5616a208 Merge pull request #408 from ajoneil/blowfish 
Fix blowfish encryption
 2012-05-06 20:34:46 -07:00
Sam Minnée
07bd8e5541 Merge pull request #400 from halkyon/sqlquery_enhancements 
API CHANGE Deprecated internal access to SQLQuery properties
 2012-05-06 20:29:57 -07:00
Andrew O'Neil
f6c98b1992 BUGFIX: Increase size of varchar fields on MemberPassword to match those defined in Member. This fixes issues when the password hash is longer than 50 characters, and was being truncated when saved in MemberPassword. 2012-05-07 15:04:25 +12:00
Andrew O'Neil
5cf3720bf0 ENHANCEMENT: Use the best blowfish encryption available - this fixes fragility between PHP versions and system installations 2012-05-07 15:04:09 +12:00
Andrew O'Neil
89fc8e5fdd APICHANGE: PasswordEncryptor::check() allows for more powerful password checking, deprecating PasswordEncryptor::compare() 2012-05-07 15:03:53 +12:00
Sean Harvey
051d9de482 API CHANGE Deprecated internal access to SQLQuery properties, update core code to reflect these changes. 
Using set/add instead in accessor methods, and use Database::sql*ToString() to allow easier per-database adapter SQL overloading.
 2012-05-07 14:21:44 +12:00
Normann Lou
7324712e9e FEATURE: add Levelup component to GridField as GridFieldLevelup 2012-05-07 13:40:53 +12:00
Sean Harvey
4e18cc581b BUGFIX Ensure MySQLi is used consistently in MySQLDatabaseConfigurationHelper, not old mysql functions 2012-05-05 11:22:28 +12:00
Sean Harvey
d4154dae9e API CHANGE Deprecate Member::sendInfo(), use Member_ChangePasswordEmail and Member_ForgotPasswordEmail class directly instead. 2012-05-05 10:04:46 +12:00
Sean Harvey
fd0ec1c47f API CHANGE Removed Member_SignupEmail, use your own custom sign up Email class instead. 2012-05-05 10:04:23 +12:00
Sean Harvey
a79032c57f MINOR Fixing broken test on Windows 2012-05-04 22:48:47 +12:00
Ingo Schommer
f18b2f6342 MINOR Docs mention of automatic master lang uploads 2012-05-04 11:19:48 +03:00
Ryan O'Hara
abb5719d33 ENHANCEMENT: Style change to buttons for preview states. Removed open in new window (TRAC-7214) 2012-05-04 13:53:33 +12:00
Ryan O'Hara
92484581e3 ENHANCEMENT: Add disabled state to preview buttons and add watermark for the current state being viewed (TRAC:7214) 2012-05-04 13:53:33 +12:00
Sam Minnee
de4a865fb8 BUGFIX: Fixed blowfish encryption for PHP < 5.3.7 (#7276) 2012-05-04 11:50:26 +12:00
Sean Harvey
5702007da1 MINOR Fixing comment to be more concise. 2012-05-04 11:11:36 +12:00
Ingo Schommer
20a837947f MINOR Using PHP version constants rather than version_compare() in Object::static_lookup(), since its called 10k times on an average CMS load that makes a difference of about 3% (with APC) 2012-05-04 00:26:09 +02:00
Ingo Schommer
f7e19ca680 BUGFIX i18nTextCollector finds templates recursively, not only in <module>/templates folder. Added master language entities which were previously overlooked due to this bug. 2012-05-03 17:45:25 +02:00
Ingo Schommer
42bc5ffb47 BUGFIX Returning File->getTreeTitle() with user input XML escaped, mirroring functionality in SiteTree->getTreeTitle() 2012-05-03 17:41:02 +02:00
Ingo Schommer
68051fdb96 Merge pull request #371 from halkyon/sapphire 
---

Dont start the session until its actually necessary, which is to say there is a cookie available with the current PHP session name (or a request variable with the session_name() - typically PHPSESSID.) The latter allows for passing session ID through as an alternative to cookies.
 2012-05-03 14:58:09 +02:00
Normann Lou
3b3b515571 API CHANGE Read-only fields no longer include companion hidden fields (see pull request #399) 
BUGFIX Remove legacy code and template which is never picked-up so that TextareaField becomes 'readonly' when it is transfered to readonly field. Change TextareaFieldTest test cases to address a 'readonly' textarea field displaying the special html characters correctly.
 2012-05-03 14:24:03 +02:00
Ingo Schommer
f6c8468d56 MINOR Disabled MainMenu caching in LeftAndMain 2012-05-03 14:19:07 +02:00
Ingo Schommer
8a8dbce92e Merge pull request #398 from pitchandtone/master 
git ignore added eclipse files
 2012-05-03 05:02:20 -07:00
Ingo Schommer
84187c7a40 Merge pull request #396 from sminnee/fix-tinymce-access 
BUGFIX: Put all php file inclusions/exclusions into a single file
 2012-05-03 04:55:05 -07:00
Ingo Schommer
4029f96728 ENHANCEMENT Section icons in CMS (#7269) 2012-05-03 13:49:19 +02:00
Ingo Schommer
0d1e4cece5 Merge pull request #395 from silverstripe-big-o/sapphire 
---

...tAdmin + regenerated css files.
 2012-05-03 11:26:12 +02:00
Normann Lou
826878b45d ENHANCEMENT: add header icon to CMSFileAddController when uploading file and SecurityAdmin when editing a member record 2012-05-03 18:16:35 +12:00
John Milmine
3bf5f6be2d Merge branch 'master' of git://github.com/silverstripe/sapphire 
Conflicts:
	.gitignore
 2012-05-03 13:40:26 +12:00
Sam Minnee
8eb0814d04 BUGFIX: Put all php file inclusions/exclusions into a single file, because some servers don't seem to allow reenabling of file access in a subdirection .htaccess file. 2012-05-03 13:13:51 +12:00
Sean Harvey
450bc258d8 MINOR Fixing broken SQLQueryTest cases 2012-05-03 13:09:50 +12:00
Jeremy Bridson
7f1e6de4f2 ENHANCEMENT:Trac 7266 - added an icon to the 'sync files' button in AssetAdmin + regenerated css files. 2012-05-03 12:17:41 +12:00
Sean Harvey
37369abf1d BUGFIX Fixing SortColumn alias to be recognised by MSSQL/PGSQL 2012-05-03 12:02:21 +12:00
Sean Harvey
521d436b45 MINOR Fixing broken test in pgsql 2012-05-03 11:22:54 +12:00
Sean Harvey
151abde17d Merge pull request #388 from chillu/trac/7170-i18n-sprintf-injections 
#7170 i18n sprintf injections
 2012-05-02 16:18:30 -07:00
Ingo Schommer
e929753992 MINOR Using correct $locale format in installer (regression from last commit) 2012-05-03 00:00:51 +02:00
Ingo Schommer
0068b6d5b6 BUGFIX Showing only actually available languages for selection during install (fixes #7260) 2012-05-02 23:35:20 +02:00
Sam Minnée
a004acfb59 Merge pull request #381 from AngryPHPNerd/patch-2 
MINOR: Colliding field check runs twice
 2012-05-02 14:14:40 -07:00
Ingo Schommer
c7323545b6 BUGFIX Return consistent data from ModelAdmin->getManagedModels(), fixing custom 'title' settings in $managed_models (fixes #7243) 2012-05-02 22:11:26 +02:00
Ingo Schommer
e29bb3c390 ENHANCEMENT Allow opt-out of autofocus in CMS editor form, to avoid browser "auto scrolling" to bring the focused element into view (fixes #7242) 2012-05-02 18:27:45 +02:00
Ingo Schommer
8c1053968c MINOR Fixed unnecessary background in CMS tabs, causes wrong display in FF, and already implemented on parent "cms-content-header" (#7240) 2012-05-02 18:13:34 +02:00