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
220 Commits 29 Branches 403 Tags 28 MiB
456ce4ebcc
Commit Graph

111 Commits

Author SHA1 Message Date
Ingo Schommer
456ce4ebcc elofgren: In Newsletter_SentRecipient, instead of putting 'MemberId?' in $db put 'Member' in $has_one in order to be consistent with Newsletter_Recipient and Email_BounceRecord. This does not change the structure of the Newsletter_SentRecipient table, but does add an Index on the MemberID column. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42005 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:05:04 +00:00
Ingo Schommer
170c5b1fba elofgren: Make the status message shown after sending a newsletter always include the # of emails sent. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42003 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:04:10 +00:00
Ingo Schommer
b784ccc5e7 elofgren: Clean up the code which enabled the 'Send to only people not previously sent to' feature committed in r38895 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42002 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:03:04 +00:00
Ingo Schommer
24ed3ff68b elofgren: NEW FEATURE: Add 'Send to only people not previously sent to' option for sending Newsletters. Please test. :) 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42001 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:02:32 +00:00
Ingo Schommer
2c012f3c4e elofgren: BUGFIX: Fix gsoc trac ticket: #54 For newly created Newsletter drafts, Content of Newsletter Sent is not what is shown on screen (Save button has to be clicked) 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41999 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:01:06 +00:00
Ingo Schommer
8e583e2a4d elofgren: Don't show a 'No template selected' error when sending a test Newsletter if no template has been selected since templates for Emails are optional. See Email::parseVariables(). Resolves gsoc trac ticket: #53 "No template selected" error only occurs when "Send test to", but not when "Send to the mailing list" is selected 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41998 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:00:10 +00:00
Ingo Schommer
137f302fbc elofgren: Remove 6 lines of code by directly passing the unsent_subscribers_array data to push(new ArrayData?($data)) instead of pointlessly creating a new array. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41997 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:58:31 +00:00
Ingo Schommer
4deaf09212 elofgren: Track whether mail() returns TRUE or FALSE when a Newsletter is sent and record the result in a new Newsletter_SentRecipient table. 
Add a 'Sent Status Report' tab to Newsletters that shows the following 4 reports: 
* Sending to the Following Recipients Failed 
* Sending to the Following Recipients Bounced (@TODO: Make bounces actually show up here) 
* The Newsletter has Never Been Sent to Following Subscribers 
* Sending to the Following Recipients was Successful 
More info: http://support.silverstripe.com/gsoc/wiki/GSoc07UsabilityElijah 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41995 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:57:31 +00:00
Ingo Schommer
d6ef666925 mujma: ENHANCEMENTS: Tmp folder name changed to _tmp, depends on r38621 in sapphire branch. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41993 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 00:53:45 +00:00
Ingo Schommer
bcbdd364e0 elofgren: BUGFIX: Fix bug 'Errors when Importing Recipients to Newsletter Mailing List'. Fixes gsoc trac ticket #38. Tested and importing newsletter recipients works in FF2 and IE7. Reported here: http://www.silverstripe.com/bugs/flat/1470 This fix needs GenericEmail?.ss added in r38503 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41970 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 22:02:06 +00:00
Ingo Schommer
cff0c9186c elofgren: VAR FIX: Initialize 'colCount' to prevent error when importing Newsletter Recipients. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41965 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:57:33 +00:00
Ingo Schommer
f7a1b199db elofgren: BUGFIX: Fix issue with deleting pictures with 'X' delete link not removing thumbs in _resampled folder. Thanks to Mateusz for reporting this. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41964 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:57:11 +00:00
Ingo Schommer
abca2d257a mlanthaler: Bugfix: Fixed E_NOTICE error due to uninitialized variable 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41960 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:54:24 +00:00
Ingo Schommer
dcc83f8ff3 elofgren: BUGIX: Fix trac ticket: '#28: Fix problems with adding a new newsletter type and trying to edit its title' by making the id of the new newsletter type be returned instead of the id of Session::get('currentPage') 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41949 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:14:17 +00:00
Ingo Schommer
9d0cf998e1 elofgren: Adds 'Newsletter Settings' tab to Newsletter type edit form for consistency with other forms. Closes Ticket #30: Add tab to 'newsletter type' edit form 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41948 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:13:53 +00:00
Ingo Schommer
9f633edd49 elofgren: VAR FIX: Initialize 'result' in ThumbnailStripField::getflash() 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41947 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:13:23 +00:00
Ingo Schommer
c09c1050e4 elofgren: VAR FIX: Prevent undefined variable 'resent' in NewsletterEmailProcess::complete() 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41944 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:11:36 +00:00
Ingo Schommer
7463a8fb05 elofgren:Display a useful error message if getCMSFields() returns null. Thanks Sam: http://www.silverstripe.com/general-discussion/flat/1537?showPost=2042#post2042 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41942 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 21:09:13 +00:00
Ingo Schommer
3cae2fb249 elofgren: USABILITY: Fix usability issue #48 "Delete and Move Files buttons need repositioning" 
Changes: 
* Remove the 'Move Files' button and enable multi-file drag and drop file moving 
* Position the 'Delete selected files' button under the checkboxes and make it turn red on hover 
* Add 'Ctrl' and 'Shift' range selection to file checkboxes 
* Add 'X' delete links to the right of each file 
* Rename the 'Save' button to 'Save folder name' and don't show it when listing 'assets' folder since it can't be renamed 
More info: http://www.silverstripe.com/google-summer-of-code-forum/flat/1607
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41927 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 20:47:35 +00:00
Ingo Schommer
dc45dd0c25 mujma: Added deleting thumbnails after moving a photo. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41924 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 20:30:54 +00:00
Ingo Schommer
1b5c8ee6a8 qhoxie: basics of tabular data for stats 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41923 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 20:23:50 +00:00
Ingo Schommer
be4ed16a0c bfojcapell: strings replaced by calls in the Site Content area. The regenerated master string table and a spanish translation are also added. Always, if you get any kind of blank string, just regenerate en_US.php by visiting /i18n/text_collector 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41919 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 20:21:13 +00:00
Ingo Schommer
eb73802bcd mlanthaler: Bugfix: Added isset() to prevent E_NOTICE error. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41916 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 20:11:06 +00:00
Ingo Schommer
d5d2006980 mlanthaler: Bugfix: Added isset() to prevent E_NOTICE error ($memberID isn't needed in the rest of the method). 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41915 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 20:10:43 +00:00
Ingo Schommer
7ee0ec6158 bfojcapell: using new default locale and function name 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41908 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 02:08:42 +00:00
Ingo Schommer
a6824938b3 mujma: Added deleting of image thumbnails after delete operation. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41899 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:29:38 +00:00
Ingo Schommer
356f4cc4bc mujma: ImageEditor?.php adjusted to standards, Image.js improved resizing of large images. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41898 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:28:50 +00:00
Ingo Schommer
15ed167583 bfojcapell: default language file 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41897 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:27:57 +00:00
Ingo Schommer
be9fff205e bfojcapell: lang folder, and some strings being translated to test i18n 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41896 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:27:29 +00:00
Ingo Schommer
f436292174 mujma: Added support for large images (larger than browser window). 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41894 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:26:36 +00:00
Ingo Schommer
31a9fbee3c mujma: Fixed various browser compatibility problems. Now should work on Safari 3.0.2 /Windows, FF 1.5/2.0 Windows/Linux. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41891 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:19:43 +00:00
Ingo Schommer
561a3cd4ba sharvey: 'Send newsletters from' doesn't describe what you need to type in - 'From email address' describes it better 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41888 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:17:04 +00:00
Ingo Schommer
3818d8f961 sharvey: Name wasn't specific enough - Folder Name makes it easier to understand 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41887 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:16:04 +00:00
Ingo Schommer
1335c66e65 isharvey: moved field into tab for consistency with newsletter system 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41886 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:15:35 +00:00
Ingo Schommer
1fe66c0bf4 mujma: Added comments for ImageEditor?.php, fixed JSON bug, added status message after saving, added tmp folder delete after editing. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41882 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:13:18 +00:00
Ingo Schommer
1741cf99cb elofgren: Make Newsletter AJAX action buttons be update after submit like happens in all other sections of the Admin. Use 'form_actions_right' instead of 'form_actions' and remove unneeded duplicated 'Form_EditForm_action_save' Behaviour.register in NewsletterAdmin?_right.js 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41878 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:11:25 +00:00
Ingo Schommer
65e0686fa0 mujma: 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41874 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:09:25 +00:00
Ingo Schommer
bd58e931bb mujma: All PHP and JS files for ImageEditor?, works on FF 1.5/2.0. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41872 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:08:25 +00:00
Ingo Schommer
c45d26df90 elofgren: VAR FIX: Initialize 'script' and use isset($brokenPageList) in AssetAdmin::deletefolder() to fix undefined variable errors. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41866 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:01:49 +00:00
Ingo Schommer
15d40c5cf1 elofgren: USABILITY: Rename 'Save draft' button to 'Save' and make 'Publish' (will be renamed 'Save & Publish') button save the new draft in addition to publishing it. 
Requested here: http://www.silverstripe.com/google-summer-of-code-forum/flat/1654?showPost=1730#post1730 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41863 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 01:00:03 +00:00
Ingo Schommer
e23eaf9f8d mlanthaler: Small fix to prevent E_NOTICEs. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41857 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:56:26 +00:00
Ingo Schommer
0762c09ba2 qhoxie: additions to left statistics panel 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41855 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:55:36 +00:00
Ingo Schommer
dbb645cde6 elofgren: BUGFIX: Make adding a newsletter type to the 'Newsletters' tree work when a draft is selected by changing the name of the 'NewsletterEditForm?' back to 'EditForm?' (reverts r36734 which was a fix to make the 'Save changes' button work on the now non-existant modal 'Usaved changes' dialog.) In addition this commit reverts r37173 because the form name is now 'EditForm?' like all other forms in NewsletterAdmin?. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41853 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:53:38 +00:00
Ingo Schommer
05a8a40e01 elofgren: BUGFIX: Fix status message displayed after deleting items from the left 'Newsletters' tree. Instead of 'Deleted items', actually give a value to and display it as a number. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41851 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:51:37 +00:00
Ingo Schommer
e1438c9949 qhoxie: updates to stats panels 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41847 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:49:54 +00:00
Ingo Schommer
d497fbf671 elofgren: VAR FIXES: Add some needed issets() and variable initializations to fix a lot of warnings when comparing 2 versions of a page. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41844 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:48:11 +00:00
Ingo Schommer
9b29b09a24 elofgren: VAR FIX: Fix typo in LeftAndMain::addTreeNodeJS() by renaming 'select' parameter to 'selected' because 'selected' is what is used in the method body. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41843 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:46:51 +00:00
Ingo Schommer
dfa6b99f18 elofgren: VAR FIXES: Fix 2 undefined variable errors in CMSMain::deletefromlive() and 1 in CMSMain::deleteitems() that showed up in status messages while deleting pages. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41842 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-15 00:46:22 +00:00
Ingo Schommer
8f980e1e02 elofgren: USABILITY: Add tooltips to pages in 'Site Content' tree showing 'Page type: className' where className is the page's type. 
More info: http://www.elijahlofgren.com/silverstripe/icons-missing-from-left-navigation-tree-key/ 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41809 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 19:42:24 +00:00
Ingo Schommer
ad3aed7930 mlanthaler: Bugfix: "if($className == null); $className = $this->stat('subitem_class');" had no effect because of the semicolon after the if-statement. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41806 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-14 19:40:56 +00:00