Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: master
...
compare: bugfixes-5_2_2
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
4 dada/DADA/Config.pm
@@ -5178,8 +5178,8 @@ and to say that you've got the freshest tools on the Web.
=cut
-$VERSION = 5.2.1;
-$VER = '5.2.1 Stable - 8/17/12';
+$VERSION = 5.2.2;
+$VER = '5.2.2 Stable - 11/01/12';
#
#
View
14 dada/DADA/MailingList/Schedules.pm
@@ -165,6 +165,10 @@ sub save_from_params {
%{$form_vals{headers}} = (%{$tmp_record->{headers}}, %{$form_vals{headers}});
}
+ # See what I did, here?
+ $form_vals{'PlainText_ver'}->{text} = $q->param('PlainText_text');
+ $form_vals{'HTML_ver'}->{text} = $q->param('html_message_body');
+
for my $t('PlainText', 'HTML'){
$form_vals{$t.'_ver'}->{source} = $q->param($t.'_source');
@@ -192,15 +196,7 @@ sub save_from_params {
$form_vals{last_schedule_run} = time;
}
}
-
- # See what I did, here?
- $form_vals{'PlainText_ver'}->{text} = $q->param('PlainText_text');
- $form_vals{'HTML_ver'}->{text} = $q->param('html_message_body');
-
-
-
-
-
+
$form_vals{attachments} = [];
View
2  dada/DADA/Template/templates/manage_script_screen.tmpl
@@ -1,6 +1,6 @@
<!-- begin manage_script_screen.tmpl -->
-<!-- tmpl_set name="title" value="pp Information &#187; About <!-- tmpl_var PROGRAM_NAME -->" -->
+<!-- tmpl_set name="title" value="App Information &#187; About <!-- tmpl_var PROGRAM_NAME -->" -->
<div id="screentitle">
<div id="screentitlepadding">
App Information &#187; About <!-- tmpl_var PROGRAM_NAME -->
View
20 dada/extras/documentation/pod_source/changes_5_x.pod
@@ -2,6 +2,26 @@
=head1 Dada Mail Changelog for version 5.x.x
+=head1 5.2.2
+
+=head2 Summary 5.2.2
+
+This release contains primarily bugfixes found in the v5.2.1 release of Dada Mail.
+
+=head2 Bugfixes 5.2.2
+
+=head3 CAPTCHA on Profile Registration sometimes does not show
+
+L<https://github.com/justingit/dada-mail/issues/313>
+
+=head3 Plugin Scheduled Mailings: plain text message body deleted when saving schedule
+
+L<https://github.com/justingit/dada-mail/issues/317>
+
+=head3 List Invitations: HTML version text box does not show up!
+
+L<https://github.com/justingit/dada-mail/issues/319>
+
=head1 5.2.1.
=head2 Summary 5.2.1
View
16 dada/extras/documentation/pod_source/install_dada_mail.pod
@@ -4,9 +4,9 @@
=head1 Step #1: Download Dada Mail
-Here's the direct download to Dada Mail v5.2.1
+Here's the direct download to Dada Mail v5.2.2
-L<https://github.com/downloads/justingit/dada-mail/dada-5_2_1.tar.gz>
+L<https://github.com/downloads/justingit/dada-mail/dada-5_2_2.tar.gz>
=head2 Pro Dada Subscriber?
@@ -14,9 +14,9 @@ Download Pro Dada at:
L<http://dadamailproject.com/pro_dada>
-=head1 Step #2 Upload the, "dada-5_2_1.tar.gz" distro to your cgi-bin
+=head1 Step #2 Upload the, "dada-5_2_2.tar.gz" distro to your cgi-bin
-Download the C<dada-5_2_1.tar.gz> distro (you will B<not> have to uncompress the distribution) and then upload it to your hosting account's I<cgi-bin>.
+Download the C<dada-5_2_2.tar.gz> distro (you will B<not> have to uncompress the distribution) and then upload it to your hosting account's I<cgi-bin>.
=begin html
@@ -35,17 +35,17 @@ Download the, C<uncompress_dada.cgi> script from here:
=begin html
<ul>
-<li><strong><a href="https://raw.github.com/justingit/dada-mail/v5_2_1-stable_2012_08_17/uncompress_dada.cgi">uncompress_dada.cgi</a> (Save Page/Link As...)</strong></li></ul>
+<li><strong><a href="https://raw.github.com/justingit/dada-mail/v5_2_2-stable_2012_10_01/uncompress_dada.cgi">uncompress_dada.cgi</a> (Save Page/Link As...)</strong></li></ul>
=end html
-and upload this script (PlainTest/ASCII mode - NOT binary!) to your hosting account's I<cgi-bin> - right alongside the I<dada-5_2_1.tar.gz> distro you just put up.
+and upload this script (PlainTest/ASCII mode - NOT binary!) to your hosting account's I<cgi-bin> - right alongside the I<dada-5_2_2.tar.gz> distro you just put up.
=head1 Step #4 Change permissions of the, "uncompress_dada.cgi" file to, "755"
=head1 Step #5 Visit the, "uncompress_dada.cgi" script in your web browser.
-The, C<uncompress_dada.cgi> should attempt to uncompress the I<dada-5_2_1.tar.gz> distro, change the necessary permissions of various files and prep the actual installer for you to use.
+The, C<uncompress_dada.cgi> should attempt to uncompress the I<dada-5_2_2.tar.gz> distro, change the necessary permissions of various files and prep the actual installer for you to use.
Once it's finished running, you should be presented a link to use the actual installer. Click the link at the end of the screen and go ahead and configure Dada Mail!
@@ -56,7 +56,7 @@ Once it's finished running, you should be presented a link to use the actual ins
<p>See, <a href="./FAQ-install_upgrade.pod.html#prepping_dada_mail_manually">Prepping Dada Mail Manually</a> if this doesn't happen and you get a message in your browser window, sort of like this: </p>
<pre>
-Can't find dada-5_2_1.tar to uncompress!
+Can't find dada-5_2_2.tar to uncompress!
You may have to uncompress and prep Dada Mail manually.
</pre>
View
3  dada/plugins/scheduled_mailings.pl
@@ -1459,8 +1459,9 @@ sub from_text_widget {
{
-data => \$t,
-vars => {
- #default_text => $form_vals{$type.'_ver'}->{text},
+ default_text => $form_vals{$type.'_ver'}->{text},
+ # This is ridiculous.
html_message_body_content => $form_vals{$type.'_ver'}->{text},
html_message_body_content_js_escaped => js_enc($form_vals{$type.'_ver'}->{text}),
View
2  uncompress_dada.cgi
@@ -6,7 +6,7 @@ use strict;
# You may have to update this, depending on the version of Dada Mail!
-my $gz = 'dada-5_2_1.tar.gz';
+my $gz = 'dada-5_2_2.tar.gz';
$ENV{PATH} = "/bin:/usr/bin";
delete @ENV{ 'IFS', 'CDPATH', 'ENV', 'BASH_ENV' };

No commit comments for this range

Something went wrong with that request. Please try again.