Commit Graph

794 Commits

Author SHA1 Message Date
Andrew O'Neil
8fc8eec672 Merged revisions 46591 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46591 | aoneil | 2007-12-11 14:29:01 +1300 (Tue, 11 Dec 2007) | 1 line
  
  Highlighting of search results
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46780 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:50:22 +00:00
Andrew O'Neil
bb5f6593e8 Merged revisions 46568 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46568 | aoneil | 2007-12-11 10:20:00 +1300 (Tue, 11 Dec 2007) | 1 line
  
  Added a ContextSummary method, which returns a block of text surrounding a word
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:50:00 +00:00
Andrew O'Neil
777c35c5d6 Merged revisions 46561 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46561 | aoneil | 2007-12-11 10:10:05 +1300 (Tue, 11 Dec 2007) | 2 lines
  
  We already figured out what the page start is, we shouldn't calculate it again
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:49:38 +00:00
Andrew O'Neil
ed2277aa8d Merged revisions 46560 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46560 | aoneil | 2007-12-11 10:09:07 +1300 (Tue, 11 Dec 2007) | 2 lines
  
  Added FirstItem() and LastItem() functions, which return the number of the first and last items in the current page
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:49:18 +00:00
Andrew O'Neil
a42c2f9bdb Merged revisions 46519 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46519 | aoneil | 2007-12-10 14:30:40 +1300 (Mon, 10 Dec 2007) | 2 lines
  
  Fixed PHP notice
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:47:39 +00:00
Andrew O'Neil
69d40fd5aa Merged revisions 46506 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46506 | aoneil | 2007-12-10 10:50:26 +1300 (Mon, 10 Dec 2007) | 2 lines
  
  Remove comments
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:47:23 +00:00
Andrew O'Neil
4a233b8854 Merged revisions 46505 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46505 | aoneil | 2007-12-10 10:48:37 +1300 (Mon, 10 Dec 2007) | 2 lines
  
  Load content from files into the database
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:47:07 +00:00
Andrew O'Neil
7f09e54d90 Initialized merge tracking via "svnmerge" with revisions "0-46440" from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46773 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:46:38 +00:00
Sam Minnee
c77105e517 hpoley: #1871 - Escape RedirectorPage::Link()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 00:46:01 +00:00
Sam Minnee
5f4422f54a lperera: #1819 - Patch to prevent caching empty responses in RestfulService
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 00:39:33 +00:00
Sam Minnee
0235aee5df wakeless: #1823 - Improve memory usage of ManifestBuilder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46730 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 00:36:38 +00:00
Sam Minnee
5dac73b21e wakeless: #1689 - ViewableData::Me() function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46724 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 22:59:30 +00:00
Sam Minnee
fcd42544ab wakeless: #1419 Removed e_notice level error on DataObject::write()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 22:46:13 +00:00
Sam Minnee
25a0f96e05 Trivial change; testing svnmerge.py
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 05:28:35 +00:00
Sam Minnee
e8d39e055a #1056 - Fixed deletefromlive messages with quote in title
Fixed Convert::raw2js() for strings containing slashes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 05:16:10 +00:00
Sam Minnee
762c1a7369 Fixed bug in Database::manipulate() that prevented pages from being saved with single quotes at the end of the title
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46671 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 05:15:17 +00:00
Ingo Schommer
d45891e114 added turkish translation (thanks mustafa, talyan and mustafa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46482 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-08 02:28:40 +00:00
Ingo Schommer
0bf681d99c fixed spelling of language
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46481 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-08 00:58:09 +00:00
Ingo Schommer
f46b875dba member profile: sorting by title
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-08 00:16:08 +00:00
Normann Lou
6e56a131b8 revert to silverstripe_version
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-06 21:43:38 +00:00
Ingo Schommer
fd9d89936a added language files for italian, russian, slovak
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-05 21:38:01 +00:00
Ingo Schommer
b3d3435765 Removed merge tracking for "svnmerge" for
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-04 04:59:39 +00:00
Ingo Schommer
ccc0dd29e2 Initialized merge tracking via "svnmerge" with revisions "1-39002" from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.0


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46320 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-04 04:59:06 +00:00
Ingo Schommer
623ab42539 added setParentIdName() for really manual setting of the relation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46318 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-04 04:54:26 +00:00
Ingo Schommer
e4a7141f00 additional requirements isset() check
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46309 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-04 04:09:07 +00:00
Sam Minnee
395da98591 Improved support for DataObjectInterface implementors in forms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46307 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-04 04:07:04 +00:00
Normann Lou
f141fbe5ad To include OldPassword field only when the curruentUser exists and (no autologinhash given or the autologinhash is not right), since there a lots of cases that the currentUser exists (like a temperary member ) but he hasn't got password yet.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46304 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-04 03:53:46 +00:00
Ingo Schommer
de30b37795 #1534 (patch by severin.schols) Added support for sprintf(_t()) usage in template for translation
see http://code.google.com/p/google-highly-open-participation-silverstripe/issues/detail?id=29

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-03 01:21:52 +00:00
Andrew O'Neil
9c6a30d363 Removed hashing algorithms that contained a command to allow for mysqldumps to be run without very weird corruption errors (merged from branches/2.2.0@45907, r45906)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:35:51 +00:00
Andrew O'Neil
425714a281 Authentication for test wasn't working. (merged from branches/2.2.0@45907, r45823)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:35:30 +00:00
Andrew O'Neil
8f712a3392 #1892 - Image attach from file store broken (merged from branches/2.2.0@45907, r45762)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:35:17 +00:00
Andrew O'Neil
cdf221bdde Wrong case on db field for virtual pages (merged from branches/2.2.0@45907, r45687)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:35:05 +00:00
Andrew O'Neil
1df5d2b641 cache folder in webroot should just be called silverstripe-cache (merged from branches/2.2.0@45907, r45618)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:34:18 +00:00
Andrew O'Neil
a6c210d2e5 Use local copy of browscap (merged from branches/2.2.0@45907, r45617)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:34:09 +00:00
Andrew O'Neil
6921b5e1c1 Fixed bug with 404 header (merged from branches/2.2.0@45907, r45616)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:33:59 +00:00
Andrew O'Neil
27c70de07e added indices (merged from branches/2.2.0@45907, r45542)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:33:48 +00:00
Andrew O'Neil
9c6f7345b0 improved profiler div (auto-scrolling, close-link) (merged from branches/2.2.0@45907, r45541)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:33:36 +00:00
Andrew O'Neil
b2ef5af8c1 passing through all parameters to DataObject::get()/get_one() (merged from branches/2.2.0@45907, r45538)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:33:24 +00:00
Andrew O'Neil
fef35f86eb 1-to-1 relation management adding (merged from branches/2.2.0@45907, r45481)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:32:41 +00:00
Andrew O'Neil
4dda814a11 Remove right on it's own, css hack only works in firefox (merged from branches/2.2.0@45907, r45475)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:32:30 +00:00
Andrew O'Neil
8903fb8eaf Add on its own alignment for images (merged from branches/2.2.0@45907, r45472)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46103 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:32:12 +00:00
Andrew O'Neil
ffe47f12b0 +c (merged from branches/2.2.0@45907, r45465)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46102 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:30:30 +00:00
Andrew O'Neil
84ae974db4 #1850 - Changing default admin password after installation does not work (merged from branches/2.2.0@45907, r45451)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46101 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:30:12 +00:00
Andrew O'Neil
f44171bf41 #1849 - Adding a page sadly now always comes up with an alarming, needless, confirmation (merged from branches/2.2.0@45907, r45444)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46100 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:29:47 +00:00
Andrew O'Neil
e19ec7d93f #1432, #1557 - Added Director::set_status_code() and Director::get_status_code(), and used this to fix 404 errors. (merged from branches/2.2.0@45907, r45443)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:29:31 +00:00
Andrew O'Neil
4e5bdfc3fe Removed notice level error (merged from branches/2.2.0@45907, r45442)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:28:53 +00:00
Andrew O'Neil
bd9c74e7a6 Added skeletal registration module for merge project (merged from branches/2.2.0@45907, r45385)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:28:41 +00:00
Andrew O'Neil
cde02ea1fa Fix incorrect docs (merged from branches/2.2.0@45907, r45187)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:28:02 +00:00
Andrew O'Neil
9c29864827 Relation Tables Reorganisation (merged from branches/2.2.0@45907, r45142)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46095 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:27:49 +00:00
Andrew O'Neil
dd85ba1141 Add an element sets the relation with the parent automatically but this functionnality needs to be unset for the HasManyComplexTablefield (merged from branches 2.2.0, r45135)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:27:34 +00:00