tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
2,912 Commits 29 Branches 403 Tags 28 MiB
df859b7794
Commit Graph

2912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew O'Neil
6f2bc927ee Merged revisions 46640 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/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/cms/trunk@46787 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:56:22 +00:00
Andrew O'Neil
e3583e1f73 Merged revisions 46633 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy

........
  r46633 | aoneil | 2007-12-12 12:01:23 +1300 (Wed, 12 Dec 2007) | 1 line
  
  There is no MemberControlPanel - old custom code
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46785 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:54:53 +00:00
Andrew O'Neil
bf9d942cda Blocked revisions 46626 via svnmerge 
........
  r46626 | aoneil | 2007-12-12 11:03:35 +1300 (Wed, 12 Dec 2007) | 1 line
  
  comment out unused files tab, it uses far too much memory
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46784 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:53:37 +00:00
Andrew O'Neil
5d454c9a32 Initialized merge tracking via "svnmerge" with revisions "0-46301" from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46783 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:52:23 +00:00
Sam Minnee
651196e36c michael: #1405 - Fix ThumbnailStrip caching 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46735 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 01:51:17 +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
Ingo Schommer
5205ee4b45 added turkish translation (thanks mustafa, talyan and mustafa) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46482 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-08 02:28:40 +00:00
Ingo Schommer
890ae7bcd1 added language files for italian, russian, slovak 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46402 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-05 21:38:01 +00:00
Andrew O'Neil
b38a64f55a reverted 45866, translation server producing duplicate lines (merged from branches/2.2.0@45907, r45869) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46123 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:40:19 +00:00
Andrew O'Neil
caaa3801fe updated tranlations (merged from branches/2.2.0@45907, r45866) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46122 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:40:04 +00:00
Andrew O'Neil
eaa1df9a94 remove unfinished catalon translation (merged from branches/2.2.0@45907, r45862) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46121 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:39:49 +00:00
Andrew O'Neil
dff982afc6 Better upload error messages (merged from branches/2.2.0@45907, r45463) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46120 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:38:28 +00:00
Andrew O'Neil
9037878a5b Disable automatic insertion of images (merged from branches/2.2.0@45907, r45462) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46119 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:38:15 +00:00
Andrew O'Neil
66cf27f914 #1839 - Unnecessary file and/or wrong filename (merged from branches/2.2.0@45907, r45457) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46118 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:38:03 +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
1ec701d849 #1815 - The Page view: Edit | Draft Site | Published shouldn't show when it's not relevant (merged from branches/2.2.0@45907, r44977) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46116 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:37:28 +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
4fcb294634 fix a syntax bug 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45661 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-26 04:19:48 +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
Ingo Schommer
f038e6d564 Initialized merge tracking via "svnmerge" with revisions "1-44682" from 
svn://svn.silverstripe.com/open/modules/cms/trunk


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45635 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-26 03:20:42 +00:00
Ingo Schommer
b94dc5ef6a Adding Portugues (Portugal) translation - thanks to Rui and Anselmo 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45619 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-26 02:18:28 +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
7eb2078d28 #1794 - Increase height of link and folder dropdown boxes (merged from branches/2.2.0, r44860) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44924 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:46:16 +00:00
Andrew O'Neil
1a1fd4e200 #1789 - Security permissions tab: bad help link: "See this page for more information" (merged from branches/2.2.0, r44845) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44923 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:45:43 +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
fac5e576f1 #1755 - Can't upload any files using the 'Upload' tab on a folder in Files and Images section (merged from branches/2.2.0, r44824) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44900 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:31:57 +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
Sean Harvey
d9bda6e6bb Ticket #1775 - Hack to get the statistics admin using a scrollbar 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44838 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-14 22:49:57 +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
e4906b1a1a #1670 - Commit translations into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44667 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 22:53:36 +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
Romain Louis
2a86989f02 ImageField css changes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44638 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 04:29:29 +00:00
Romain Louis
46bb86df3f Country drop down css changes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44628 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 04:01:28 +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