Andrew O'Neil
2259c8f6d9
simon_w: #2122 - Bug in PageComments class (Security)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47930 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-13 20:06:35 +00:00
Andrew O'Neil
033f55f5c1
Fix i18n errors
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-11 01:43:15 +00:00
Sam Minnee
d92b02a9b0
simon_w: #2098 : Fixed notice level error
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 23:45:26 +00:00
Sam Minnee
1dea06a698
rbarreiros: #1907 - Patch for more i18n strings
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 22:27:38 +00:00
Sam Minnee
7d00a996b4
rbarreiros: #1918 Translate newsletter and other strings
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 03:28:13 +00:00
Sam Minnee
d9ac1a1f85
Improved API documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:33:49 +00:00
Sam Minnee
bfc448fa7f
Added package tags and docblock info for API documentation
...
Fixed whitespace
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:41:55 +00:00
Sam Minnee
b1f5068010
Removed unnecessary file CMSHelp
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 03:47:12 +00:00
Ingo Schommer
fea3f62490
removed DetailForm() (was just needed to set custom class which is now in $popupClass), updated saveComplexTableField() to reflect parent class code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 08:44:29 +00:00
Andrew O'Neil
e2db1e9542
Merged revisions 46902 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.1
........
r46902 | aoneil | 2007-12-14 16:09:40 +1300 (Fri, 14 Dec 2007) | 2 lines
Fix big block in security admin
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47290 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:38:01 +00:00
Andrew O'Neil
1e87e05e0b
Merged revisions 46433 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy
........
r46433 | aoneil | 2007-12-06 15:23:18 +1300 (Thu, 06 Dec 2007) | 2 lines
Some basic styling for HasManFileField
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:03:48 +00:00
Andrew O'Neil
5c67117056
Merged revisions 46302 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy
........
r46302 | aoneil | 2007-12-04 16:16:21 +1300 (Tue, 04 Dec 2007) | 2 lines
Include HasManyFileField javascript
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:02:54 +00:00
Andrew O'Neil
14d802454d
Merged revisions 46776 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy
........
r46776 | aoneil | 2007-12-14 09:49:36 +1300 (Fri, 14 Dec 2007) | 2 lines
Fix ambiguous SQL
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:56:37 +00:00
Sam Minnee
98b6ffad3d
hpoley: #1931 - Change CSS background repeat of logo
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46734 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 01:42:48 +00:00
Sam Minnee
cf31a3d4e6
rhalff: #1580 - i18n for comments system
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 22:57:29 +00:00
Sam Minnee
d1ead49133
#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/cms/trunk@46672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 05:16:10 +00:00
Andrew O'Neil
1396764915
Special Characters Error Fixing In Translate Mode (merged from branches/2.2.0@45907, r45259)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:37:42 +00:00
Andrew O'Neil
59c8237efd
Change remaining references to 'Sitemap' to 'GoogleSitemap'
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46088 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:22:43 +00:00
Normann Lou
dd0f2f72be
comment out Sitemap::ping() since it has been fixed in 2.2-rc2 and have not merge back yet.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-27 21:41:23 +00:00
Normann Lou
b971a36b08
fix bug: actions doesn't updated in right panel
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-27 00:28:24 +00:00
Normann Lou
6544778094
push the hiddenfield ctf[ID] which is deleted by merging but it seems that we need it in any cases.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 21:19:02 +00:00
Normann Lou
4e4ab64ce4
revert changeset/45480/open/modules/cms/trunk/code/SecurityAdmin.php
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45639 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 03:46:16 +00:00
Normann Lou
a3f9d9b6d3
switch externals to trunk.
...
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk
r32483: merge 2.0infom with lastes chunk
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block
r33580: styling for combined form communication in myinfom pages
r33706: styling of combined form (communication) in Email
r33881: made compatible to $extraClass
r33885: added defaultVal
r33887: fixed typo
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class
r34914: WIP3866: Factfinder: Hide "self emplyed" block
r34964: Change current plan upto TraumaInsurance?
r35038: disabled friggin field focus
r35230: #1032 Fixed hash-link insertion
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion)
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code
r36826: change wrong indent format
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode
r40815: add an unsubscribe record when a member subscribe a newslettertype
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31 : CRM not showing search results
r43226: fixed search (partial merge from trunk)
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 01:10:19 +00:00
Sam Minnee
d8709777c0
parents-merge 35486 - Added option for getNameForEmail() function to be added to a member, which will create in an email template sent to that person
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45053 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:38:50 +00:00
Sam Minnee
cbbdd8c412
parents-merge 35478 - Fixed bugs with newsletter import (.CSV didn't work if capital letters, no scroll on import form)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:31:27 +00:00
Sam Minnee
584481c100
parents-merge 33200 - Fix duplicate page with multiple parents
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:20:05 +00:00
Andrew O'Neil
dbe70dc381
#1809 - Fix for CMS LeftAndMain.php DropdownTimeField.js was being included by Requirements::css() instead of Requirements::javascript() (merged from branches/2.2.0, r44884)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44928 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:52:42 +00:00
Andrew O'Neil
b4fc0105e4
#1801 - search provides all results back, not a filtered search (merged from branches/2.2.0, r44867)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:46:52 +00:00
Andrew O'Neil
e5783909fe
#1786 - Image insert sidepanel: What happened to the sorting? (merged from branches/2.2.0, r44844)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44922 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:45:11 +00:00
Andrew O'Neil
32ae7a9b7a
#1763 - Blank popup in security section (merged from branches/2.2.0, r44789)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:43:09 +00:00
Andrew O'Neil
fe054ae21d
#1764 - No way to remove a member from a group (merged from branches/2.2.0, r44771)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:42:22 +00:00
Andrew O'Neil
b4b4311eb6
SWFUpload works on linux if you have beta flash plugin (merged from branches/2.2.0, r44813)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44898 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:31:22 +00:00
Andrew O'Neil
d44ef49db6
Revert r44795 (merged from branches/2.2.0, r44812)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:30:25 +00:00
Andrew O'Neil
58c39593b3
Update SWFUpload to 7.0-beta-3 (merged from branches/2.2.0, r44795)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:30:08 +00:00
Andrew O'Neil
2149c1569f
#1702 - When in translation mode on meta-data tab, refreshing CMS removes site tree
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-13 00:14:15 +00:00
Romain Louis
852a379417
ToggleCompositeField.js added to fix first loading problem
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 23:00:20 +00:00
Andrew O'Neil
b166122aa7
#1703 - Folder dropdown doesn't refresh after adding a folder
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 21:47:45 +00:00
Ingo Schommer
4ff41983d3
added entity
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44648 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 06:18:46 +00:00
Ingo Schommer
99b0288927
fixed export-feature in MemberTableField
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 03:27:13 +00:00
Andrew O'Neil
2088a0ffc5
#1484 - Cannot upload files
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-11 23:01:17 +00:00
Andrew O'Neil
86c7247621
Clean up insert flash pane
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-08 02:08:50 +00:00
Andrew O'Neil
72dedb6caf
#1628 - Resizing images seems to break images, and doesn't display on front end
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 21:39:57 +00:00
Sean Harvey
699db068b8
Ticket #1522 - Statistics area styling
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44462 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 07:44:51 +00:00
Normann Lou
b10466a0da
fix ambigours ID in Where clause in unUsedFiles function
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 06:35:55 +00:00
Normann Lou
da2b28b180
new lang files updated from translateserver. Date ago() translated
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 06:05:52 +00:00
Andrew O'Neil
3d7342bc4c
#1607 - Make image editor findable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44445 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 04:50:09 +00:00
Normann Lou
098c6cadaf
redecleared i18nEntity: TREESITECONTENT
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 23:44:20 +00:00
Normann Lou
e5ad6ab87a
SiteTreeFilterOptions needs to be translated
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 23:28:54 +00:00
Normann Lou
76923ab9e1
change EntityName to be right one (eg. TREESITECONTENT)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 22:52:24 +00:00
Sean Harvey
e49d31a322
Ticket #1498 - CSS tweaks, and nesting of sitetree html was wrong, fail!
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44340 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 03:57:40 +00:00