Created
August 26, 2009 01:03
-
-
Save rtyler/175221 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit 7d43105ff76e4904a40d37049bf276ecab27a500 | |
| Author: R. Tyler Ballance <tyler@slide.com> | |
| Date: Wed Jul 22 14:33:30 2009 -0700 | |
| Add the custom strings for 'ready for QA' and 'pushed live' | |
| diff --git a/lang/strings_english.txt b/lang/strings_english.txt | |
| index 68081e6..ad48ac2 100644 | |
| --- a/lang/strings_english.txt | |
| +++ b/lang/strings_english.txt | |
| @@ -351,7 +351,7 @@ $s_view_state_enum_string = '10:public,50:private'; | |
| $s_priority_enum_string = '10:none,20:low,30:normal,40:high,50:urgent,60:immediate'; | |
| $s_severity_enum_string = '10:feature,20:trivial,30:text,40:tweak,50:minor,60:major,70:crash,80:block'; | |
| $s_reproducibility_enum_string = '10:always,30:sometimes,50:random,70:have not tried,90:unable to reproduce,100:N/A'; | |
| -$s_status_enum_string = '10:new,20:feedback,30:acknowledged,40:confirmed,50:assigned,80:resolved,90:closed'; | |
| +$s_status_enum_string = '10:new,20:feedback,30:acknowledged,40:confirmed,50:assigned,80:resolved,,81:ready for QA,82:pushed live,90:closed'; | |
| $s_resolution_enum_string = '10:open,20:fixed,30:reopened,40:unable to reproduce,50:not fixable,60:duplicate,70:no change required,80:suspended,90:won\'t fix'; | |
| $s_projection_enum_string = '10:none,30:tweak,50:minor fix,70:major rework,90:redesign'; | |
| $s_eta_enum_string = '10:none,20:< 1 day,30:2-3 days,40:< 1 week,50:< 1 month,60:> 1 month'; | |
| @@ -551,7 +551,11 @@ $s_feedback_bug_title = 'Request Feedback on Issue'; | |
| $s_acknowledged_bug_title = 'Acknowledge Issue'; | |
| $s_confirmed_bug_title = 'Confirm Issue'; | |
| $s_assigned_bug_title = 'Assign Issue'; | |
| +$s_ready_for_QA_bug_title = 'Ready for QA'; | |
| +$s_pushed_live_bug_title = 'Pushed Live'; | |
| $s_new_bug_button = 'New Issue'; | |
| +$s_ready_for_QA_bug_button = 'Mark ready for QA'; | |
| +$s_pushed_live_bug_button = 'Mark pushed live'; | |
| $s_feedback_bug_button = 'Request Feedback'; | |
| $s_acknowledged_bug_button = 'Acknowledge Issue'; | |
| $s_confirmed_bug_button = 'Confirm Issue'; | |
| commit 751dbe45bf36b094ddab64452d3720590e60471c | |
| Author: R. Tyler Ballance <tyler@slide.com> | |
| Date: Wed Jul 22 15:41:21 2009 -0700 | |
| Missed some email lang file updates | |
| diff --git a/lang/strings_english.txt b/lang/strings_english.txt | |
| index ad48ac2..28cc420 100644 | |
| --- a/lang/strings_english.txt | |
| +++ b/lang/strings_english.txt | |
| @@ -380,6 +380,8 @@ $s_email_notification_title_for_status_bug_confirmed = 'The following issue has | |
| $s_email_notification_title_for_status_bug_assigned = 'The following issue has been ASSIGNED.'; | |
| $s_email_notification_title_for_status_bug_resolved = 'The following issue has been RESOLVED.'; | |
| $s_email_notification_title_for_status_bug_closed = 'The following issue has been CLOSED'; | |
| +$s_email_notification_title_for_status_bug_ready_for_QA = 'The following issue has been marked READY FOR QA'; | |
| +$s_email_notification_title_for_status_bug_pushed_live = 'The following issue has been PUSHED LIVE'; | |
| $s_email_notification_title_for_action_bug_submitted = 'The following issue has been SUBMITTED.'; | |
| $s_email_notification_title_for_action_bug_assigned = 'The following issue has been ASSIGNED.'; | |
| commit d0e62c7fbfe934cec1752e2249fc435177bc90fb | |
| Author: R. Tyler Ballance <tyler@slide.com> | |
| Date: Wed Jul 22 15:58:58 2009 -0700 | |
| Revert "Fix #10714: Fix session notice with verify.php" | |
| Seems to be a redirect loop on verify.php now because of this | |
| This reverts commit c3a3ffe894744e8b0b8b2f270c09106adcc5cb4f. | |
| diff --git a/account_page.php b/account_page.php | |
| index 4937e15..abff224 100644 | |
| --- a/account_page.php | |
| +++ b/account_page.php | |
| @@ -93,7 +93,11 @@ | |
| <?php } ?> | |
| <div align="center"> | |
| <form method="post" action="account_update.php"> | |
| -<?php echo form_security_field( 'account_update' ); ?> | |
| +<?php | |
| + echo form_security_field( 'account_update' ); | |
| + if ( isset( $g_session_pass_id ) ) { ?> | |
| +<input type="hidden" name="session_id" value="<?php echo session_id() ?>"/> | |
| +<?php } ?> | |
| <table class="width75" cellspacing="1"> | |
| <!-- Headings --> | |
| diff --git a/verify.php b/verify.php | |
| index a296bd5..950ed19 100644 | |
| --- a/verify.php | |
| +++ b/verify.php | |
| @@ -40,8 +40,10 @@ | |
| if( auth_is_user_authenticated() ) { | |
| auth_logout(); | |
| - # reload the page after logout | |
| - print_header_redirect("verify.php?id=${f_user_id}&confirm_hash=${f_confirm_hash}"); | |
| + # (Re)initialize session | |
| + session_regenerate_id(); | |
| + session_init(); | |
| + $g_session_pass_id = ON; | |
| } | |
| $t_calculated_confirm_hash = auth_generate_confirm_hash( $f_user_id ); | |
| commit f3e8afd88cd22d54467be41448c34a501cebe080 | |
| Author: R. Tyler Ballance <tyler@slide.com> | |
| Date: Wed Aug 19 12:27:51 2009 -0700 | |
| Add "Edit Project" and "Edit Version" links from Roadmap page for Admins | |
| This should reduce the number of clicks that I have to endure to update | |
| some of my releases :) | |
| diff --git a/roadmap_page.php b/roadmap_page.php | |
| index 56b4efd..c118190 100644 | |
| --- a/roadmap_page.php | |
| +++ b/roadmap_page.php | |
| @@ -233,8 +233,25 @@ | |
| if ( !$t_project_header_printed ) { | |
| print_project_header_roadmap( $t_project_name ); | |
| $t_project_header_printed = true; | |
| + | |
| + if ( user_is_administrator($t_user_id) ) { | |
| + ?> | |
| + [ <a href="manage_proj_edit_page.php?project_id=<?php echo $t_project_id ?>"> | |
| + <small>Edit Project</small></a> ] | |
| + <br/> | |
| + <?php | |
| + } | |
| } | |
| + if ( user_is_administrator($t_user_id) ) { | |
| + ?> | |
| + <br/> | |
| + [ <a href="manage_proj_ver_edit_page.php?version_id=<?php echo $t_version_row['id'] ?>"> | |
| + <small>Edit Version</small></a> ] | |
| + <?php | |
| + } | |
| + | |
| + | |
| if ( !$t_version_header_printed ) { | |
| print_version_header( $t_version_row ); | |
| $t_version_header_printed = true; | |
| commit 162490d38c40b8096ce3c553017ca721423b6520 | |
| Author: R. Tyler Ballance <tyler@slide.com> | |
| Date: Tue Aug 25 16:43:45 2009 -0700 | |
| Print the project and version descriptions | |
| diff --git a/roadmap_page.php b/roadmap_page.php | |
| index c118190..3bfb490 100644 | |
| --- a/roadmap_page.php | |
| +++ b/roadmap_page.php | |
| @@ -241,6 +241,13 @@ | |
| <br/> | |
| <?php | |
| } | |
| + $t_project_description = project_get_field( $t_project_id, 'description'); | |
| + if ( !is_blank($t_project_description) ) { | |
| + ?> | |
| + <strong>Description:</strong> <?php echo $t_project_description ?> | |
| + <br/> | |
| + <?php | |
| + } | |
| } | |
| if ( user_is_administrator($t_user_id) ) { | |
| @@ -258,7 +265,7 @@ | |
| } | |
| if ( !is_blank( $t_description ) ) { | |
| - echo string_display( '<br />' .$t_description . '<br />' ); | |
| + echo string_display( '<strong>Description</strong>: ' .$t_description . '<br />' ); | |
| } | |
| // show progress bar |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment