Commit Graph

316 Commits

Author SHA1 Message Date
Saophalkun Ponlu
fd5884dbac BUGFIX: didn't work on IE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69684 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 02:55:57 +00:00
Saophalkun Ponlu
299f67cdb3 IMPROVEMENT: image alignment options. ticket #1877
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-19 13:36:59 +00:00
Ingo Schommer
3c8e45f65a MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@67466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:58 +00:00
Sam Minnee
2ee0c0991b Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:50 +00:00
Will Rossiter
fe0ac4e990 Merged in pre-2.3-oct08 branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-17 23:03:39 +00:00
Sean Harvey
19ce25e146 Merged in ReportAdmin JS error fix from branches/2.3 - r65865
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65884 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 23:06:00 +00:00
Sean Harvey
8d370c9cb6 Merged in change from branches/2.3 - r65860
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65882 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 23:03:14 +00:00
Sean Harvey
d8c795b7b7 Merged in flash insert panel bug fixes from r65827
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:37:10 +00:00
Sean Harvey
2ab7415231 Fixed flash upload fit to parent
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:06:23 +00:00
Sean Harvey
c5241fa487 ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:55:23 +00:00
Sam Minnee
5b80a0c1d1 Fixes for IE support of script tags being down the bottom
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:24:02 +00:00
Sam Minnee
38e1030d11 #2991 - Fixed change detection in mce fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 02:41:01 +00:00
Sam Minnee
c2fe5b15ae FEATURE #594: Added javascript-on-demand support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 04:31:53 +00:00
Will Rossiter
4efa350ed5 BUGFIX: temp fix for flash inserter.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65671 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 03:08:24 +00:00
Normann Lou
76afea41bc APICHANGE: tidy up NewsletterAdmin.
BUGFIX: a lot of methods in this class now passed $params as HTTPRequest object, rather than as a array if the function is called from Ajax or top-level of front-end, some method is called in both manner, ie. called from Ajax and called internally as well, so we need to check $params type and do further process. This is a partial fix of open source ticket #3035

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 22:23:48 +00:00
Ingo Schommer
df7092163f ENHANCEMENT Using currently used content languages for options in the TinyMCE spellchecker (see http://open.silverstripe.com/ticket/2498#comment:2)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65513 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:47:13 +00:00
Will Rossiter
0ef452c524 FEATURE: merged back patch for image editor. Currently completely broken on trunk this patch does nothing to fix it sadly. I think its a prototype thing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65351 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 02:04:03 +00:00
Saophalkun Ponlu
f72f2b4dd0 IMPROVEMENT Fix tab display and button position when adding a record (ticket #3029)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65332 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 23:14:00 +00:00
Ingo Schommer
d8acf97911 MINOR JS translations in LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65292 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 14:38:59 +00:00
Saophalkun Ponlu
86017a5ae9 IMPROVEMENT moved managed models' forms to one panel (ticket #2898)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 08:55:07 +00:00
Sam Minnee
6779388b9e BUGFIX: Fixed page comment javascript to suit new Form name
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 04:54:21 +00:00
Sam Minnee
b6ae79afce Added spellchecker to CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 02:13:58 +00:00
Sean Harvey
bd10591e7c ENHANCEMENT Added filter/search capability to AssetTableField, this is similar to MemberTableField, except you search by file name.
ENHANCEMENT Refactored CSS applied to filter boxes by using common selector

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 23:09:49 +00:00
Ingo Schommer
54d8e3ff6f BUGFIX Fixed SiteTreeAccess.js DOM IDs to field changes made in r65150
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65151 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 14:54:57 +00:00
Ingo Schommer
415390373e BUGFIX Fixed js error in LeftAndMain_right.js when displaying readonly pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65148 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 13:53:23 +00:00
Sam Minnee
e32d366975 Fixed TinyMCE stylihg
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64862 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 02:36:54 +00:00
Sam Minnee
4d5092a47d Fixed CMS uploading
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-28 22:13:40 +00:00
Sam Minnee
884795b6e8 BUGFIX: Content wasn't saving on subsequent page loads, after TinyMCE3 upgrade
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-28 04:32:30 +00:00
Saophalkun Ponlu
2dda8bb253 BUGFIX: in IE, overflow left pane is hidden and cannot enable scrollbar
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-27 23:13:56 +00:00
Sam Minnee
2d0e2fa79d Removed scrubbing of the HTML
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-27 08:11:01 +00:00
Sam Minnee
dd7aa66ca7 Fixed bug in tinymce_ssbuttons plugin inclusion
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64760 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:12:43 +00:00
Sam Minnee
9f4ad4b2cc FEATURE: Update to TinyMCE 3.2 - CMS changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64758 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:03:33 +00:00
Sean Harvey
ae4986b0e5 BUGFIX New folders weren't getting their name set correctly, instead they would just be called "NewFolder". This occurred in the Site Content section of the CMS, creating a folder using the right hand panel in that section.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 01:21:12 +00:00
Normann Lou
0f4698726a APICHANGE: delete GenericDataAdmin, RelatedDataEditor, DropdownField_WithAdd and their related code (js, css, etc) from cms, sapphire, "GenericDataAdmin" name space has also been deleted from lang files. They are all added in the new module "genericdataadmin"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 00:20:00 +00:00
Ingo Schommer
62e7970a3a API CHANGE Removed MemberList, use MemberTableField
API CHANGE Removed CMSMain->getMembersByGroup()
API CHANGE Removed SecurityAdmin->listmembers()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 10:48:48 +00:00
Hayden Smith
365622c0c9 Implemented a jQuery based version of documents.getElementsBySelector
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64339 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 02:09:46 +00:00
Hayden Smith
817d8f8f45 BUGFIX: If ajaxActionsOnTop is called twice, the actions are removed.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64314 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-15 20:47:29 +00:00
Ingo Schommer
9a0e053c1e git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64082 467b73ca-7a2a-4603-9d3b-597d59a354a9 2008-10-10 21:07:09 +00:00
Ingo Schommer
63995a366c ENHANCEMENT Added german translation for ModelAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-10 12:36:05 +00:00
Ingo Schommer
08b1d974ac ENHANCMENT Making ModelAdmin translatable (#2874)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64070 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-10 12:15:31 +00:00
Ingo Schommer
1ae697632d BUGFIX Fixed js i18n entity names for TableField (see #2916)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 12:17:42 +00:00
Hayden Smith
690cebdccd Merged from branches/nzct-trunk. Use 'svn log -c <changeset> -g' for full commit message. Merge includes stability fixes and minor refactor of TableListField and ComplexTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 02:00:39 +00:00
Sean Harvey
1e578a32cb MINOR Fixed JS undefined errors with 'addgroup' and 'deletegroup' elements
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 01:10:59 +00:00
Sean Harvey
7d9bfd8c39 MINOR Fixed JS undefined error with 'Loading' element
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 01:10:38 +00:00
Sam Minnee
f82dc14fb1 Updated errorMessage() call in ModelAdmin to actually show the message to the user. For example, 404s return messages of the form 'your search returned no results'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63715 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-07 03:00:25 +00:00
Ingo Schommer
5922029183 BUGFIX Reverted earlier change to ModelAdmin.js statusMessage() display
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63634 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 22:48:43 +00:00
Ingo Schommer
926949e9cc ENHANCMENT Using errorMessage() instead of statusMessage('bad') for ModelAdmin.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 16:24:39 +00:00
Ingo Schommer
255f4653cc BUGFIX typo in js file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63571 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 01:15:59 +00:00
Ingo Schommer
ee4c409e56 ENHANCEMENT Started using ss.i18n clientside javascript in LeftAndMain classes (only a fraction made translatable)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 00:48:34 +00:00
Sam Minnee
743dce78b7 ENHANCEMENT #1848 - Select the title field for new pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-02 10:11:08 +00:00
Saophalkun Ponlu
1d0134db10 fixed fix position of action area (status message and ajax action buttons) in IE6 using javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-02 00:31:33 +00:00
Sean Harvey
03c1d1e001 MINOR Committed missing files related to r63452
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-01 06:43:15 +00:00
Saophalkun Ponlu
9381860e9a layout fix: make the status message and ajax button stay in fixed position (ticket #2876)
- position: fixed for #statusMessage  and ajaxActions in ModelAdmin
- commented out this.style.position = "absolute"; in LeftAndMain.js

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-30 03:04:35 +00:00
Will Rossiter
3b3bea1352 MINOR: allow tinymce to suck down script code at least in tinymce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-30 01:23:05 +00:00
Ingo Schommer
bb3adae0bc BUGFIX Fixed loading indicator in for add form in ModelAdmin.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63297 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-29 19:02:44 +00:00
Sam Minnee
a9fe1eec6a ENHANCEMENT: Prevent CMS session timing out and losing content - Added a ping to Security/ping every 5 mins, and altered the onSessionLost behaviour to open login form in a pop-up instead of closing the CMS (see #2242)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62995 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-24 04:18:29 +00:00
Sam Minnee
deee0458a2 Removed save button from add form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-18 21:25:49 +00:00
Ingo Schommer
b9a0a266cc MINOR Changed console.log() to console.error() in ajax error handling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-16 22:08:02 +00:00
Ingo Schommer
9e2de7ba7e ENHANCEMENT Improved ajax error display within the CMS: Using Firebug (or Firebug Lite) for plaintext output instead of cramming everything into the CMS-status field
FEATURE Including Firebug Lite when requested by ?debug_firebug=1 for easy debugging in IE/Opera/Safari- otherwise including fake-objects with FirebugX by default to enable usage of console.* commands without javascript errors

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-16 21:46:08 +00:00
Sam Minnee
11bb677150 Improved ModelAdmin.js - removed formData and showRecord, creating .fn('loadForm') instead; used livequery more to reduce the amount of behaviour reapplication that was necesary.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-13 06:19:17 +00:00
Sam Minnee
dcb9e53ed0 Updated ModelAdmin.js to use $ instead of jQuery for executing jQuery items.
Added support for specifying a SearchClassSelector() method on ModelAdmin, which returns 'tabs' or 'dropdown', to enable a better UI for ModelAdmins that manage a large number of different classes.
Updated ModelAdmin's javascript to provide more status indicator (loading icons, success/failure messages), using HTTP status codes and custom status text.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62334 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-13 04:45:30 +00:00
Sam Minnee
db0431e8d6 Fixed MemberTableField ajax actions after a search
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62310 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-12 03:22:40 +00:00
Sam Minnee
117f1171e7 Introduce notion of using HTTP status text to pass status message to the end user
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62287 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-12 01:50:08 +00:00
Sam Minnee
b7b59bd916 Reorganised ModelAdmin javascript to be better structured
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62278 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-11 23:18:21 +00:00
Sam Minnee
b4e681dc83 BUGFIX: Removed use of deprecated TableListField_Item::BaseLink() And TableListField::ajax_refresh() from CommentTableField and MemberTableField
BUGFIX: Fixed styling, searching, and pagination of CommentTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-28 04:26:59 +00:00
Sam Minnee
725ba3a610 Fixed bugs in MemberTableField search
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-27 04:58:34 +00:00
Sam Minnee
e2eee05b83 Added back button to ModelAdmin detail views
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-19 05:18:11 +00:00
Hayden Smith
8ab1023e94 Merged [47110]: Hack fix for an email validation problem. Needs better solution.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 00:20:59 +00:00
Hayden Smith
72053a9a76 Merged [47105]: Fixed a typo.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60560 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:56:47 +00:00
Hayden Smith
6a0d483c5d Merged [47103]: MemberTableField.js now uses named sheets.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:54:39 +00:00
Hayden Smith
8bf45c52e2 Merged [47102]: Optimization for Behaviour sheets that allows you to provide a unique identifier so that duplicate sheets aren't applied twice.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60556 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:53:08 +00:00
Sam Minnee
387b5edd21 Merged changes from branches/2.2.2-assets:
Static publishing
Ability to lock down comments to logged-in members only

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:59:27 +00:00
Ingo Schommer
c1a7419f36 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60330 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:03:52 +00:00
Ingo Schommer
9a6483b024 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:25:44 +00:00
Ingo Schommer
cc0117a307 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:21:44 +00:00
Ingo Schommer
574fdb190d (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60287 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:14:48 +00:00
Ingo Schommer
c4651a2fda (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:03:57 +00:00
Ingo Schommer
66b916abc5 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:29:30 +00:00
Ingo Schommer
7ec72c8254 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:17:51 +00:00
Hayden Smith
9a24dd6c42 Merged [47017]: Modified behaviour for MemberTableField popups so that the behaviour is applied if the Security section uses a subclass of MemberTableField rather than an instance of MemberTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60257 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:45:42 +00:00
Ingo Schommer
e29feeecac (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 07:03:24 +00:00
Ingo Schommer
3fe17e9649 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:29:50 +00:00
Ingo Schommer
649ff87aec (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:18:32 +00:00
Ingo Schommer
689c34400b (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:57:44 +00:00
Ingo Schommer
8a4c5fef72 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:00:42 +00:00
Ingo Schommer
9fcc91bcbd (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:38:44 +00:00
Ingo Schommer
08beafbcdb (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:06:52 +00:00
Ingo Schommer
2b87d00c13 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:54:55 +00:00
Ingo Schommer
83fff5f1c1 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:16:46 +00:00
Hayden Smith
587394879e Merged [47009]: Calls bind using Prototype Event.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:37:10 +00:00
Hayden Smith
f2a2903c0e Merged [47008]: Disables the create button while creating a new entry with GenericDataAdmin.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:32:44 +00:00
Hayden Smith
438b6b5f85 Merged [47007]: Fix to prevent GenericDataAdmin setting a status on a new record and thus overwritting a data field named 'Status'. Includes a fix for onclick on Ajax buttons if event is not passed.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:29:32 +00:00
Ingo Schommer
038bcbb8d9 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:28:25 +00:00
Ingo Schommer
2c2412267b Merged revisions 57390 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron

........
  r57390 | ischommer | 2008-07-04 11:06:25 +1200 (Fri, 04 Jul 2008) | 1 line
  
  BUGFIX Preventing non-ajax form submit in CMSMain when pressing enter-key inside certain form fields in Firefox - overloaded onsubmit to use CMSForm->save() now
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-03 23:17:55 +00:00
Andrew O'Neil
48f6aad194 Merged revisions 54959 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2

........
  r54959 | sminnee | 2008-05-22 18:13:24 +1200 (Thu, 22 May 2008) | 1 line
  
  Disable / fix flash uploading
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 04:11:58 +00:00
Ingo Schommer
52a96217e9 API CHANGE Removing unfinished deprecated BulkLoader functionality
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@54119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-07 04:30:13 +00:00
Sam Minnee
91de5fd771 Merged revisions 52399 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r52399 | ischommer | 2008-04-09 19:21:07 +1200 (Wed, 09 Apr 2008) | 1 line
  
  BUGFIX re-initializing tabstrip javascript after ajax-reload in AssetTableField popup (#2309 AssetTableField popup fails after saving)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:40:29 +00:00
Sam Minnee
5aea02ee82 Merged revisions 52392 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r52392 | sminnee | 2008-04-09 18:00:12 +1200 (Wed, 09 Apr 2008) | 1 line
  
  Upgraded SWFUpload to improve CMS uploads
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53499 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:39:23 +00:00
Sam Minnee
e0ff08a4b0 Merged revisions 51963 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r51963 | sminnee | 2008-04-01 17:08:14 +1300 (Tue, 01 Apr 2008) | 1 line
  
  Fix to anchor insertion
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53494 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:36:52 +00:00
Sam Minnee
0341a8685e Merged revisions 52797 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity

........
  r52797 | sminnee | 2008-04-15 22:22:33 +1200 (Tue, 15 Apr 2008) | 1 line
  
  Fixed interaction of MemberTableField and member validation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:28:20 +00:00