Andrew O'Neil
de1749f34c
Blocked revisions 46805-46806,46809,46812 via svnmerge
...
................
r46805 | ischommer | 2007-12-14 11:15:26 +1300 (Fri, 14 Dec 2007) | 9 lines
Merged revisions 45626 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/trunk
........
r45626 | ischommer | 2007-11-26 15:18:28 +1300 (Mon, 26 Nov 2007) | 1 line
Adding Portugues (Portugal) translation - thanks to Rui and Anselmo
........
................
r46806 | ischommer | 2007-12-14 11:16:43 +1300 (Fri, 14 Dec 2007) | 9 lines
Merged revisions 46409 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/trunk
........
r46409 | ischommer | 2007-12-06 10:38:01 +1300 (Thu, 06 Dec 2007) | 1 line
added language files for italian, russian, slovak
........
................
r46809 | ischommer | 2007-12-14 11:17:24 +1300 (Fri, 14 Dec 2007) | 9 lines
Merged revisions 46489 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/trunk
........
r46489 | ischommer | 2007-12-08 15:28:40 +1300 (Sat, 08 Dec 2007) | 1 line
added turkish translation (thanks mustafa, talyan and mustafa)
........
................
r46812 | ischommer | 2007-12-14 11:17:55 +1300 (Fri, 14 Dec 2007) | 9 lines
Merged revisions 46801 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/trunk
........
r46801 | ischommer | 2007-12-14 11:10:34 +1300 (Fri, 14 Dec 2007) | 1 line
Added new languages (bulgarian, czech, hungarian, portugues/brazil, slovak, italian, russian, turkish) for 2.2.1 release, removed duplicate entities, sorted by namespace
........
................
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:34:49 +00:00
Andrew O'Neil
8b85ef1ae1
Merged revisions 46468 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
........
r46468 | sminnee | 2007-12-07 11:30:35 +1300 (Fri, 07 Dec 2007) | 1 line
Added empty array to member so that roles can add their own has_one relations
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:34:18 +00:00
Andrew O'Neil
7b0de78a31
Merged revisions 46467 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
........
r46467 | sminnee | 2007-12-07 11:28:44 +1300 (Fri, 07 Dec 2007) | 1 line
Added empty array to member so that roles can add their own has_one relations
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:34:11 +00:00
Andrew O'Neil
f630e571af
Merged revisions 46348 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
........
r46348 | jshipman | 2007-12-05 12:32:08 +1300 (Wed, 05 Dec 2007) | 1 line
fixed notices
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:33:51 +00:00
Andrew O'Neil
fa9a258bd2
Merged revisions 46139 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
........
r46139 | aoneil | 2007-12-03 11:28:34 +1300 (Mon, 03 Dec 2007) | 2 lines
#1942 - Object::uninherited() fix for PHP 5.1.2
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46814 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:33:25 +00:00
Andrew O'Neil
6b66c9beff
Merged revisions 46074 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
........
r46074 | aoneil | 2007-11-30 17:12:47 +1300 (Fri, 30 Nov 2007) | 2 lines
Don't give SecurityID fields a title, as some forms will show it
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:33:07 +00:00
Andrew O'Neil
dfc48d8421
Merged revisions 46001 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
........
r46001 | sminnee | 2007-11-29 19:56:52 +1300 (Thu, 29 Nov 2007) | 1 line
Fixed bug with google sitemap on translated site
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:32:53 +00:00
Andrew O'Neil
0aa4a1e71f
Merged revisions 45962 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
........
r45962 | jshipman | 2007-11-29 16:47:51 +1300 (Thu, 29 Nov 2007) | 1 line
content controller notice, hyperlink underlining
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:31:58 +00:00
Andrew O'Neil
12a4b05367
Initialized merge tracking via "svnmerge" with revisions "0-45944" from
...
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:30:48 +00:00
Ingo Schommer
b31f9329e7
Added new languages (bulgarian, czech, hungarian, portugues/brazil, slovak, italian, russian, turkish) for 2.2.1 release, removed duplicate entities, sorted by namespace
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46794 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:10:34 +00:00
Andrew O'Neil
7c0e6add9b
Added HasManyFileField
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46792 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:05:31 +00:00
Andrew O'Neil
4056408d73
Merged revisions 46775 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy
........
r46775 | aoneil | 2007-12-14 09:40:30 +1300 (Fri, 14 Dec 2007) | 2 lines
Fix loops when saving files
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:51:00 +00:00
Andrew O'Neil
21c69b95c5
Merged revisions 46640 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy
........
r46640 | aoneil | 2007-12-12 13:36:48 +1300 (Wed, 12 Dec 2007) | 1 line
Fix redirection in Director rules
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46781 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:50:40 +00:00
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