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
587 Commits 29 Branches 403 Tags 28 MiB
ed096f66fb
Commit Graph

587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sean Harvey
5313544f7b Ticket #1699 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44609 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 00:49:09 +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
0269aa224d #1606 - Check add folder & upload-functionality in tinymce 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44594 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 22:30:01 +00:00
Romain Louis
1fdd1553fd IFrame layout changes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44591 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 22:08:50 +00:00
Romain Louis
a594f53719 French CMS Translation adding 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44586 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 21:14:03 +00:00
Sean Harvey
b6bff63b10 Styling, and tweak to show logged in user even if first name doesn't exist 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44572 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 02:43:23 +00:00
Sean Harvey
a33b577aaf Added new loading image, removed old one hanging around 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44569 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-10 06:41:14 +00:00
Sean Harvey
8ee1966997 IE6/7 has unncessary scroll bar 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44557 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 03:53:15 +00:00
Sean Harvey
a8934d4354 Right align contentpanel action buttons 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44556 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 03:49:36 +00:00
Sean Harvey
eddea31429 Pulled #right out of Layout into it's own cms_right file 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44549 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 02:58:25 +00:00
Sean Harvey
11def0fbf2 Overflow shouldn't happen on main #right div - it's resizing is controlled by js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44547 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 02:55:34 +00:00
Andrew O'Neil
ff104381ea Remove stuff that breaks IE 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44536 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 01:07:42 +00:00
Andrew O'Neil
9a81e1461d IE hacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44533 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 00:50:42 +00:00
Andrew O'Neil
0fc99de98c #1657 - image popup should expand to fill room 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44529 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 00:41:10 +00:00
Sean Harvey
8dc2b6e7e6 DESIGN change - removed status images, these were removed in design so we'll remove them from 2.2 as well 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44518 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-08 04:59:19 +00:00
Sean Harvey
d843553e4c Fixed search CSS, and repeat background in IE6 of site tree root node 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44517 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-08 04:43:19 +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
Sam Minnee
4921e0380a ie6 is gay. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44488 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-08 01:13:09 +00:00
Sean Harvey
da9539d48e Added scrollbar to images on right panel - checked in IE6/7 Safari and Firefox 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44486 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 23:41:40 +00:00
Will Rossiter
43fa438351 more fixs to that menu 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44485 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 22:59:28 +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
a8c184cfe8 Fix background repeat in IE6 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44463 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 07:55:01 +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
Sean Harvey
eeef71981d Consistent background of width, height and labels same as left hand side content area 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44459 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 06:35:31 +00:00