Commit Graph

838 Commits

Author SHA1 Message Date
Andrew O'Neil
00bee53763 Blocked revisions 48823 via svnmerge
........
  r48823 | aoneil | 2008-01-30 16:19:22 +1300 (Wed, 30 Jan 2008) | 2 lines
  
  Merged r48785 from trunk: add ability to choose which file to upload to in a filefield
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48951 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-01 01:21:22 +00:00
Andrew O'Neil
797bbd28eb Initialized merge tracking via "svnmerge" with revisions "0-48822" from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-ssopen


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48950 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-01 01:20:59 +00:00
Sam Minnee
b4de288995 #2212 / #2201 - Fix notice-level errors in PageView updates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48934 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-31 21:38:11 +00:00
Sam Minnee
536770caca mrickerby: #2201 - fixed PageView's recording of referrers.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48905 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-31 04:30:36 +00:00
Normann Lou
03cabb839d For some project we need server run some scheduled task yearly, such as upgrade high school students for GSO.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-31 03:46:21 +00:00
Ingo Schommer
d28faae514 updating form in ctf-popup after saving (including validation-errors and fields that have may changed on the serverside, e.g. ImageField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 22:57:23 +00:00
Normann Lou
0672ce2d0a not all cms panel has sitetree, so better check if($('sitetree')) exsit, otherwise IE broken with all genericDataAdmin panel.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48862 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 22:29:24 +00:00
Ingo Schommer
71736d4ea8 adding "delete" class to DeleteImageForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 21:21:25 +00:00
Ingo Schommer
21180f52bd compressed ImageField layout to fit in CTF-popup (removed "click here to remove" label)
removed iframe-borders for IE

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 20:12:19 +00:00
Ingo Schommer
c89d0dc981 fixed "object not found" error in ie6 (somehow Observable is not applied to sitetree at window-load)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 05:29:14 +00:00
Normann Lou
a4630b1736 Polishing EducatorAdmin's Students Tab
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 05:05:20 +00:00
Ingo Schommer
d2ee619caa locking down URLs: image/iframe, image/flush, image/transferlegacycontent
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-30 04:29:23 +00:00
Andrew O'Neil
97f3d722b4 Add ability to choose which file to upload to in a FileField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-29 20:18:06 +00:00
Sam Minnee
b07725cdae Fixed illegal reference to this
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48681 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-28 05:03:35 +00:00
Sam Minnee
9344321d14 Merged revisions 48462 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r48462 | sminnee | 2008-01-23 15:49:04 +1300 (Wed, 23 Jan 2008) | 1 line
  
  Put MenuTitle in the CMS LHS tree instead of Title
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48542 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:13:38 +00:00
Sam Minnee
e0614530c6 Merged revisions 48451 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r48451 | jshipman | 2008-01-23 14:42:20 +1300 (Wed, 23 Jan 2008) | 1 line
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48541 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:13:24 +00:00
Sam Minnee
68f7be24ed Merged revisions 48178 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r48178 | aoneil | 2008-01-18 09:04:53 +1300 (Fri, 18 Jan 2008) | 2 lines
  
  Fix incorrect text boxes being set on an ajax request
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48540 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:13:05 +00:00
Sam Minnee
d34672a260 Merged revisions 48082 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r48082 | aoneil | 2008-01-16 16:44:45 +1300 (Wed, 16 Jan 2008) | 2 lines
  
  Allow many-many complex table fields to be used on the reverse side of the join (belongs many many)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48539 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:12:42 +00:00
Sam Minnee
5a20210f7c Merged revisions 47743 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r47743 | jshipman | 2008-01-09 10:26:26 +1300 (Wed, 09 Jan 2008) | 1 line
  
  Removed ranking tools from DataObjectSet
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48538 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:12:26 +00:00
Sam Minnee
4e32ae08a3 Merged revisions 47459 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r47459 | jshipman | 2007-12-21 13:56:40 +1300 (Fri, 21 Dec 2007) | 1 line
  
  implemented equal values
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:12:14 +00:00
Sam Minnee
a356bf9181 Merged revisions 47454 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r47454 | jshipman | 2007-12-21 13:36:38 +1300 (Fri, 21 Dec 2007) | 1 line
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:12:02 +00:00
Sam Minnee
08a5d49c66 Merged revisions 47172 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r47172 | sminnee | 2007-12-17 13:54:48 +1300 (Mon, 17 Dec 2007) | 2 lines
  
  Added simple to-do list facility to SiteTree 
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48535 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:11:04 +00:00
Sam Minnee
e667b62537 Merged revisions 47156 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r47156 | sminnee | 2007-12-17 11:21:23 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Added title attributes to the SilverStripeNavigator messages
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48534 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:10:45 +00:00
Sam Minnee
1e4f16aaa2 Merged revisions 47155 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r47155 | sminnee | 2007-12-17 11:20:21 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Added paste plain text and paste from word buttons to the HtmlEditorField in the CMS
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48511 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-23 23:02:34 +00:00
Sam Minnee
fb9807b375 Initialized merge tracking via "svnmerge" with revisions "1-47140" from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-23 23:01:34 +00:00
Sam Minnee
d047572c6a #2005 - Fixed fatal error due to browscap.ini capitalisation error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-23 22:56:49 +00:00
Sean Harvey
59a60db5fe Added in_array_recursive() to ArrayLib, for recursively checking an array with nested arrays
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-22 04:13:14 +00:00
Normann Lou
18991b1f1e fix the bug that initialises with preloaded selected items with right hide/show
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48412 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-22 03:51:24 +00:00
Sam Minnee
12607e78b0 Added sapphire/conf/ConfigureFromEnv.php for making use of _ss_environment.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-21 08:01:30 +00:00
Sean Harvey
e28361a313 Fixed formatting of code, and added some documentation on what the source for this field should be
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48319 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-20 08:58:04 +00:00
Sean Harvey
20da7e8f95 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48306 467b73ca-7a2a-4603-9d3b-597d59a354a9 2008-01-20 03:01:18 +00:00
Andrew O'Neil
3a0fd261ad Fix sorting in complextablefield
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-18 05:01:35 +00:00
Sam Minnee
27849e2418 #1736 - Make Security::get_encryption_algorithms() a dynamic function again.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48220 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-18 01:55:51 +00:00
Matt Peel
cf7f46f870 Fixed comment.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 23:03:11 +00:00
Sam Minnee
d2b25999c8 Re-enabled session_regenerate_id()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 04:50:02 +00:00
Ingo Schommer
a1451739a4 Merged revisions 48168 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48168 | ischommer | 2008-01-17 17:20:45 +1300 (Thu, 17 Jan 2008) | 1 line
  
  renamed escapeFlagForField() to escapeTypeForField(), updated documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48163 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 04:23:31 +00:00
Ingo Schommer
0b5ab1fc7b Merged revisions 48164 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48164 | ischommer | 2008-01-17 17:05:49 +1300 (Thu, 17 Jan 2008) | 2 lines
  
  Deprecated use of DBField 'Text' for saving HTML-Content (added check in HTMLEditorField->saveInto())
  Added ViewableData->escapeFlagForField() to determine if the record-field needs escaping (currently only 'xml' supported)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 04:22:13 +00:00
Sam Minnee
f7b484658f Refactored session_regenerate_id to make it easier to disable in some circumstances.
Temporarily disabled session_regenerate_id so that Windmill can work.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 03:00:53 +00:00
Sam Minnee
1d304a995c Removed notice level errors for better cli-script operation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 01:58:37 +00:00
Sam Minnee
5896e37f0d Added note about Makefile so that people don't think they should use that for normal installation.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48126 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 23:47:53 +00:00
Ingo Schommer
794dc27b31 formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 21:51:44 +00:00
Ingo Schommer
1d7eeb378c formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 21:50:18 +00:00
Ingo Schommer
48d19626dc removed dropDatalessFields() - needs serious refactoring before going into core again
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48103 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 21:35:59 +00:00
Ingo Schommer
a86a35f76a removed dropDatalessFields() - needs serious refactoring before going into core again
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48102 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 21:32:37 +00:00
Ingo Schommer
3e9c02e183 renamed $wantDefaultAddRow to $showAddRow
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 20:34:40 +00:00
Ingo Schommer
265d52d037 fixed escaping errors in default homepage content
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 20:17:14 +00:00
Sam Minnee
ddb96b9dbd Added Makefile so that you can execute 'make test' in sapphire and it will run tests.
Added support for  array in _ss_environment.php for specifying URLs to use for cli-script.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 05:24:27 +00:00
Normann Lou
1896bff08c fix bug: when no source items found, the table should still show and it should works as adding new records
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 03:54:33 +00:00
Andrew O'Neil
a1792c0e89 Fix php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47978 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-14 21:26:23 +00:00
Andrew O'Neil
c09a5440ca FIx php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47975 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-14 21:19:28 +00:00