Skip to content
This repository was archived by the owner on Aug 27, 2021. It is now read-only.

added forced redirect page #1181

Merged
merged 3 commits into from
Jul 7, 2015
Merged

added forced redirect page #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82c75dc
added forced redirect page
Jul 7, 2015
e9fa389
removed problems and added redirect
Jul 7, 2015
69fa632
updated page
Jul 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions source/Integrate/Partners/Tutorials/WindowsAzure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,7 @@ NSString *text = @"%20";
NSString *subject = [itemText.text stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];

// Generate the Web API call
<<<<<<< HEAD:source/Integrate/Partners/Tutorials/WindowsAzure.md
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://api.sendgrid.com/api/mail.send.json?to=%@&from=%@&fromname=%@&subject=%@&text=%@&api_user=%@&api_key=%@",to, from, fromname, subject, text, username, apikey]];
=======
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://api.sendgrid.com/api/mail.send.json?to=%@&from=%@&fromname=%@&subject=%@&text=%@&api_user=%@&api_key=%@",to, from, fromname, subject, text, username, apikey]];
>>>>>>> f4202064a43620816d16671c073ad89d7e833dfa:source/Integrate/Partners/WindowsAzure.md

// This writes the composed URL in the XCode console for debugging purposes
NSLog(@"URL %@",url);
Expand Down
16 changes: 16 additions & 0 deletions source/VidGrid/email_activity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<title>Redirecting...</title>
<link rel="canonical" href="https://sendgrid.com/docs/User_Guide/email_activity.html"/>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="refresh" content="0; url=https://sendgrid.com/docs/User_Guide/email_activity.html" />
</head>
<body>
<p><strong>Redirecting...</strong></p>
<p><a href='https://sendgrid.com/docs/User_Guide/email_activity.html'>Click here if you are not redirected.</a></p>
<script>
document.location.href = "https://sendgrid.com/docs/User_Guide/email_activity.html";
</script>
</body>
</html>
15 changes: 2 additions & 13 deletions source/_redirects.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,11 @@ Redirect 301 /User_Guide/Setting_Up_Your_Server/Segmenting_Your_Traffic/subusers
Redirect 301 /User_Guide/Setting_Up_Your_Server/smtp_ports.html https://sendgrid.com/docs/Classroom/Basics/smtp_ports.html
Redirect 301 /User_Guide/Setting_Up_Your_Server/warming_up_ips.html https://sendgrid.com/docs/Classroom/Deliver/warming_up_ips.html
Redirect 301 /User_Guide/Setting_Up_Your_Server/warming_up.html https://sendgrid.com/docs/Classroom/Deliver/warming_up_ips.html
<<<<<<< HEAD
Redirect 301 /User_Guide/Setting_Up_Your_Server/Whitelabeling/dns_setup.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
Redirect 301 /User_Guide/Setting_Up_Your_Server/Whitelabeling/index.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
Redirect 301 /User_Guide/Setting_Up_Your_Server/Whitelabeling/spf.html https://sendgrid.com/docs/Glossary/spf.html
Redirect 301 /User_Guide/Setting_Up_Your_Server/Whitelabeling/whitelabel_wizard.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
=======
>>>>>>> 080c75e14dbe8fb4f40e06c6866c122bd20ccd05
#this app goes away as of May 27, 2015
#this app went away as of May 27, 2015
Redirect 301 /User_Guide/Settings/gravatar.html https://sendgrid.com/docs/User_Guide/Settings/index.html
Redirect 301 /User_Guide/smtp_ports.html https://sendgrid.com/docs/User_Guide/Setting_Up_Your_Server/smtp_ports.html
Redirect 301 /User_Guide/template_engine_setup.html https://sendgrid.com/docs/User_Guide/Transactional_Email/Template_Engine/setup_guide.html
Expand All @@ -252,10 +249,8 @@ Redirect 301 /User_Guide/whitelabel_wizard.html https://sendgrid.com/docs/User_G
#######
Redirect 301 /VidGrid/activity.html https://sendgrid.com/docs/User_Guide/email_activity.html
Redirect 301 /VidGrid/advanced_suppression_manager.html https://sendgrid.com/docs/User_Guide/Suppressions/advanced_suppression_manager.html
<<<<<<< HEAD
Redirect 301 /VidGrid/Email_Activity/activity.html https://sendgrid.com/docs/User_Guide/email_activity.html
=======
Redirect 301 /VidGrid/Email_Activity/activity.html https://sendgrid.com/docs/VidGrid/email_activity.html
Redirect 301 /VidGrid/Event_Notification/configure.html https://sendgrid.com/docs/API_Reference/Webhooks/event.html
Redirect 301 /VidGrid/Marketing_Emails/Analytics/index.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/analytics.html
Redirect 301 /VidGrid/Marketing_Emails/Analytics/marketing_statistics.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/analytics.html
Redirect 301 /VidGrid/Marketing_Emails/Analytics/unsubscribe_management.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/unsubscribes.html
Expand All @@ -265,7 +260,6 @@ Redirect 301 /VidGrid/Marketing_Emails/Design/newsletter_basics.html https://sen
Redirect 301 /VidGrid/Marketing_Emails/Design/subscription_widget.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/recipients.html
Redirect 301 /VidGrid/Marketing_Emails/Design/weblink.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/tags.html
Redirect 301 /VidGrid/Marketing_Emails/index.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/index.html
>>>>>>> 080c75e14dbe8fb4f40e06c6866c122bd20ccd05
Redirect 301 /VidGrid/Marketing_Emails/marketing_emails_setup.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/create_manage.html
Redirect 301 /VidGrid/Marketing_Emails/Recipients/exporting.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/recipients.html
Redirect 301 /VidGrid/Marketing_Emails/Recipients/index.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/recipients.html
Expand All @@ -275,10 +269,5 @@ Redirect 301 /VidGrid/Marketing_Emails/Review_and_Schedule/split_testing.html ht
Redirect 301 /VidGrid/Marketing_Emails/Setup/overview.html https://sendgrid.com/docs/User_Guide/Marketing_Emails/create_manage.html
Redirect 301 /VidGrid/template_engine.html https://sendgrid.com/docs/User_Guide/Templates/index.html
Redirect 301 /VidGrid/Template_Engine/template_engine.html https://sendgrid.com/docs/User_Guide/Templates/index.html
<<<<<<< HEAD
Redirect 301 /VidGrid/Whitelabel/whitelabel.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
Redirect 301 /VidGrid/whitelabel.html https://sendgrid.com/docs/User_Guide/Settings/Whitelabel/index.html
=======
Redirect 301 /VidGrid/Tools/sendwithus.html https://sendgrid.com/docs/User_Guide/Settings/index.html
Redirect 301 /VidGrid/Whitelabel/whitelabel.html https://sendgrid.com/docs/VidGrid/whitelabel.html
>>>>>>> 080c75e14dbe8fb4f40e06c6866c122bd20ccd05