Commit Graph

4729 Commits

Author SHA1 Message Date
Sam Minnee
092c47d100 Blocked revisions 50709 via svnmerge
........
  r50709 | ischommer | 2008-03-07 16:09:28 +1300 (Fri, 07 Mar 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-50047" from 
  svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50880 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 03:14:35 +00:00
Sam Minnee
05dc1eee2c Merged revisions 50683 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50683 | aoneil | 2008-03-07 11:05:27 +1300 (Fri, 07 Mar 2008) | 2 lines
  
  #2295 - DataObjectSets cannot be iterated over multiple times concurrently
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:31:43 +00:00
Sam Minnee
a0be727cc3 Merged revisions 50488 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50488 | sminnee | 2008-03-03 21:59:09 +1300 (Mon, 03 Mar 2008) | 1 line
  
  #2280 - Fixed XML parsing errors in CTF
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:31:38 +00:00
Sam Minnee
11074f013f Merged revisions 50487 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50487 | sminnee | 2008-03-03 21:57:26 +1300 (Mon, 03 Mar 2008) | 1 line
  
  #2287 - Removed notice-level error when geoip's not installed
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:31:30 +00:00
Sam Minnee
ab7fbbb350 Merged revisions 50352 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50352 | sminnee | 2008-02-28 13:47:38 +1300 (Thu, 28 Feb 2008) | 1 line
  
  #2277 - Fixed notice-level error on controllers that are direct subclasses of controller
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:31:24 +00:00
Sam Minnee
87b936af25 Merged revisions 50290 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50290 | sminnee | 2008-02-27 17:36:18 +1300 (Wed, 27 Feb 2008) | 1 line
  
  Added support for password and old_password encryption mechanisms if you're using MySQL
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:49 +00:00
Sam Minnee
6d87a6f188 Merged revisions 50245 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50245 | sminnee | 2008-02-27 11:38:55 +1300 (Wed, 27 Feb 2008) | 1 line
  
  Small fix for session bugs on Lightspeed server
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50866 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:42 +00:00
Sam Minnee
6c5ee3ceb9 Merged revisions 50214 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50214 | sminnee | 2008-02-26 16:12:22 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  A bit of a hack to fix double-escaped URLs in the CMS.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50865 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:36 +00:00
Sam Minnee
d7196a438c Merged revisions 50200 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50200 | sminnee | 2008-02-26 14:42:29 +1300 (Tue, 26 Feb 2008) | 1 line
  
  Fixed password emailing for edited members
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50864 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:29 +00:00
Sam Minnee
1dd8c7f07c Merged revisions 50180 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50180 | sminnee | 2008-02-26 12:03:24 +1300 (Tue, 26 Feb 2008) | 1 line
  
  Allow use of  on controller extensions
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:19 +00:00
Sam Minnee
ecec061408 Merged revisions 50179 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50179 | sminnee | 2008-02-26 12:03:10 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  Fixed 4.1-sort-by-group-aggregate query rewriter for sort functions containing columns, eg, ORDER BY if(A,B,C), X  
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50862 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:29:14 +00:00
Sam Minnee
9392c0fdb2 Removed notice-level error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:01:54 +00:00
Ingo Schommer
44bec8c587 updated en_US master entities
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 00:43:07 +00:00
Ingo Schommer
5c76b90fb7 fixed PHP notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 00:40:25 +00:00
Ingo Schommer
ed520fe9df fixed PHP notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50831 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 00:39:44 +00:00
Ingo Schommer
bba9bb623e Added Translations for Danish (Denmark) - thanks to Jesper and Dennis
Added Translations for Esperanto - thanks to Wojtek, Donald, Evan and Joop
Added Translations for Finnish (Finland) - thanks to Elias, Vesa and Nina
Added Translations for LOLCAT - thanks to Wojtek
Added Translations for Sinhalese (Sri Lanka) - thanks to Nivanka, Himali and Lakshan
Updated several translations in cms/auth_openid/sapphire
Added package names for i18n files
Reverted patch from r47694 which introduced conditional statements in lang-files

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-10 23:55:57 +00:00
Mark Rickerby
f55ba36a65 fixing bug with in-memory child objects not having their parent ID field updated via the ->add() method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50808 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-10 21:48:13 +00:00
Ingo Schommer
5a313be83e Merged revisions 50805 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r50805 | ischommer | 2008-03-11 10:23:53 +1300 (Tue, 11 Mar 2008) | 2 lines
  
  added $searchable_fields in preparation for a more generic search implementation, currently limited to Member.php and MemberTableField.php (mainly to fix bugs caused by r49774 and r47856)
  fixed weird indentation formatting in Member.php
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-10 21:28:35 +00:00
Ingo Schommer
cce30493a6 removed random debug methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50741 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-09 22:52:02 +00:00
Ingo Schommer
265528a67c #2306 Attempt to unset static property File::
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50729 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-09 05:08:08 +00:00
Ingo Schommer
0972eb0a95 Initialized merge tracking via "svnmerge" with revisions "1-50048" from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-07 03:20:10 +00:00
Ingo Schommer
844fe81cca removed alternative_instance_get() (only used for gallery-hack)
refactored query-caching in instance_get() to just cache the raw db fields (unlikely to change) - overzealous caching was causing problems with wrong SQL selects on subsequent calls

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50704 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-07 03:19:49 +00:00
Ingo Schommer
4dd4bc41a6 #2265 Installer falsely claims modrewrite fails (mamp)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-07 01:17:14 +00:00
Mark Rickerby
0a543a9ae1 made $messageType parameter of Validator::validationError optional, and added API docs to explain what (apparently) is going on
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-06 02:06:47 +00:00
Mark Rickerby
79835098b0 fixing typo in parameter name $validate --> $validator
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50634 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-06 01:21:47 +00:00
Sam Minnee
848631558e Updated widget system to support forms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50479 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-03 08:48:52 +00:00
Sam Minnee
59d8a1ce8e Improving API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50453 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-02 23:24:10 +00:00
Sam Minnee
a0fb07d8ba Added /SapphireInfo URL with some basic version information
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-02 23:21:58 +00:00
Matt Peel
db1932b57c Fixed typo in Email.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50240 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-26 22:47:01 +00:00
Ingo Schommer
e3994942d3 Merged revisions 50182 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc

........
  r50182 | ischommer | 2008-02-26 13:36:52 +1300 (Tue, 26 Feb 2008) | 1 line
  
  documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50187 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-26 01:23:19 +00:00
Ingo Schommer
acef8b8859 Merged revisions 50189 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc

........
  r50189 | ischommer | 2008-02-26 14:14:33 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  BUGFIX using namespaced sessions in choose_site_lang() (different modes for 'site' and 'cms') to avoid unwanted changes to the application state (e.g. saving of an english cms-form to spanish record because frontend was switched to spanish in the meantime)
  BUGFIX changed choose_site_lang() to use combined if-blocks for $langsAvailable (longer statements, but less redundancy)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-26 01:22:52 +00:00
Ingo Schommer
490fc2b2f1 Merged revisions 50188 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc

........
  r50188 | ischommer | 2008-02-26 14:07:33 +1300 (Tue, 26 Feb 2008) | 1 line
  
  setting Director::set_site_mode() (similiar to ContentController) - required for Translatable::choose_site_lang() to work properly
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-26 01:22:29 +00:00
Ingo Schommer
e22b87774d Initialized merge tracking via "svnmerge" with revisions "1-47424" from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-26 01:20:59 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
974238b296 Fixed bug with BasicAuth enabled on an old database, it was preventing you from visiting db/build
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50024 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-22 03:59:16 +00:00
Sam Minnee
7779e1c2b0 Fixed MySQL 4.1 support for situations where we are sorting by a group aggregation function
Fixed notice level error 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49992 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-22 00:45:50 +00:00
Ingo Schommer
541c8a8904 Merged revisions 49946 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49946 | ischommer | 2008-02-21 15:21:48 +1300 (Thu, 21 Feb 2008) | 1 line
  
  fixed caching in getManyManyComponents (see r43848)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-21 02:23:39 +00:00
Mark Rickerby
24bd071767 removed redundant error strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 23:01:02 +00:00
Mark Rickerby
6966328cd5 Added a default exception handler. Any uncaught exceptions thrown from application code are now scooped up by the Debug::fatalHandler
Still some small problems with displaying stack traces of exceptions because the context array from trigger_error looks quite different from that of Exception::getTrace

Also fixed a couple of echo/print bugs in Debug::friendlyError. From the looks of the code there may be more bugs to cleanup here.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 21:37:22 +00:00
Sam Minnee
ecdc4d5cbf Fixed Controller::allowed_actions documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:49:35 +00:00
Sam Minnee
21c8752e2c Removed warning in group admin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:40:13 +00:00
Sam Minnee
3e2fdf49f0 Improved allowed_actions support for subclassed controllers, such as CMSMain extends LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49886 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:39:53 +00:00
Sam Minnee
53ef54c4b1 Removed use of deprecated setExtraClass
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:39:17 +00:00
Sam Minnee
e4d300c8c8 Moved _ss_environment.php include to very top
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49884 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:39:00 +00:00
Ingo Schommer
20b0a8ef6e Merged revisions 49843 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49843 | ischommer | 2008-02-20 12:03:49 +1300 (Wed, 20 Feb 2008) | 1 line
  
  added $casting for BaseHref()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 23:04:12 +00:00
Ingo Schommer
3f6afa2904 Merged revisions 49834 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49834 | ischommer | 2008-02-20 11:45:56 +1300 (Wed, 20 Feb 2008) | 1 line
  
  fixed sql-injection
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 22:46:30 +00:00
Sam Minnee
b10974b553 Merged revisions 48425 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r48425 | sminnee | 2008-01-22 17:16:41 +1300 (Tue, 22 Jan 2008) | 3 lines
  
  Updated AssetAdmin to use TreeTitle() in place of Title for tree generation
  > Updated TreeTitle() to allow use of alternateTreeTitle() in decorator
  > Updated File to allow the insertion of extra columns by decorator
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:50:17 +00:00
Sam Minnee
49db7da7c6 Merged revisions 49732 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.1.0-rc3oriwave2

........
  r49732 | sminnee | 2008-02-19 10:27:49 +1300 (Tue, 19 Feb 2008) | 1 line
  
  Updated subject line of warning/error emails
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:49:57 +00:00
Sam Minnee
8eb13d5128 Moved folder admin form to Folder::getCMSFields() to let you more easily manipulate the form with a decorator
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:49:33 +00:00