tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-06 17:51:34 +02:00
Code Issues Projects Releases Wiki Activity
398 Commits 29 Branches 525 Tags 151 MiB
633821efb4
Commit Graph

111 Commits

Author SHA1 Message Date
Ingo Schommer
633821efb4 FEATURE: Added merge() (merged from branches/2.0-inform) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43588 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-18 20:04:02 +00:00
Ingo Schommer
8dcdce64c2 documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43171 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-07 12:17:33 +00:00
Andrew O'Neil
b723898551 #115 - browscap.ini not set 
Use Browscap class (http://garetjax.info/projects/browscap/) instead of get_browser()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-05 01:58:21 +00:00
Andrew O'Neil
a181f7c151 Fixed duplicate getBody() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42999 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-03 00:10:49 +00:00
Andrew O'Neil
5e5f200021 Correct comment (merged from 2.1.0 branch, r42718) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42925 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 04:57:24 +00:00
Andrew O'Neil
30efb8efc7 #1444 - DataObjectDecorator? Merge Fields HUGE PROBLEM (merged from 2.1.0 branch, r42210) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42918 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 04:48:37 +00:00
Andrew O'Neil
5062c955e0 Replace blank strings with null - see http://www.silverstripe.com/general-discussion/flat/5050?start=8 (merged from 2.1.0 branch, r42173) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42917 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 04:46:33 +00:00
Andrew O'Neil
b8b3bab508 Link to the documentation on default pages (merged from 2.1.0 branch, r41730) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42914 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 04:37:10 +00:00
Andrew O'Neil
717737ed27 Fix error when creating new redirector page (merged from 2.1.0 branch, r41675) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42913 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 04:36:13 +00:00
Jeremy Shipman
023778c002 fixed virtual page creation. yay! 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42849 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-01 05:23:17 +00:00
Ingo Schommer
c4ab634207 Checking for static $enabled when processing $versionableExtensions, 
as db/build was failing when Translatable::$enabled=false 
Fixed indentation in augumentDatabase() 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42154 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 17:24:51 +00:00
Ingo Schommer
266ff8a796 Added disable() 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42152 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 17:23:59 +00:00
Ingo Schommer
1b2475d9b2 bfojcapell: Refactoring 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42147 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:58:19 +00:00
Ingo Schommer
39ae17224a bfojcapell: Fixed "Notice: Object of class HTTPResponse to string conversion" that caused nothing to be written in the static file. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42146 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:57:40 +00:00
Ingo Schommer
e7bc735774 mlanthaler: The validators for the Member extensions didn't work until now, these changes fix that issue. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42144 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:55:47 +00:00
Ingo Schommer
fd4cfe1a80 mlanthaler: Bugfix: Philipp's changes broke the code... ai ai ai :-) 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42141 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:44:42 +00:00
Ingo Schommer
0edcb97d57 mlanthaler: Bugfix: Added needed checks if the $ancestry variable is set respectively if it is an array. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42140 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:40:57 +00:00
Ingo Schommer
23b88e60f6 bfojcapell: change some old query processing code to a more robust one 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42125 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:22:36 +00:00
Ingo Schommer
835574ffe4 bfojcapell: Added default use of Translatable and an html metatag with the content language 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42123 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:21:09 +00:00
Ingo Schommer
06909765d6 bfojcapell: These changes are required to Translatable versioning support correctly work. Versioned automatically adds this suffix so there is no need to add it here 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42122 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:20:07 +00:00
Ingo Schommer
b90ca2e60f bfojcapell: Added isset 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42121 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:19:31 +00:00
Ingo Schommer
b90c7c86a0 bfojcapell: These changes add the ability to versionize suffixed tables, that have names that are not dataobject descendants. Some extensions might want to create new tables, for example Translatable creates SiteTree?_lang, and want versioning support to these new tables 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42119 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:15:47 +00:00
Ingo Schommer
e2f61c3649 bfojcapell: Translatable class - support for multilingual content 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42118 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:14:52 +00:00
Ingo Schommer
8bc94c17ea mlanthaler: Bugfix: "Notice: Trying to get property of non-object in..." 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42102 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 15:52:56 +00:00
Ingo Schommer
5b886f9ae1 mlanthaler: Bugfix: Fixed "FATAL ERROR: get_browser() [function.get-browser]: browscap ini directive not set" and some E_NOTICE errors. 
@Quin: Maybe you should implement some fail-back function for get_browser that evaluates the HTTP user agent header (browscap.ini is often not available!). a
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42099 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 15:40:27 +00:00
Ingo Schommer
ea40654253 qhoxie: Statistics controller added for global reporting functions, pageview datatype for recording hit data 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42097 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 15:37:33 +00:00
Ingo Schommer
3cacc11986 nthaler: Bugfix: Removed "unchecked" set_time_limit call. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42091 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 15:28:08 +00:00
Ingo Schommer
e286068cc9 mlanthaler: Forgot to remove debug code, sorry :-) 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42076 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 14:43:54 +00:00
Ingo Schommer
e00bc87786 mlanthaler: Added support for default value to this data type. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42075 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 14:43:27 +00:00
Ingo Schommer
c35c83bad7 elofgren: USABILITY: Make Page URL input field wider as part of fix for http://support.silverstripe.com/gsoc/ticket/35 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42034 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 02:00:59 +00:00
Ingo Schommer
9af317a264 mlanthaler: Bugfix: Indexes and defaults were not supported in DataObjectDecorators?. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41973 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:20:31 +00:00
Ingo Schommer
6b378430f4 sminnee: Changes to keep db/build working on sites that don't yet have RememberLoginToken? 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41910 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 19:42:14 +00:00
Ingo Schommer
5e0a5283b2 fixed bugs introduced by merging branches/gsoc 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41907 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 02:05:23 +00:00
Ingo Schommer
d292e5ccf0 mlantahler: Reverted Sam's changes because now we can exclude directories from the ManifestBuilder? simply by adding a "_manifest_exclude" file. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41906 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:55:55 +00:00
Ingo Schommer
fedd019322 sminnee: Changes to keep db/build working on sites that don't yet have RememberLoginToken? 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41839 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:27:40 +00:00
Ingo Schommer
8d3c8a51d9 elofgren: USABILITY: Change tooltip references to 'stage site' to 'draft site' instead. See: http://www.elijahlofgren.com/silverstripe/consistently-use-draft-site-instead-of-stage-site/ 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41837 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:24:15 +00:00
Ingo Schommer
be2f2243ae mlanthaler: Added permission check for edit rights and changed the labels according to Sigs suggestions. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41823 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:06:49 +00:00
Ingo Schommer
ca366a15c7 mlanthaler: Allow CMS users to limit view/edit access to a page (ticket #8, ticket #9). 
Also refactored the SiteTree? class to respect the coding standards. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41821 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:03:12 +00:00
Ingo Schommer
ef54473d1b elofgren: Add 'extraClass' parameter to FormAction? and use it to assign the 'delete' CSS class to the 'Unpublish' and 'Cancel draft changes' buttons so that their background turns red on hover. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 23:43:02 +00:00
Ingo Schommer
3be2d445f9 elofgren: VAR FIX: Initialize 'has' to an array and use isset() for removeList in ComponentSet::setByIDList() to fix undefined variable errors when saving 'SubscribeForm?' page. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41819 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 23:38:26 +00:00
Ingo Schommer
f9c5f25254 mlanthaler: Bugfix: Make sure *Priority* is set, otherwise an invalid SQL statement will be generated when the page is published (Priority = ). 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41818 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 23:33:51 +00:00
Ingo Schommer
e452de966c elofgren: VAR FIX: Fix a large amount of undefined variable errors when creating and editing a 'newsletter subscription form' page by adding needed issets and initializations. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41817 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 23:31:08 +00:00
Ingo Schommer
2a2b1db203 mlanthaler: Small fix to prevent E_NOTICEs. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41815 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 23:21:35 +00:00
Ingo Schommer
fa43f70696 mlanthaler: Fixed small typo. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41813 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 23:10:25 +00:00
Ingo Schommer
4d7346825a mlanthaler: Bugfix: Fixed small bug. Also notified the OpenID library maintainer so that they fix the library itself. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41811 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 23:07:23 +00:00
Ingo Schommer
17202b859e mlanthaler: Bugfix: Fixed error "Trying to get property of non-object" when the accessed page doesn't exists (passed wrong URL). 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41789 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 19:17:37 +00:00
Ingo Schommer
d47e6cf67c mlantahler:Bugfix: Added checks in DataObjectSet::First() and DataObjectSet::Last() to prevent errors on an empty $items array. (merged from branches/gsoc) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41778 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 17:59:33 +00:00
Ingo Schommer
9a22699fcc elofgren: Add 2 needed calls to isset(): in Hierarchy::markingFilterMatches() and Notifications::getItems(). Errors were encountered when moving and deleting files in 'Files and Images'. (merged from branches/gsoc) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41775 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 17:40:29 +00:00
Ingo Schommer
f7646412f4 fixed merging error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41727 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 02:49:36 +00:00
Ingo Schommer
817f279cf1 pkrenn: Added methods needed for testing, namely databaseExists and selectDatabase (merged from branches/gsoc) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41713 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 01:45:06 +00:00