From 75ae141759452cc84c259cd05f1016fa1d48f5fb Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 16 Jan 2015 22:36:39 +0100
Subject: [PATCH 001/231] added privacy policy

---
 app/controllers/static_controller.rb      |  4 ++++
 app/views/static/privacy_policy.html.haml | 25 +++++++++++++++++++++++
 config/routes.rb                          |  1 +
 3 files changed, 30 insertions(+)
 create mode 100644 app/views/static/privacy_policy.html.haml

diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 287b0361..7f25bce8 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -16,4 +16,8 @@ class StaticController < ApplicationController
   def faq
 
   end
+
+  def privacy_policy
+
+  end
 end
diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
new file mode 100644
index 00000000..5bd273f7
--- /dev/null
+++ b/app/views/static/privacy_policy.html.haml
@@ -0,0 +1,25 @@
+%h1 Privacy Policy
+%p This Privacy Policy describes how and when Retrospring uses and collects your data, checks your information and shares with other Services.
+%h2 Information Collection and Use
+%h4 Basic Account Information
+%p When you create a Retrospring account, you provide some personal information, such as your name, username, password, and email address. Asking questions anonymously or looking at user profiles does not require registration.
+%h4 Additional Information
+%p You may provide us with information for public displaying, like a short biography, a link to your website, your location or a profile picture. This information is viewable by any visitor of the site, registered or unregistered, and therefore should not contain any critical information about you or someone else.
+%h4 Answers and Questions
+%p Our Service primarily is designed to ask your friends and other people from around the world questions or answer them. Most of the information you provide us is information you are asking us to make public. This information does not only include the questions, answers, comments and smiles, but also the groups you create, the people you follow and other bits of information that result from using our Service.
+%h4 Cookies
+%p Like many websites, we use cookies and similar technologies to collect  additional website usage data and to improve our Services. A cookie is a small data file that is transferred to your computer's hard disk. Retrospring uses persistant cookies to improve the users browsing experience and to to better understand how you interact with our Services. Most Internet browsers automatically accept cookies. You can instruct  your browser, by changing its settings, to stop accepting cookies or to  prompt you before accepting a cookie from the websites you visit.  However, the Services may not function properly if you disable cookies.
+%h4 Log Data
+%p When you use our Services, we may receive information ("Log Data")  such as your IP address, browser type, operating system, the referring  web page, pages visited, location, your mobile carrier, device information (including device and application IDs), search terms, and cookie information. We receive Log Data when you interact with our Services, for example, when you visit our websites or sign into our Services.
+%h4 Third-Party Services
+%p Retrospring uses a variety of third-party services to help provide our Services and to help us understand and improve the use of our Services, such as Piwik Analytics, or to share your answers to, if connected, other Services like Twitter, Tumblr or Facebook. These third-party service providers may collect information sent by your  browser as part of a web page request, such as cookies or your IP  address.
+%h2 Information Sharing
+%p Retrospring will keep any collected data (see "Information Collection and Use" above) encrypted on our servers. Any information shared with other Services is controlled by the user itself, as we only supply sharing to these. If a user isn't satisfied with Terms from another Service they shouldn't connect their accounts or remove access over the Sharing page on the profile settings page.
+%p Notwithstanding anything to the contrary in this Policy, we may preserve  or disclose your information if we believe that it is reasonably  necessary to comply with a law, regulation or legal request; to protect  the safety of any person; to address fraud, security or technical  issues; or to protect Retrospring's rights or property.  However, nothing in this Privacy Policy is intended to limit any legal defenses or objections that you may have to a third party’s, including a government’s, request to disclose your information.
+%h2 Modifying Your Personal Information
+%p If you are a registered user of our Services, we provide you with tools and account settings to access or modify the personal information you provided to us and associated with your account.
+%p You can also permanently delete your Retrospring account with a button at the bottom of the account settings page. Removing your account will cease your ability to log in with your credentials and the loss of all your data you supplied to the Service.
+%h2 Our Policy Towards Children
+%p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
+%p
+  %em Effective: 17th January 2015
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 8ae75153..dbc991d1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,6 +27,7 @@ Rails.application.routes.draw do
 
   match '/about', to: 'static#about', via: 'get'
   match '/help/faq', to: 'static#faq', via: 'get', as: :help_faq
+  match '/privacy', to: 'static#privacy_policy', via: 'get', as: :privacy_policy
 
   # Devise routes
   devise_for :users, path: 'user', skip: [:sessions, :registrations]

From d593e0edd4ff742a610eb310e932af6e7b579295 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 16 Jan 2015 22:43:56 +0100
Subject: [PATCH 002/231] added privacy policy

---
 app/views/static/privacy_policy.html.haml | 52 ++++++++++++-----------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
index 5bd273f7..a65d0fbf 100644
--- a/app/views/static/privacy_policy.html.haml
+++ b/app/views/static/privacy_policy.html.haml
@@ -1,25 +1,27 @@
-%h1 Privacy Policy
-%p This Privacy Policy describes how and when Retrospring uses and collects your data, checks your information and shares with other Services.
-%h2 Information Collection and Use
-%h4 Basic Account Information
-%p When you create a Retrospring account, you provide some personal information, such as your name, username, password, and email address. Asking questions anonymously or looking at user profiles does not require registration.
-%h4 Additional Information
-%p You may provide us with information for public displaying, like a short biography, a link to your website, your location or a profile picture. This information is viewable by any visitor of the site, registered or unregistered, and therefore should not contain any critical information about you or someone else.
-%h4 Answers and Questions
-%p Our Service primarily is designed to ask your friends and other people from around the world questions or answer them. Most of the information you provide us is information you are asking us to make public. This information does not only include the questions, answers, comments and smiles, but also the groups you create, the people you follow and other bits of information that result from using our Service.
-%h4 Cookies
-%p Like many websites, we use cookies and similar technologies to collect  additional website usage data and to improve our Services. A cookie is a small data file that is transferred to your computer's hard disk. Retrospring uses persistant cookies to improve the users browsing experience and to to better understand how you interact with our Services. Most Internet browsers automatically accept cookies. You can instruct  your browser, by changing its settings, to stop accepting cookies or to  prompt you before accepting a cookie from the websites you visit.  However, the Services may not function properly if you disable cookies.
-%h4 Log Data
-%p When you use our Services, we may receive information ("Log Data")  such as your IP address, browser type, operating system, the referring  web page, pages visited, location, your mobile carrier, device information (including device and application IDs), search terms, and cookie information. We receive Log Data when you interact with our Services, for example, when you visit our websites or sign into our Services.
-%h4 Third-Party Services
-%p Retrospring uses a variety of third-party services to help provide our Services and to help us understand and improve the use of our Services, such as Piwik Analytics, or to share your answers to, if connected, other Services like Twitter, Tumblr or Facebook. These third-party service providers may collect information sent by your  browser as part of a web page request, such as cookies or your IP  address.
-%h2 Information Sharing
-%p Retrospring will keep any collected data (see "Information Collection and Use" above) encrypted on our servers. Any information shared with other Services is controlled by the user itself, as we only supply sharing to these. If a user isn't satisfied with Terms from another Service they shouldn't connect their accounts or remove access over the Sharing page on the profile settings page.
-%p Notwithstanding anything to the contrary in this Policy, we may preserve  or disclose your information if we believe that it is reasonably  necessary to comply with a law, regulation or legal request; to protect  the safety of any person; to address fraud, security or technical  issues; or to protect Retrospring's rights or property.  However, nothing in this Privacy Policy is intended to limit any legal defenses or objections that you may have to a third party’s, including a government’s, request to disclose your information.
-%h2 Modifying Your Personal Information
-%p If you are a registered user of our Services, we provide you with tools and account settings to access or modify the personal information you provided to us and associated with your account.
-%p You can also permanently delete your Retrospring account with a button at the bottom of the account settings page. Removing your account will cease your ability to log in with your credentials and the loss of all your data you supplied to the Service.
-%h2 Our Policy Towards Children
-%p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
-%p
-  %em Effective: 17th January 2015
\ No newline at end of file
+.container
+  .panel.panel-default
+    %h1 Privacy Policy
+    %p This Privacy Policy describes how and when Retrospring uses and collects your data, checks your information and shares with other Services.
+    %h2 Information Collection and Use
+    %h4 Basic Account Information
+    %p When you create a Retrospring account, you provide some personal information, such as your name, username, password, and email address. Asking questions anonymously or looking at user profiles does not require registration.
+    %h4 Additional Information
+    %p You may provide us with information for public displaying, like a short biography, a link to your website, your location or a profile picture. This information is viewable by any visitor of the site, registered or unregistered, and therefore should not contain any critical information about you or someone else.
+    %h4 Answers and Questions
+    %p Our Service primarily is designed to ask your friends and other people from around the world questions or answer them. Most of the information you provide us is information you are asking us to make public. This information does not only include the questions, answers, comments and smiles, but also the groups you create, the people you follow and other bits of information that result from using our Service.
+    %h4 Cookies
+    %p Like many websites, we use cookies and similar technologies to collect  additional website usage data and to improve our Services. A cookie is a small data file that is transferred to your computer's hard disk. Retrospring uses persistant cookies to improve the users browsing experience and to to better understand how you interact with our Services. Most Internet browsers automatically accept cookies. You can instruct  your browser, by changing its settings, to stop accepting cookies or to  prompt you before accepting a cookie from the websites you visit.  However, the Services may not function properly if you disable cookies.
+    %h4 Log Data
+    %p When you use our Services, we may receive information ("Log Data")  such as your IP address, browser type, operating system, the referring  web page, pages visited, location, your mobile carrier, device information (including device and application IDs), search terms, and cookie information. We receive Log Data when you interact with our Services, for example, when you visit our websites or sign into our Services.
+    %h4 Third-Party Services
+    %p Retrospring uses a variety of third-party services to help provide our Services and to help us understand and improve the use of our Services, such as Piwik Analytics, or to share your answers to, if connected, other Services like Twitter, Tumblr or Facebook. These third-party service providers may collect information sent by your  browser as part of a web page request, such as cookies or your IP  address.
+    %h2 Information Sharing
+    %p Retrospring will keep any collected data (see "Information Collection and Use" above) encrypted on our servers. Any information shared with other Services is controlled by the user itself, as we only supply sharing to these. If a user isn't satisfied with Terms from another Service they shouldn't connect their accounts or remove access over the Sharing page on the profile settings page.
+    %p Notwithstanding anything to the contrary in this Policy, we may preserve  or disclose your information if we believe that it is reasonably  necessary to comply with a law, regulation or legal request; to protect  the safety of any person; to address fraud, security or technical  issues; or to protect Retrospring's rights or property.  However, nothing in this Privacy Policy is intended to limit any legal defenses or objections that you may have to a third party’s, including a government’s, request to disclose your information.
+    %h2 Modifying Your Personal Information
+    %p If you are a registered user of our Services, we provide you with tools and account settings to access or modify the personal information you provided to us and associated with your account.
+    %p You can also permanently delete your Retrospring account with a button at the bottom of the account settings page. Removing your account will cease your ability to log in with your credentials and the loss of all your data you supplied to the Service.
+    %h2 Our Policy Towards Children
+    %p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
+    %p
+      %em Effective: 17th January 2015
\ No newline at end of file

From 28e72b3adcd58460b7ad8fc27deea3645339d6de Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 16 Jan 2015 22:45:00 +0100
Subject: [PATCH 003/231] added panel-body

---
 app/views/static/privacy_policy.html.haml | 51 ++++++++++++-----------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
index a65d0fbf..5fee3162 100644
--- a/app/views/static/privacy_policy.html.haml
+++ b/app/views/static/privacy_policy.html.haml
@@ -1,27 +1,28 @@
 .container
   .panel.panel-default
-    %h1 Privacy Policy
-    %p This Privacy Policy describes how and when Retrospring uses and collects your data, checks your information and shares with other Services.
-    %h2 Information Collection and Use
-    %h4 Basic Account Information
-    %p When you create a Retrospring account, you provide some personal information, such as your name, username, password, and email address. Asking questions anonymously or looking at user profiles does not require registration.
-    %h4 Additional Information
-    %p You may provide us with information for public displaying, like a short biography, a link to your website, your location or a profile picture. This information is viewable by any visitor of the site, registered or unregistered, and therefore should not contain any critical information about you or someone else.
-    %h4 Answers and Questions
-    %p Our Service primarily is designed to ask your friends and other people from around the world questions or answer them. Most of the information you provide us is information you are asking us to make public. This information does not only include the questions, answers, comments and smiles, but also the groups you create, the people you follow and other bits of information that result from using our Service.
-    %h4 Cookies
-    %p Like many websites, we use cookies and similar technologies to collect  additional website usage data and to improve our Services. A cookie is a small data file that is transferred to your computer's hard disk. Retrospring uses persistant cookies to improve the users browsing experience and to to better understand how you interact with our Services. Most Internet browsers automatically accept cookies. You can instruct  your browser, by changing its settings, to stop accepting cookies or to  prompt you before accepting a cookie from the websites you visit.  However, the Services may not function properly if you disable cookies.
-    %h4 Log Data
-    %p When you use our Services, we may receive information ("Log Data")  such as your IP address, browser type, operating system, the referring  web page, pages visited, location, your mobile carrier, device information (including device and application IDs), search terms, and cookie information. We receive Log Data when you interact with our Services, for example, when you visit our websites or sign into our Services.
-    %h4 Third-Party Services
-    %p Retrospring uses a variety of third-party services to help provide our Services and to help us understand and improve the use of our Services, such as Piwik Analytics, or to share your answers to, if connected, other Services like Twitter, Tumblr or Facebook. These third-party service providers may collect information sent by your  browser as part of a web page request, such as cookies or your IP  address.
-    %h2 Information Sharing
-    %p Retrospring will keep any collected data (see "Information Collection and Use" above) encrypted on our servers. Any information shared with other Services is controlled by the user itself, as we only supply sharing to these. If a user isn't satisfied with Terms from another Service they shouldn't connect their accounts or remove access over the Sharing page on the profile settings page.
-    %p Notwithstanding anything to the contrary in this Policy, we may preserve  or disclose your information if we believe that it is reasonably  necessary to comply with a law, regulation or legal request; to protect  the safety of any person; to address fraud, security or technical  issues; or to protect Retrospring's rights or property.  However, nothing in this Privacy Policy is intended to limit any legal defenses or objections that you may have to a third party’s, including a government’s, request to disclose your information.
-    %h2 Modifying Your Personal Information
-    %p If you are a registered user of our Services, we provide you with tools and account settings to access or modify the personal information you provided to us and associated with your account.
-    %p You can also permanently delete your Retrospring account with a button at the bottom of the account settings page. Removing your account will cease your ability to log in with your credentials and the loss of all your data you supplied to the Service.
-    %h2 Our Policy Towards Children
-    %p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
-    %p
-      %em Effective: 17th January 2015
\ No newline at end of file
+    .panel-body
+      %h1 Privacy Policy
+      %p This Privacy Policy describes how and when Retrospring uses and collects your data, checks your information and shares with other Services.
+      %h2 Information Collection and Use
+      %h4 Basic Account Information
+      %p When you create a Retrospring account, you provide some personal information, such as your name, username, password, and email address. Asking questions anonymously or looking at user profiles does not require registration.
+      %h4 Additional Information
+      %p You may provide us with information for public displaying, like a short biography, a link to your website, your location or a profile picture. This information is viewable by any visitor of the site, registered or unregistered, and therefore should not contain any critical information about you or someone else.
+      %h4 Answers and Questions
+      %p Our Service primarily is designed to ask your friends and other people from around the world questions or answer them. Most of the information you provide us is information you are asking us to make public. This information does not only include the questions, answers, comments and smiles, but also the groups you create, the people you follow and other bits of information that result from using our Service.
+      %h4 Cookies
+      %p Like many websites, we use cookies and similar technologies to collect  additional website usage data and to improve our Services. A cookie is a small data file that is transferred to your computer's hard disk. Retrospring uses persistant cookies to improve the users browsing experience and to to better understand how you interact with our Services. Most Internet browsers automatically accept cookies. You can instruct  your browser, by changing its settings, to stop accepting cookies or to  prompt you before accepting a cookie from the websites you visit.  However, the Services may not function properly if you disable cookies.
+      %h4 Log Data
+      %p When you use our Services, we may receive information ("Log Data")  such as your IP address, browser type, operating system, the referring  web page, pages visited, location, your mobile carrier, device information (including device and application IDs), search terms, and cookie information. We receive Log Data when you interact with our Services, for example, when you visit our websites or sign into our Services.
+      %h4 Third-Party Services
+      %p Retrospring uses a variety of third-party services to help provide our Services and to help us understand and improve the use of our Services, such as Piwik Analytics, or to share your answers to, if connected, other Services like Twitter, Tumblr or Facebook. These third-party service providers may collect information sent by your  browser as part of a web page request, such as cookies or your IP  address.
+      %h2 Information Sharing
+      %p Retrospring will keep any collected data (see "Information Collection and Use" above) encrypted on our servers. Any information shared with other Services is controlled by the user itself, as we only supply sharing to these. If a user isn't satisfied with Terms from another Service they shouldn't connect their accounts or remove access over the Sharing page on the profile settings page.
+      %p Notwithstanding anything to the contrary in this Policy, we may preserve  or disclose your information if we believe that it is reasonably  necessary to comply with a law, regulation or legal request; to protect  the safety of any person; to address fraud, security or technical  issues; or to protect Retrospring's rights or property.  However, nothing in this Privacy Policy is intended to limit any legal defenses or objections that you may have to a third party’s, including a government’s, request to disclose your information.
+      %h2 Modifying Your Personal Information
+      %p If you are a registered user of our Services, we provide you with tools and account settings to access or modify the personal information you provided to us and associated with your account.
+      %p You can also permanently delete your Retrospring account with a button at the bottom of the account settings page. Removing your account will cease your ability to log in with your credentials and the loss of all your data you supplied to the Service.
+      %h2 Our Policy Towards Children
+      %p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
+      %p
+        %em Effective: 17th January 2015
\ No newline at end of file

From 74e74dedef5699bcbe59ab6cf514eb035ab20e89 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 16 Jan 2015 23:16:28 +0100
Subject: [PATCH 004/231] added terms of service

---
 app/controllers/static_controller.rb |  4 ++++
 app/views/static/terms.html.haml     | 22 ++++++++++++++++++++++
 config/routes.rb                     |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 app/views/static/terms.html.haml

diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 7f25bce8..a0386471 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -20,4 +20,8 @@ class StaticController < ApplicationController
   def privacy_policy
 
   end
+
+  def terms
+
+  end
 end
diff --git a/app/views/static/terms.html.haml b/app/views/static/terms.html.haml
new file mode 100644
index 00000000..adcf8214
--- /dev/null
+++ b/app/views/static/terms.html.haml
@@ -0,0 +1,22 @@
+.container
+  .panel.panel-default
+    .panel-body
+      %h1 Terms of Use
+      %p These Terms of Service ("Terms") govern your access to and use of the services (the "Services" or “Retrospring”), and any  information, text, graphics, photos or other materials uploaded,  downloaded or appearing on the Services (collectively referred to as "Content").  Your access to and use of the Services are conditioned on your  acceptance of and compliance with these Terms. By accessing or using the  Services you agree to be bound by these Terms.
+      %h2 1. Basic Terms
+      %p You are responsible for your use of the Services, for any Content you  post to the Services, and for any consequences thereof. The Content you  submit, post, or display will be able to be viewed by other users of the Services and through third party services and websites (go to the account settings page to control who sees your Content). You should only provide Content  that you are comfortable sharing with others under these Terms.
+      %p You may use the Services only if you can form a binding contract with Retrospring and are not a person barred from receiving services under the  laws of any applicable jurisdiction.  If you are  accepting these Terms and using the Services on behalf of a company,  organization, government, or other legal entity, you represent and  warrant that you are authorized to do so. You may use the Services only  in compliance with these Terms and all applicable local, state,  national, and international laws, rules and regulations.
+      %h2 2. Privacy
+      %p Any information that you provide to Retrospring is subject to our Privacy Policy,  which governs our collection and use of your information. You  understand that through your use of the Services you consent to the  collection and use (as set forth in the Privacy Policy) of this  information. As part of providing you the Services, we may need to provide you with  certain communications, such as service announcements and administrative  messages. These communications are considered part of the Services and  your Retrospring account, which you may not be able to opt-out from  receiving.
+      %h2 3. Passwords
+      %p You are responsible for safeguarding the password that you use to  access the Services and for any activities or actions under your  password. We encourage you to use "strong" passwords (passwords that use  a combination of upper and lower case letters, numbers and symbols)  with your account. Retrospring cannot and will not be liable for any loss or  damage arising from your failure to comply with the above.
+      %h2 4. Content on the Services
+      %p All Content, whether publicly posted or privately transmitted, is the  sole responsibility of the person who originated such Content. We may  not monitor or control the Content posted via the Services and, we  cannot take responsibility for such Content. Any use or reliance on any  Content or materials posted via the Services or obtained by you through  the Services is at your own risk.
+      %p We do not endorse, support, represent or guarantee the completeness,  truthfulness, accuracy, or reliability of any Content or communications  posted via the Services or endorse any opinions expressed via the  Services. You understand that by using the Services, you may be exposed  to Content that might be offensive, harmful, inaccurate or otherwise  inappropriate, or in some cases, postings that have been mislabeled or  are otherwise deceptive. Under no circumstances will Retrospring be liable  in any way for any Content, including, but not limited to, any errors or  omissions in any Content, or any loss or damage of any kind incurred as  a result of the use of any Content posted, emailed, transmitted or  otherwise made available via the Services or broadcast elsewhere.
+      %h2 5. Your Rights
+      %p You retain your rights to any Content you submit, post or display on or through the Services.
+      %h2 6. Restrictions on Content and Use of the Services
+      %p We reserve the right at all times (but will not have an obligation) to remove or refuse to distribute any Content on the Services, to suspend  or terminate users, and to reclaim usernames without liability to you.   We also reserve the right to access, read, preserve, and disclose any  information as we reasonably believe is necessary to satisfy any  applicable law, regulation, legal process or governmental request, enforce the Terms, including investigation of potential violations  hereof, detect, prevent, or otherwise address fraud, security or  technical issues, respond to user support requests, or protect  the rights, property or safety of Retrospring, its users and the public.
+      %h2 9. Copyright Policy
+      %p Retrospring respects the intellectual property rights of others and  expects users of the Services to do the same. We will respond to notices  of alleged copyright infringement that comply with applicable law and  are properly provided to us. If you believe that your Content has been  copied in a way that constitutes copyright infringement, please provide  us with the following information: a physical or electronic  signature of the copyright owner or a person authorized to act on their  behalf; identification of the copyrighted work claimed to have been  infringed; identification of the material that is claimed to be  infringing or to be the subject of infringing activity and that is to be  removed or access to which is to be disabled, and information  reasonably sufficient to permit us to locate the material; your  contact information, including your address, telephone number, and an  email address; a statement by you that you have a good faith belief  that use of the material in the manner complained of is not authorized  by the copyright owner, its agent, or the law; and a statement that  the information in the notification is accurate, and, under penalty of  perjury, that you are authorized to act on behalf of the copyright  owner.
+      %p We reserve the right to remove Content alleged to be infringing  without prior notice, at our sole discretion, and without liability to  you. In appropriate circumstances, Retrospring will also terminate a user’s  account if the user is determined to be a repeat infringer.
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index dbc991d1..5ad09a18 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,6 +28,7 @@ Rails.application.routes.draw do
   match '/about', to: 'static#about', via: 'get'
   match '/help/faq', to: 'static#faq', via: 'get', as: :help_faq
   match '/privacy', to: 'static#privacy_policy', via: 'get', as: :privacy_policy
+  match '/terms', to: 'static#terms', via: 'get', as: :terms
 
   # Devise routes
   devise_for :users, path: 'user', skip: [:sessions, :registrations]

From ec62fea66500f30d62cdd92fc75548b419082ac1 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 16 Jan 2015 23:31:02 +0100
Subject: [PATCH 005/231] updated screen name validator

---
 app/validators/screen_name_validator.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/validators/screen_name_validator.rb b/app/validators/screen_name_validator.rb
index e0158662..b8279de2 100644
--- a/app/validators/screen_name_validator.rb
+++ b/app/validators/screen_name_validator.rb
@@ -1,7 +1,8 @@
 class ScreenNameValidator < ActiveModel::EachValidator
   FORBIDDEN_SCREEN_NAMES = %w(justask_admin retrospring_admin admin justask retrospring support about public
                               notifications inbox sign_in sign_up sidekiq moderation moderator mod administrator
-                              siteadmin site_admin help retro_spring retroospring retrosprlng niisding nllsding)
+                              siteadmin site_admin help retro_spring retroospring retrosprlng niisding nllsding
+                              pixeidesu terms privacy help)
 
   def validate_each(record, attribute, value)
     if FORBIDDEN_SCREEN_NAMES.include? value.downcase

From d5b14f0654b7fccd2bd5bdb4e944ce6d4b25c65d Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sat, 17 Jan 2015 09:13:56 +0100
Subject: [PATCH 006/231] update effective date

---
 app/views/static/privacy_policy.html.haml | 2 +-
 app/views/static/terms.html.haml          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
index 5fee3162..7eb5b825 100644
--- a/app/views/static/privacy_policy.html.haml
+++ b/app/views/static/privacy_policy.html.haml
@@ -25,4 +25,4 @@
       %h2 Our Policy Towards Children
       %p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
       %p
-        %em Effective: 17th January 2015
\ No newline at end of file
+        %em Effective: 18th January 2015
\ No newline at end of file
diff --git a/app/views/static/terms.html.haml b/app/views/static/terms.html.haml
index adcf8214..bfe4afab 100644
--- a/app/views/static/terms.html.haml
+++ b/app/views/static/terms.html.haml
@@ -19,4 +19,6 @@
       %p We reserve the right at all times (but will not have an obligation) to remove or refuse to distribute any Content on the Services, to suspend  or terminate users, and to reclaim usernames without liability to you.   We also reserve the right to access, read, preserve, and disclose any  information as we reasonably believe is necessary to satisfy any  applicable law, regulation, legal process or governmental request, enforce the Terms, including investigation of potential violations  hereof, detect, prevent, or otherwise address fraud, security or  technical issues, respond to user support requests, or protect  the rights, property or safety of Retrospring, its users and the public.
       %h2 9. Copyright Policy
       %p Retrospring respects the intellectual property rights of others and  expects users of the Services to do the same. We will respond to notices  of alleged copyright infringement that comply with applicable law and  are properly provided to us. If you believe that your Content has been  copied in a way that constitutes copyright infringement, please provide  us with the following information: a physical or electronic  signature of the copyright owner or a person authorized to act on their  behalf; identification of the copyrighted work claimed to have been  infringed; identification of the material that is claimed to be  infringing or to be the subject of infringing activity and that is to be  removed or access to which is to be disabled, and information  reasonably sufficient to permit us to locate the material; your  contact information, including your address, telephone number, and an  email address; a statement by you that you have a good faith belief  that use of the material in the manner complained of is not authorized  by the copyright owner, its agent, or the law; and a statement that  the information in the notification is accurate, and, under penalty of  perjury, that you are authorized to act on behalf of the copyright  owner.
-      %p We reserve the right to remove Content alleged to be infringing  without prior notice, at our sole discretion, and without liability to  you. In appropriate circumstances, Retrospring will also terminate a user’s  account if the user is determined to be a repeat infringer.
\ No newline at end of file
+      %p We reserve the right to remove Content alleged to be infringing  without prior notice, at our sole discretion, and without liability to  you. In appropriate circumstances, Retrospring will also terminate a user’s  account if the user is determined to be a repeat infringer.
+      %p
+        %em Effective: 18th January 2015
\ No newline at end of file

From 68717332491502f9b439990cc55cee8aef6f52c9 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sat, 17 Jan 2015 09:21:49 +0100
Subject: [PATCH 007/231] update terms of service

---
 app/views/static/privacy_policy.html.haml | 2 +-
 app/views/static/terms.html.haml          | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
index 7eb5b825..b0b13cc3 100644
--- a/app/views/static/privacy_policy.html.haml
+++ b/app/views/static/privacy_policy.html.haml
@@ -5,7 +5,7 @@
       %p This Privacy Policy describes how and when Retrospring uses and collects your data, checks your information and shares with other Services.
       %h2 Information Collection and Use
       %h4 Basic Account Information
-      %p When you create a Retrospring account, you provide some personal information, such as your name, username, password, and email address. Asking questions anonymously or looking at user profiles does not require registration.
+      %p When you create a Retrospring account, you provide some personal information, such as your username, password, and email address. Asking questions anonymously or looking at user profiles does not require registration.
       %h4 Additional Information
       %p You may provide us with information for public displaying, like a short biography, a link to your website, your location or a profile picture. This information is viewable by any visitor of the site, registered or unregistered, and therefore should not contain any critical information about you or someone else.
       %h4 Answers and Questions
diff --git a/app/views/static/terms.html.haml b/app/views/static/terms.html.haml
index bfe4afab..6bf19eb6 100644
--- a/app/views/static/terms.html.haml
+++ b/app/views/static/terms.html.haml
@@ -7,7 +7,10 @@
       %p You are responsible for your use of the Services, for any Content you  post to the Services, and for any consequences thereof. The Content you  submit, post, or display will be able to be viewed by other users of the Services and through third party services and websites (go to the account settings page to control who sees your Content). You should only provide Content  that you are comfortable sharing with others under these Terms.
       %p You may use the Services only if you can form a binding contract with Retrospring and are not a person barred from receiving services under the  laws of any applicable jurisdiction.  If you are  accepting these Terms and using the Services on behalf of a company,  organization, government, or other legal entity, you represent and  warrant that you are authorized to do so. You may use the Services only  in compliance with these Terms and all applicable local, state,  national, and international laws, rules and regulations.
       %h2 2. Privacy
-      %p Any information that you provide to Retrospring is subject to our Privacy Policy,  which governs our collection and use of your information. You  understand that through your use of the Services you consent to the  collection and use (as set forth in the Privacy Policy) of this  information. As part of providing you the Services, we may need to provide you with  certain communications, such as service announcements and administrative  messages. These communications are considered part of the Services and  your Retrospring account, which you may not be able to opt-out from  receiving.
+      %p
+        Any information that you provide to Retrospring is subject to our
+        = link_to "Privacy Policy", privacy_policy_path
+        ,  which governs our collection and use of your information. You  understand that through your use of the Services you consent to the  collection and use (as set forth in the Privacy Policy) of this  information. As part of providing you the Services, we may need to provide you with  certain communications, such as service announcements and administrative  messages. These communications are considered part of the Services and  your Retrospring account, which you may not be able to opt-out from  receiving.
       %h2 3. Passwords
       %p You are responsible for safeguarding the password that you use to  access the Services and for any activities or actions under your  password. We encourage you to use "strong" passwords (passwords that use  a combination of upper and lower case letters, numbers and symbols)  with your account. Retrospring cannot and will not be liable for any loss or  damage arising from your failure to comply with the above.
       %h2 4. Content on the Services

From 991ad1f8383f84731f0714cbd452575f616a1e65 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sat, 17 Jan 2015 12:34:51 +0100
Subject: [PATCH 008/231] added agree statement to sign in page

---
 app/views/devise/registrations/new.html.haml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 9b27989f..81cc63df 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -10,6 +10,9 @@
     = f.password_field :password, autocomplete: "off", label: "Password"
     = f.password_field :password_confirmation, autocomplete: "off", label: "Confirm password"
 
+    %p
+      With signing up you accept our
+      = link_to "Terms of Service", terms_path
     = f.submit "Sign up"
 
   = render "devise/shared/links"

From 097041c8d200f5dadd8e8b2ae937159bd3da834e Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 18 Jan 2015 01:12:53 +0100
Subject: [PATCH 009/231] update questiongenerator

---
 Gemfile.lock                             | 4 ++--
 config/initializers/questiongenerator.rb | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 config/initializers/questiongenerator.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index b76ce586..401e40bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/justask/questiongenerator.git
-  revision: 99f2469bbe59f50a0cf3df60d7e82b2b5f7aab9b
+  revision: d90f681be8e3a155a6aa45fc9afaae95c24d5114
   specs:
-    questiongenerator (0.0.2)
+    questiongenerator (0.1.0)
 
 GEM
   remote: https://rubygems.org/
diff --git a/config/initializers/questiongenerator.rb b/config/initializers/questiongenerator.rb
new file mode 100644
index 00000000..2aacfa93
--- /dev/null
+++ b/config/initializers/questiongenerator.rb
@@ -0,0 +1 @@
+QuestionGenerator.compile

From 05334e3bd0b9b47070140d2f3d827fbc93e777a5 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 18 Jan 2015 14:15:21 +0100
Subject: [PATCH 010/231] added some specs

---
 app/assets/javascripts/piwik.js.erb      |   2 +-
 spec/factories/{users.rb => 10_users.rb} |   0
 spec/factories/answers.rb                |   6 ++
 spec/factories/questions.rb              |   6 ++
 spec/features/users/banned_spec.rb       |  43 ++++++++
 spec/features/users/inbox_spec.rb        | 124 +++++++++++++++++++++++
 spec/models/answer_spec.rb               |  19 ++++
 spec/models/question_spec.rb             |  35 +++++++
 8 files changed, 234 insertions(+), 1 deletion(-)
 rename spec/factories/{users.rb => 10_users.rb} (100%)
 create mode 100644 spec/factories/answers.rb
 create mode 100644 spec/factories/questions.rb
 create mode 100644 spec/features/users/banned_spec.rb
 create mode 100644 spec/features/users/inbox_spec.rb
 create mode 100644 spec/models/answer_spec.rb
 create mode 100644 spec/models/question_spec.rb

diff --git a/app/assets/javascripts/piwik.js.erb b/app/assets/javascripts/piwik.js.erb
index 5e716619..a3e62461 100644
--- a/app/assets/javascripts/piwik.js.erb
+++ b/app/assets/javascripts/piwik.js.erb
@@ -13,6 +13,6 @@ _paq.push(['setDocumentTitle', document.title]);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
 })();
-<% else %>
+<% elsif !Rails.env.test? %>
 console.log("i track'd ur bich");
 <% end %>
\ No newline at end of file
diff --git a/spec/factories/users.rb b/spec/factories/10_users.rb
similarity index 100%
rename from spec/factories/users.rb
rename to spec/factories/10_users.rb
diff --git a/spec/factories/answers.rb b/spec/factories/answers.rb
new file mode 100644
index 00000000..6d32c335
--- /dev/null
+++ b/spec/factories/answers.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :answer do |u|
+    u.sequence(:content) { |n| "This is an answer.  I'm number #{n}!" }
+    u.user FactoryGirl.create(:user)
+  end
+end
diff --git a/spec/factories/questions.rb b/spec/factories/questions.rb
new file mode 100644
index 00000000..688854b1
--- /dev/null
+++ b/spec/factories/questions.rb
@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :question do |u|
+    u.sequence(:content) { |n| "#{QuestionGenerator.generate}#{n}" }
+    u.author_is_anonymous true
+  end
+end
diff --git a/spec/features/users/banned_spec.rb b/spec/features/users/banned_spec.rb
new file mode 100644
index 00000000..6b4f4107
--- /dev/null
+++ b/spec/features/users/banned_spec.rb
@@ -0,0 +1,43 @@
+include Warden::Test::Helpers
+Warden.test_mode!
+
+# Feature: Ban users
+#   As a user
+#   I want to get banned
+#   So I can't sign in anymore
+feature "Ban users", :devise do
+
+  after :each do
+    Warden.test_reset!
+  end
+
+  # Scenario: User gets banned
+  #   Given I am signed in
+  #   When I visit another page
+  #   And I am banned
+  #   Then I see the sign in page
+  scenario "user gets banned", js: true do
+    me = FactoryGirl.create :user
+
+    login_as me, scope: :user
+    visit root_path
+    expect(page).to have_text("Timeline")
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true
+
+    me.banned = true
+    me.save
+    click_link "Inbox"
+    expect(current_path).to eq(new_user_session_path)
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
+  end
+
+  scenario 'user visits banned user profiles', js: true do
+    evil_user = FactoryGirl.create :user
+    evil_user.banned = true
+    evil_user.save
+
+    visit show_user_profile_path(evil_user.screen_name)
+    expect(page).to have_text('Banned'.upcase)
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_3.png"), full: true
+  end
+end
diff --git a/spec/features/users/inbox_spec.rb b/spec/features/users/inbox_spec.rb
new file mode 100644
index 00000000..2dd96409
--- /dev/null
+++ b/spec/features/users/inbox_spec.rb
@@ -0,0 +1,124 @@
+include Warden::Test::Helpers
+Warden.test_mode!
+
+# Feature: Answer questions
+#   As a user
+#   I want to go to the inbox
+#   So I can answer and get new questions
+feature "Inbox", :devise do
+
+  after :each do
+    Warden.test_reset!
+  end
+
+  # Scenario: User answers a question
+  #   Given I am signed in
+  #   When I visit the inbox
+  #   And I have a question in my inbox
+  #   Then I can answer my question
+  #   And see the answer on my user profile
+  scenario "user answers a question", js: true do
+    me = FactoryGirl.create :user
+    question = FactoryGirl.create :question
+    Inbox.create question: question, user: me, new: true
+
+    login_as me, scope: :user
+    visit root_path
+    expect(page).to have_text('1 new question')
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true
+
+    click_link "Inbox"
+    expect(page).to have_text(question.content)
+    fill_in "ib-answer", with: Faker::Lorem.sentence
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
+
+    click_button "Answer"
+    wait_for_ajax
+    expect(page).not_to have_text(question.content)
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_3.png"), full: true
+
+    visit show_user_profile_path(me.screen_name)
+    expect(page).to have_text(question.content)
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_4.png"), full: true
+  end
+
+  # Scenario: User generates new question
+  #   Given I am signed in
+  #   When I visit the inbox
+  #   And I click "Get new question"
+  #   Then I get a new question
+  scenario 'user generates new question', js: true do
+    me = FactoryGirl.create :user
+
+    login_as me, scope: :user
+    visit inbox_path
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true
+
+    click_button "Get new question"
+    wait_for_ajax
+    expect(page).to have_text('Answer'.upcase)
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
+  end
+
+=begin
+  # Scenario: User deletes a question
+  #   Given I am signed in
+  #   When I visit the inbox
+  #   And I have a question in my inbox
+  #   And I delete the question
+  #   Then don't see it anymore in my inbox
+  scenario "user deletes a question", js: true do
+    me = FactoryGirl.create :user
+    question = FactoryGirl.create :question
+    Inbox.create question: question, user: me
+
+    login_as me, scope: :user
+    visit inbox_path
+    expect(page).to have_text(question.content)
+
+    click_button "Delete"
+    expect(page).to have_text('Really delete?')
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true
+
+    # this apparently doesn't get triggered :(
+    page.find('.sweet-alert').click_button 'Delete'
+    wait_for_ajax
+
+    visit root_path
+    visit inbox_path
+    expect(page).not_to have_text(question.content)
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
+  end
+
+  # Scenario: User deletes all questions
+  #   Given I am signed in
+  #   When I visit the inbox
+  #   And I have a few questions in my inbox
+  #   And I click on "Delete all questions"
+  #   Then don't see them anymore in my inbox
+  scenario "user deletes all questions", js: true do
+    me = FactoryGirl.create :user
+    5.times do
+      question = FactoryGirl.create :question
+      Inbox.create question: question, user: me
+    end
+
+    login_as me, scope: :user
+    visit inbox_path
+    expect(page).to have_text('Answer'.upcase)
+
+    click_button "Delete all questions"
+    expect(page).to have_text('Really delete 5 questions?')
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true
+
+    # this apparently doesn't get triggered :(
+    page.find('.sweet-alert').click_button 'Delete'
+    wait_for_ajax
+
+    visit root_path
+    visit inbox_path
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
+    expect(page).not_to have_text('Answer'.upcase)
+  end
+=end
+end
diff --git a/spec/models/answer_spec.rb b/spec/models/answer_spec.rb
new file mode 100644
index 00000000..86714638
--- /dev/null
+++ b/spec/models/answer_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+RSpec.describe Answer, :type => :model do
+  before :each do
+    @answer = Answer.new(
+        content: 'This is an answer.',
+        user: FactoryGirl.create(:user),
+        question: FactoryGirl.create(:question)
+    )
+  end
+
+  subject { @answer }
+
+  it { should respond_to(:content) }
+
+  it '#content returns a string' do
+    expect(@answer.content).to match 'This is an answer.'
+  end
+end
diff --git a/spec/models/question_spec.rb b/spec/models/question_spec.rb
new file mode 100644
index 00000000..9bfa8b3a
--- /dev/null
+++ b/spec/models/question_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe Question, :type => :model do
+  before :each do
+    @question = Question.new(
+        content: 'Is this a question?',
+        user: FactoryGirl.create(:user)
+    )
+  end
+
+  subject { @question }
+
+  it { should respond_to(:content) }
+
+  it '#content returns a string' do
+    expect(@question.content).to match 'Is this a question?'
+  end
+
+  it 'does not save questions longer than 255 characters' do
+    @question.content = 'X' * 256
+    expect{@question.save!}.to raise_error(ActiveRecord::RecordInvalid)
+  end
+
+  it 'has many answers' do
+    5.times { |i| Answer.create(content: "This is an answer. #{i}", user: FactoryGirl.create(:user), question: @question) }
+    expect(@question.answer_count).to match 5
+  end
+
+  it 'also deletes the answers when deleted' do
+    5.times { |i| Answer.create(content: "This is an answer. #{i}", user: FactoryGirl.create(:user), question: @question) }
+    first_answer_id = @question.answers.first.id
+    @question.destroy
+    expect{Answer.find(first_answer_id)}.to raise_error(ActiveRecord::RecordNotFound)
+  end
+end

From fa2220dd002d753eb6f69e807e8b3891237e648b Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 19 Jan 2015 17:39:19 +0100
Subject: [PATCH 011/231] added Filippus to admins

---
 app/views/static/about.html.haml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 56bbd63b..b8abc228 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -27,6 +27,13 @@
             .media-body
               %h4.entry-text.entry-about pixeldesu
               %h6.entry-subtext Frontend Design & Layout
+          .media
+            .pull-left
+              %a{href: show_user_profile_path('Filippus')}
+                %img.img-rounded.answerbox--img{src: User.find_by_screen_name('Filippus').profile_picture.url(:medium)}
+            .media-body
+              %h4.entry-text.entry-about Filippus
+              %h6.entry-subtext Moderator Management & Support
       .panel.panel-default
         .panel-body
           %h3 Moderators

From bae7307778ba4ff97e25cf461b036d1cda1dc937 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 25 Jan 2015 19:06:22 +0100
Subject: [PATCH 012/231] no longer require factory_girl_rails

---
 Gemfile             | 2 +-
 spec/spec_helper.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 6d635877..6251f7f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,7 +74,7 @@ end
 group :development, :test do
   gem 'thin'
   gem 'rspec-rails', '~> 3.0.0'
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', require: false
   gem 'faker'
   gem 'capybara'
   gem 'poltergeist'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a5f6554f..dd8b7595 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,6 +7,8 @@ Capybara.register_driver :poltergeist do |app|
 end
 Capybara.javascript_driver = :poltergeist
 
+require 'factory_girl_rails'
+
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this

From 53244234a59a6b2acebe4c4db1ff07444d740587 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 25 Jan 2015 19:16:32 +0100
Subject: [PATCH 013/231] update questiongenerator

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 401e40bd..a587f7a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/justask/questiongenerator.git
-  revision: d90f681be8e3a155a6aa45fc9afaae95c24d5114
+  revision: 4f85dafbaf226e3dfbfad9ed3f169bab03b9a84c
   specs:
     questiongenerator (0.1.0)
 

From 83e23accfeb81c225ae95b31ea680623b8acceeb Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 25 Jan 2015 19:21:44 +0100
Subject: [PATCH 014/231] update TODO

---
 TODO | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index dd6ce6e6..d3161e88 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,7 @@ Not done:
 [012|  0%] (?) open source the entire thing – in late 2015 or 2016 maybe, after we got bought by fakelook.
 [015|  0%] make a public accessible API (maybe even as an oauth provider?)
 [016|  5%] WRYYYYte more specs
-[017|  0%] write "terms of service" and a privacy policy.
+[017| 50%] write "terms of service" and a privacy policy.
 [018|  0%] that annoying "we use cookies" thing every website in the EU must? add
 [020|  0%] helper function for profile headings to resize on certain string length
 [022|  0%] recommended follows
@@ -33,4 +33,4 @@ Finished:
 [014|100%] generate questions if there are none in the inbox (probably make it as a gem)
 [019|100%] omniAuth (twatter, fakelook, goggles plus) for social networking elitists
 [021|100%] deleting comments
-    |----- restructure comment design
\ No newline at end of file
+    |----- restructure comment design

From ef4b0e78f8b4fadbd555ce5553f6e449b6eab464 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 25 Jan 2015 19:33:41 +0100
Subject: [PATCH 015/231] attempt to prevent phantomjs timeouts

---
 spec/spec_helper.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index dd8b7595..1b31fa35 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,6 +26,14 @@ require 'factory_girl_rails'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+
+  # this should prevent timeouts for waiting on the assets to be compiled,
+  # makes testing a bit longer though
+  config.before(:all, type: :feature) do
+    visit "/assets/application.css"
+    visit "/assets/application.js"
+  end
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin

From 626cedca0e7d9798d691c0622b30328b3d40e3ac Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 25 Jan 2015 19:42:13 +0100
Subject: [PATCH 016/231] attempt #2

---
 spec/spec_helper.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1b31fa35..e709dd67 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,7 +3,9 @@ SimpleCov.start
 
 require 'capybara/poltergeist'
 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, js_errors: false)
+  Capybara::Poltergeist::Driver.new app,
+    js_errors: false,
+    timeout: 180
 end
 Capybara.javascript_driver = :poltergeist
 
@@ -26,14 +28,6 @@ require 'factory_girl_rails'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-
-  # this should prevent timeouts for waiting on the assets to be compiled,
-  # makes testing a bit longer though
-  config.before(:all, type: :feature) do
-    visit "/assets/application.css"
-    visit "/assets/application.js"
-  end
-
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin

From 6d68da5ae11c80b07c2b60b57a9f4175362ffc74 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 25 Jan 2015 19:56:39 +0100
Subject: [PATCH 017/231] added Rcov formatter for simplecov

---
 Gemfile             | 4 +++-
 Gemfile.lock        | 7 +++++++
 spec/spec_helper.rb | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 6251f7f8..63dca713 100644
--- a/Gemfile
+++ b/Gemfile
@@ -78,7 +78,9 @@ group :development, :test do
   gem 'faker'
   gem 'capybara'
   gem 'poltergeist'
-  gem 'simplecov'
+  gem 'simplecov', require: false
+  gem 'simplecov-json', require: false
+  gem 'simplecov-rcov', require: false
   gem 'database_cleaner'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a587f7a5..fc086541 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -284,6 +284,11 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    simplecov-json (0.2)
+      json
+      simplecov
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -399,6 +404,8 @@ DEPENDENCIES
   sdoc (~> 0.4.1)
   sidekiq
   simplecov
+  simplecov-json
+  simplecov-rcov
   sinatra
   spring
   sweetalert-rails
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e709dd67..45581943 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,12 @@
 require 'simplecov'
+require 'simplecov-json'
+require 'simplecov-rcov'
+
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::JSONFormatter,
+  SimpleCov::Formatter::RcovFormatter
+]
 SimpleCov.start
 
 require 'capybara/poltergeist'

From 0d639fd6ecf17b046e99f42c796202a2a95121ab Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 25 Jan 2015 20:30:09 +0100
Subject: [PATCH 018/231] added blogger badge

---
 Rakefile                               | 24 ++++++++++++--
 app/assets/stylesheets/scss/user.scss  | 44 ++++++--------------------
 app/views/user/_profile_info.html.haml |  4 +++
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Rakefile b/Rakefile
index 8c169681..cce9964f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -70,7 +70,7 @@ namespace :justask do
     fail "user #{args[:screen_name]} not found" if user.nil?
     user.admin = false
     user.save!
-    puts "#{user.screen_name} no longer an admin."
+    puts "#{user.screen_name} is no longer an admin."
   end
 
   desc "Gives moderator status to an user."
@@ -113,6 +113,26 @@ namespace :justask do
     puts "#{user.screen_name} is no longer banned."
   end
 
+  desc "Gives blogger status to an user."
+  task :blog, [:screen_name] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    fail "user #{args[:screen_name]} not found" if user.nil?
+    user.blogger = true
+    user.save!
+    puts "#{user.screen_name} is now a blogger."
+  end
+
+  desc "Removes blogger status from an user."
+  task :unblog, [:screen_name] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    fail "user #{args[:screen_name]} not found" if user.nil?
+    user.blogger = false
+    user.save!
+    puts "#{user.screen_name} is no longer a blogger."
+  end
+
   desc "Gives supporter status to an user."
   task :sup, [:screen_name] => :environment do |t, args|
     fail "screen name required" if args[:screen_name].nil?
@@ -130,7 +150,7 @@ namespace :justask do
     fail "user #{args[:screen_name]} not found" if user.nil?
     user.supporter = false
     user.save!
-    puts "#{user.screen_name} no longer an supporter."
+    puts "#{user.screen_name} is no longer an supporter."
   end
 
   desc "Lists all users."
diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss
index 55101e25..799296ac 100644
--- a/app/assets/stylesheets/scss/user.scss
+++ b/app/assets/stylesheets/scss/user.scss
@@ -22,27 +22,6 @@
   margin: 0px 0px 0.2em;
 }
 
-.profile--admin {
-  color: $brand-danger;
-  text-transform: uppercase;
-  font-weight: bold;
-  font-size: 80%;
-}
-
-.profile--moderator {
-  color: $brand-success;
-  text-transform: uppercase;
-  font-weight: bold;
-  font-size: 80%;
-}
-
-.profile--supporter {
-  color: $brand-warning;
-  text-transform: uppercase;
-  font-weight: bold;
-  font-size: 80%;
-}
-
 .profile--text {
   margin-bottom: 2px;
   line-height: 1.5em;
@@ -106,20 +85,17 @@
   color: #fff;
 }
 
-.panel-badge-danger {
-  background-color: #E51C23;
-}
+$colours: danger $brand-danger,
+          default #BBB,
+          success $brand-success,
+          warning $brand-warning,
+          info $brand-info,
+          primary $brand-primary;
 
-.panel-badge-default {
-  background-color: #BBB;
-}
-
-.panel-badge-success {
-  background-color: #4CAF50;
-}
-
-.panel-badge-warning {
-  background-color: #FF9800;
+@each $colour in $colours {
+  .panel-badge-#{nth($colour, 1)} {
+    background-color: nth($colour, 2);
+  }
 }
 
 .user--banned {
diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml
index dc310f11..5dfae7e0 100644
--- a/app/views/user/_profile_info.html.haml
+++ b/app/views/user/_profile_info.html.haml
@@ -12,6 +12,10 @@
     .profile--panel-badge.panel-badge-warning
       %i.fa.fa-star
       Supporter
+  - if @user.blogger?
+    .profile--panel-badge.panel-badge-info
+      %i.fa.fa-pencil.fa-spin
+      Blogger
   - if @user.banned?
     .profile--panel-badge.panel-badge-default
       %i.fa.fa-ban

From 87d08f92e8068e3b4133a6f27f935bf679c8dc82 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sun, 25 Jan 2015 20:30:53 +0100
Subject: [PATCH 019/231] forgot to add migration and everything

---
 .../20150125191224_add_blogger_to_users.rb    |  5 ++
 db/schema.rb                                  | 46 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20150125191224_add_blogger_to_users.rb

diff --git a/db/migrate/20150125191224_add_blogger_to_users.rb b/db/migrate/20150125191224_add_blogger_to_users.rb
new file mode 100644
index 00000000..cc860fa3
--- /dev/null
+++ b/db/migrate/20150125191224_add_blogger_to_users.rb
@@ -0,0 +1,5 @@
+class AddBloggerToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :blogger, :boolean, default: :false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 42159d46..d9f6fe4c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150112210755) do
+ActiveRecord::Schema.define(version: 20150125191224) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -101,6 +101,49 @@ ActiveRecord::Schema.define(version: 20150112210755) do
     t.datetime "updated_at"
   end
 
+  create_table "oauth_access_grants", force: true do |t|
+    t.integer  "resource_owner_id", null: false
+    t.integer  "application_id",    null: false
+    t.string   "token",             null: false
+    t.integer  "expires_in",        null: false
+    t.text     "redirect_uri",      null: false
+    t.datetime "created_at",        null: false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
+
+  create_table "oauth_access_tokens", force: true do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             null: false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        null: false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
+  add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
+  add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
+
+  create_table "oauth_applications", force: true do |t|
+    t.string   "name",                      null: false
+    t.string   "uid",                       null: false
+    t.string   "secret",                    null: false
+    t.text     "redirect_uri",              null: false
+    t.string   "scopes",       default: "", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
+  add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
+
   create_table "questions", force: true do |t|
     t.string   "content"
     t.boolean  "author_is_anonymous"
@@ -198,6 +241,7 @@ ActiveRecord::Schema.define(version: 20150112210755) do
     t.boolean  "privacy_allow_stranger_answers",    default: true
     t.boolean  "privacy_show_in_search",            default: true
     t.boolean  "banned",                            default: false
+    t.boolean  "blogger",                           default: false
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree

From 40eb19d38743c9f971b299f6208425e5349ffdd7 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sun, 25 Jan 2015 20:48:14 +0100
Subject: [PATCH 020/231] updated colours thingy

---
 app/assets/stylesheets/scss/user.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss
index 799296ac..9111b7c3 100644
--- a/app/assets/stylesheets/scss/user.scss
+++ b/app/assets/stylesheets/scss/user.scss
@@ -89,8 +89,8 @@ $colours: danger $brand-danger,
           default #BBB,
           success $brand-success,
           warning $brand-warning,
-          info $brand-info,
-          primary $brand-primary;
+          primary $brand-primary,
+          info #2980b9;
 
 @each $colour in $colours {
   .panel-badge-#{nth($colour, 1)} {

From 1a3c491e458cf37d2b9c0f36d61b41713593364a Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sun, 25 Jan 2015 20:50:42 +0100
Subject: [PATCH 021/231] remove fa-spin from blogger badge

---
 app/views/user/_profile_info.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml
index 5dfae7e0..cdd4878d 100644
--- a/app/views/user/_profile_info.html.haml
+++ b/app/views/user/_profile_info.html.haml
@@ -14,7 +14,7 @@
       Supporter
   - if @user.blogger?
     .profile--panel-badge.panel-badge-info
-      %i.fa.fa-pencil.fa-spin
+      %i.fa.fa-pencil
       Blogger
   - if @user.banned?
     .profile--panel-badge.panel-badge-default

From 370169c35a83862df48a79985fb71c6e18602342 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 26 Jan 2015 15:51:18 +0100
Subject: [PATCH 022/231] update and fix mobile design

---
 app/assets/stylesheets/scss/answerbox.scss |  7 ++++++-
 app/views/shared/_answerbox.html.haml      | 24 ++++++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/scss/answerbox.scss b/app/assets/stylesheets/scss/answerbox.scss
index 71468b1e..68facc5b 100644
--- a/app/assets/stylesheets/scss/answerbox.scss
+++ b/app/assets/stylesheets/scss/answerbox.scss
@@ -17,7 +17,7 @@
   width: 20px;
 }
 
-.answerbox--question-text, .answerbox--question-user {
+.answerbox--question-text, .answerbox--question-user, .answerbox--answer-user, .answerbox--answer-date {
   margin-bottom: 0px;
   overflow: hidden;
 }
@@ -30,4 +30,9 @@
   font-size: 16px;
   color: #000;
   line-height: 1.3em;
+}
+
+.answerbox--answer-date {
+  font-size: 12px;
+  line-height: 1.3em;
 }
\ No newline at end of file
diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index e486e8fc..35adc2f2 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -36,15 +36,21 @@
         = markdown a.content
     - if @user.nil?
       .row
-        .col-md-6.col-sm-4.col-xs-7.text-left.text-muted
-          Answered by
-          %a{href: show_user_profile_path(a.user.screen_name)}
-            %img.img-rounded.answerbox--img-small{src: gravatar_url(a.user)}
-            %span= a.user.screen_name
-          %a{href: show_user_answer_path(a.user.screen_name, a.id)}
-            %span= time_ago_in_words(a.created_at)
-            ago
-        .col-md-6.col-sm-8.col-xs-5.text-right
+        .col-md-6.col-sm-4.col-xs-6.text-left.text-muted
+          .media
+            .pull-left
+              %a{href: show_user_profile_path(a.user.screen_name)}
+                %img.img-rounded.answerbox--img{src: gravatar_url(a.user)}
+            .media-body
+              %h6.media-heading.answerbox--answer-user
+                %span.hidden-xs
+                  Answered by
+                = user_screen_name a.user.screen_name
+              .answerbox--answer-date
+                %a{href: show_user_answer_path(a.user.screen_name, a.id)}
+                  %span= time_ago_in_words(a.created_at)
+                  ago
+        .col-md-6.col-sm-8.col-xs-6.text-right
           = render 'shared/answerbox_buttons', a: a
     - else
       .row

From e9c7c5120be2e3019c1d96ed6633309e2094655f Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 26 Jan 2015 15:57:07 +0100
Subject: [PATCH 023/231] hotfix

---
 app/views/shared/_answerbox.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index 35adc2f2..f46c90c3 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -45,7 +45,7 @@
               %h6.media-heading.answerbox--answer-user
                 %span.hidden-xs
                   Answered by
-                = user_screen_name a.user.screen_name
+                = user_screen_name a.user
               .answerbox--answer-date
                 %a{href: show_user_answer_path(a.user.screen_name, a.id)}
                   %span= time_ago_in_words(a.created_at)

From 0a69ee04a7f09a9557e1864cbfde0448c9e6b1c0 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 26 Jan 2015 16:14:20 +0100
Subject: [PATCH 024/231] changed exception rendering option for test
 environment [ci skip]

---
 config/environments/test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 411eb23c..053f5b66 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -21,7 +21,7 @@ Rails.application.configure do
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = true # was: false
+  config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false

From da9c15d43c6c6184d6a27dc17d296ca99d492bc9 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 26 Jan 2015 17:16:32 +0100
Subject: [PATCH 025/231] basic stuff added

---
 .../stylesheets/scss/notifications.scss       | 24 ++++++++++
 app/views/layouts/_notifications.html.haml    | 44 ++++++++++++++++++-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/notifications.scss b/app/assets/stylesheets/scss/notifications.scss
index 07afe92f..58055060 100644
--- a/app/assets/stylesheets/scss/notifications.scss
+++ b/app/assets/stylesheets/scss/notifications.scss
@@ -19,4 +19,28 @@
   color: $gray;
   opacity: 0.4;
   z-index: 0;
+}
+
+.notification--dropdown {
+  min-width: 370px;
+}
+
+.notification--dropdown-media {
+  padding: 3px 5px;
+}
+
+.notification--dropdown-user, .notification--dropdown-text {
+  margin-bottom: 0px;
+  overflow: hidden;
+}
+
+.notification--dropdown-user {
+  margin-top: 3px;
+}
+
+.notification--dropdown-img {
+  min-height: 32px;
+  min-width: 32px;
+  height: 32px;
+  width: 32px;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml
index 12282da0..c85e4a8c 100644
--- a/app/views/layouts/_notifications.html.haml
+++ b/app/views/layouts/_notifications.html.haml
@@ -1 +1,43 @@
-= nav_entry "Notifications", notifications_path, badge: notification_count
\ No newline at end of file
+= nav_entry "Notifications", notifications_path, badge: notification_count
+%li.dropdown.hidden-xs
+  %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
+    Notifications
+    %span.badge= notification_count
+  %ul.dropdown-menu.notification--dropdown
+    %li
+      .media.notification--dropdown-media
+        .pull-left
+          %img.img-rounded.notification--dropdown-img
+      .media-body
+        %h6.media-heading.notification--dropdown-user
+          username
+        .notification--dropdown-text
+          followed you 33 minutes ago
+    %li
+      .media.notification--dropdown-media
+        .pull-left
+          %img.img-rounded.notification--dropdown-img
+      .media-body
+        %h6.media-heading.notification--dropdown-user
+          username
+        .notification--dropdown-text
+          smiled at your answer about 1 hour ago
+    %li
+      .media.notification--dropdown-media
+        .pull-left
+          %img.img-rounded.notification--dropdown-img
+      .media-body
+        %h6.media-heading.notification--dropdown-user
+          username
+        .notification--dropdown-text
+          answered your question about 4 hours ago
+    %li
+      .media.notification--dropdown-media
+        .pull-left
+          %img.img-rounded.notification--dropdown-img
+      .media-body
+        %h6.media-heading.notification--dropdown-user
+          username
+        .notification--dropdown-text
+          commented on your answer about 5 hours ago
+    %li= link_to "Show all Notifications", notifications_path
\ No newline at end of file

From 2a0d80b755c50fc461911c0aa070d094e69ee77c Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 26 Jan 2015 17:21:40 +0100
Subject: [PATCH 026/231] basic stuff fixed

---
 app/views/layouts/_notifications.html.haml | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml
index c85e4a8c..7f6ab534 100644
--- a/app/views/layouts/_notifications.html.haml
+++ b/app/views/layouts/_notifications.html.haml
@@ -8,36 +8,36 @@
       .media.notification--dropdown-media
         .pull-left
           %img.img-rounded.notification--dropdown-img
-      .media-body
-        %h6.media-heading.notification--dropdown-user
-          username
-        .notification--dropdown-text
-          followed you 33 minutes ago
+        .media-body
+          %h6.media-heading.notification--dropdown-user
+            username
+          .notification--dropdown-text
+            followed you 33 minutes ago
     %li
       .media.notification--dropdown-media
         .pull-left
           %img.img-rounded.notification--dropdown-img
-      .media-body
-        %h6.media-heading.notification--dropdown-user
-          username
-        .notification--dropdown-text
-          smiled at your answer about 1 hour ago
+        .media-body
+          %h6.media-heading.notification--dropdown-user
+            username
+          .notification--dropdown-text
+            smiled at your answer about 1 hour ago
     %li
       .media.notification--dropdown-media
         .pull-left
           %img.img-rounded.notification--dropdown-img
-      .media-body
-        %h6.media-heading.notification--dropdown-user
-          username
-        .notification--dropdown-text
-          answered your question about 4 hours ago
+        .media-body
+          %h6.media-heading.notification--dropdown-user
+            username
+          .notification--dropdown-text
+            answered your question about 4 hours ago
     %li
       .media.notification--dropdown-media
         .pull-left
           %img.img-rounded.notification--dropdown-img
-      .media-body
-        %h6.media-heading.notification--dropdown-user
-          username
-        .notification--dropdown-text
-          commented on your answer about 5 hours ago
+        .media-body
+          %h6.media-heading.notification--dropdown-user
+            username
+          .notification--dropdown-text
+            commented on your answer about 5 hours ago
     %li= link_to "Show all Notifications", notifications_path
\ No newline at end of file

From 45e08651aff0bbd37ada8535ff7c1f6e3c88beb8 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 26 Jan 2015 17:33:40 +0100
Subject: [PATCH 027/231] fixed some more stuff

---
 app/assets/stylesheets/scss/notifications.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/notifications.scss b/app/assets/stylesheets/scss/notifications.scss
index 58055060..2c1b3c4c 100644
--- a/app/assets/stylesheets/scss/notifications.scss
+++ b/app/assets/stylesheets/scss/notifications.scss
@@ -32,10 +32,11 @@
 .notification--dropdown-user, .notification--dropdown-text {
   margin-bottom: 0px;
   overflow: hidden;
+  line-height: 1.3em;
 }
 
 .notification--dropdown-user {
-  margin-top: 3px;
+  margin-top: 0px;
 }
 
 .notification--dropdown-img {

From c8b02bbf509cea181f42ef7f624640d21a497338 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 26 Jan 2015 17:50:45 +0100
Subject: [PATCH 028/231] actually add some code here

---
 app/views/layouts/_notifications.html.haml | 94 +++++++++++++---------
 1 file changed, 56 insertions(+), 38 deletions(-)

diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml
index 7f6ab534..43c58e4c 100644
--- a/app/views/layouts/_notifications.html.haml
+++ b/app/views/layouts/_notifications.html.haml
@@ -1,43 +1,61 @@
-= nav_entry "Notifications", notifications_path, badge: notification_count
+.visible-xs= nav_entry "Notifications", notifications_path, badge: notification_count
+- notifications = Notification.for(current_user).limit(4)
 %li.dropdown.hidden-xs
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
     Notifications
     %span.badge= notification_count
   %ul.dropdown-menu.notification--dropdown
-    %li
-      .media.notification--dropdown-media
-        .pull-left
-          %img.img-rounded.notification--dropdown-img
-        .media-body
-          %h6.media-heading.notification--dropdown-user
-            username
-          .notification--dropdown-text
-            followed you 33 minutes ago
-    %li
-      .media.notification--dropdown-media
-        .pull-left
-          %img.img-rounded.notification--dropdown-img
-        .media-body
-          %h6.media-heading.notification--dropdown-user
-            username
-          .notification--dropdown-text
-            smiled at your answer about 1 hour ago
-    %li
-      .media.notification--dropdown-media
-        .pull-left
-          %img.img-rounded.notification--dropdown-img
-        .media-body
-          %h6.media-heading.notification--dropdown-user
-            username
-          .notification--dropdown-text
-            answered your question about 4 hours ago
-    %li
-      .media.notification--dropdown-media
-        .pull-left
-          %img.img-rounded.notification--dropdown-img
-        .media-body
-          %h6.media-heading.notification--dropdown-user
-            username
-          .notification--dropdown-text
-            commented on your answer about 5 hours ago
-    %li= link_to "Show all Notifications", notifications_path
\ No newline at end of file
+    - if notifications.count == 0
+      %p New notifications will appear here.
+    - else
+      - notifications.each do |notification|
+        %li{class: (notification.new? ? 'list-group-item-warning' : '')}
+          .media.notification--dropdown-media
+            - case notification.target_type
+              - when "Answer"
+                .pull-left
+                  %img.img-rounded.notification--dropdown-img{src: gravatar_url(notification.target.user)}
+                .media-body
+                  %h6.media-heading.notification--dropdown-user
+                    = user_screen_name notification.target.user
+                  .notification--dropdown-text
+                    answered
+                    %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.id), title: "#{notification.target.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
+                      your question
+                    = time_ago_in_words notification.target.created_at
+                    ago
+              - when "Relationship"
+                .pull-left
+                  %img.img-rounded.notification--dropdown-img{src: gravatar_url(notification.target.source)}
+                .media-body
+                  %h6.media-heading.notification--dropdown-user
+                    = user_screen_name notification.target.source
+                  .notification--dropdown-text
+                    followed you
+                    = time_ago_in_words notification.target.created_at
+                    ago
+              - when "Smile"
+                .pull-left
+                  %img.img-rounded.notification--dropdown-img{src: gravatar_url(notification.target.user)}
+                .media-body
+                  %h6.media-heading.notification--dropdown-user
+                    = user_screen_name notification.target.user
+                  .notification--dropdown-text
+                    smiled at
+                    %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id), title: "#{notification.target.answer.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
+                      your answer
+                    = time_ago_in_words notification.target.created_at
+                    ago
+              - when "Comment"
+                .pull-left
+                  %img.img-rounded.notification--dropdown-img{src: gravatar_url(notification.target.user)}
+                .media-body
+                  %h6.media-heading.notification--dropdown-user
+                    = user_screen_name notification.target.user
+                  .notification--dropdown-text
+                    commented on
+                    %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id), title: "#{notification.target.answer.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
+                      your answer
+                    = time_ago_in_words notification.target.created_at
+                    ago
+    %li= link_to "Show all notifications#{" and mark them as read" if notifications.pluck(:new).any?}", notifications_path
\ No newline at end of file

From 13bdbaa430acab1148059692fb1b18a7e8ab2980 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 26 Jan 2015 17:53:23 +0100
Subject: [PATCH 029/231] centred the "New notifications will appear here" text
 and also fixed class for notifications entry on navbar

---
 app/views/layouts/_notifications.html.haml | 4 ++--
 spec/features/users/inbox_spec.rb          | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml
index 43c58e4c..b29c8f98 100644
--- a/app/views/layouts/_notifications.html.haml
+++ b/app/views/layouts/_notifications.html.haml
@@ -1,4 +1,4 @@
-.visible-xs= nav_entry "Notifications", notifications_path, badge: notification_count
+= nav_entry "Notifications", notifications_path, badge: notification_count, class: 'visible-xs'
 - notifications = Notification.for(current_user).limit(4)
 %li.dropdown.hidden-xs
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
@@ -6,7 +6,7 @@
     %span.badge= notification_count
   %ul.dropdown-menu.notification--dropdown
     - if notifications.count == 0
-      %p New notifications will appear here.
+      %li.centre.text-muted New notifications will appear here.
     - else
       - notifications.each do |notification|
         %li{class: (notification.new? ? 'list-group-item-warning' : '')}
diff --git a/spec/features/users/inbox_spec.rb b/spec/features/users/inbox_spec.rb
index 2dd96409..e6da518e 100644
--- a/spec/features/users/inbox_spec.rb
+++ b/spec/features/users/inbox_spec.rb
@@ -60,7 +60,6 @@ feature "Inbox", :devise do
     page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
   end
 
-=begin
   # Scenario: User deletes a question
   #   Given I am signed in
   #   When I visit the inbox
@@ -84,7 +83,7 @@ feature "Inbox", :devise do
     page.find('.sweet-alert').click_button 'Delete'
     wait_for_ajax
 
-    visit root_path
+    login_as me, scope: :user
     visit inbox_path
     expect(page).not_to have_text(question.content)
     page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
@@ -111,14 +110,14 @@ feature "Inbox", :devise do
     expect(page).to have_text('Really delete 5 questions?')
     page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true
 
-    # this apparently doesn't get triggered :(
     page.find('.sweet-alert').click_button 'Delete'
     wait_for_ajax
 
-    visit root_path
+    puts me.inbox.all
+
+    login_as me, scope: :user
     visit inbox_path
     page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
     expect(page).not_to have_text('Answer'.upcase)
   end
-=end
 end

From 174ea6b774c612ae0074274ae663d067cfa7fbd6 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 26 Jan 2015 17:55:18 +0100
Subject: [PATCH 030/231] changed display of notification badge

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index d520c913..bd865d2f 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -3,7 +3,7 @@
   background-color: $navbar-inverse-link-active-bg;
 }
 
-.navbar .nav .active .badge {
+.navbar .nav .active .badge, .dropdown .open .badge {
   padding: 3px 6px 3px;
   background-color: $navbar-inverse-bg;
 }

From 2b1c10933286a7a551fbbf0e8c1497e73846c92e Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 26 Jan 2015 17:55:58 +0100
Subject: [PATCH 031/231] fucking

---
 spec/features/users/inbox_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/features/users/inbox_spec.rb b/spec/features/users/inbox_spec.rb
index e6da518e..01f51740 100644
--- a/spec/features/users/inbox_spec.rb
+++ b/spec/features/users/inbox_spec.rb
@@ -60,6 +60,7 @@ feature "Inbox", :devise do
     page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
   end
 
+=begin
   # Scenario: User deletes a question
   #   Given I am signed in
   #   When I visit the inbox
@@ -120,4 +121,5 @@ feature "Inbox", :devise do
     page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
     expect(page).not_to have_text('Answer'.upcase)
   end
+=end
 end

From f7e71d3d676e364051c0180941d9dd234e27fdfc Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 26 Jan 2015 18:04:17 +0100
Subject: [PATCH 032/231] how about this selector?

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index bd865d2f..daa4c796 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -3,7 +3,7 @@
   background-color: $navbar-inverse-link-active-bg;
 }
 
-.navbar .nav .active .badge, .dropdown .open .badge {
+.navbar .nav .active .badge, li.dropdown.open a.dropdown-toggle span.badge {
   padding: 3px 6px 3px;
   background-color: $navbar-inverse-bg;
 }

From 4e4925846305dff3b590ee73dfe6d45ec40c413d Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 26 Jan 2015 18:08:03 +0100
Subject: [PATCH 033/231] removed annoying margin, ready to merge [ci skip]

---
 app/assets/stylesheets/scss/notifications.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/scss/notifications.scss b/app/assets/stylesheets/scss/notifications.scss
index 2c1b3c4c..8f09001d 100644
--- a/app/assets/stylesheets/scss/notifications.scss
+++ b/app/assets/stylesheets/scss/notifications.scss
@@ -23,6 +23,7 @@
 
 .notification--dropdown {
   min-width: 370px;
+  margin-top: 0px !important;
 }
 
 .notification--dropdown-media {

From 32956319d48d856c0eca4d26441bc5fc9333b2d7 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 26 Jan 2015 18:41:16 +0100
Subject: [PATCH 034/231] changed question-text line height

---
 app/assets/stylesheets/scss/answerbox.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/scss/answerbox.scss b/app/assets/stylesheets/scss/answerbox.scss
index 68facc5b..2cfb92b1 100644
--- a/app/assets/stylesheets/scss/answerbox.scss
+++ b/app/assets/stylesheets/scss/answerbox.scss
@@ -32,6 +32,10 @@
   line-height: 1.3em;
 }
 
+.answerbox--question-text {
+  line-height: 1.3em;
+}
+
 .answerbox--answer-date {
   font-size: 12px;
   line-height: 1.3em;

From b26ec1dd0b360063e57dae46c20d726575ab63e4 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Tue, 27 Jan 2015 17:51:39 +0100
Subject: [PATCH 035/231] fixed question generator not working if
 privacy_allow_anonymous_questions is false (GitHub issue #71)

---
 app/models/inbox.rb               |  2 +-
 spec/features/users/inbox_spec.rb | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 161e8c7c..0cea150b 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -3,7 +3,7 @@ class Inbox < ActiveRecord::Base
   belongs_to :question
 
   before_create do
-    raise "User does not want to receive anonymous questions" if self.question.author_is_anonymous and !self.user.privacy_allow_anonymous_questions?
+    raise "User does not want to receive anonymous questions" if self.question.author_is_anonymous and self.question.author_name != 'justask' and !self.user.privacy_allow_anonymous_questions?
   end
 
   def answer(answer_content, user)
diff --git a/spec/features/users/inbox_spec.rb b/spec/features/users/inbox_spec.rb
index 01f51740..19ba3581 100644
--- a/spec/features/users/inbox_spec.rb
+++ b/spec/features/users/inbox_spec.rb
@@ -60,6 +60,27 @@ feature "Inbox", :devise do
     page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
   end
 
+  # Scenario: User with privacy options generates new question
+  #   Given I am signed in
+  #   When I visit the inbox
+  #   And I click "Get new question"
+  #   And I don't want to receive questions by anonymous users
+  #   Then I get a new question
+  scenario 'user with privacy options generates new question', js: true do
+    me = FactoryGirl.create :user
+    me.privacy_allow_anonymous_questions = false
+    me.save
+
+    login_as me, scope: :user
+    visit inbox_path
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true
+
+    click_button "Get new question"
+    wait_for_ajax
+    expect(page).to have_text('Answer'.upcase)
+    page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_2.png"), full: true
+  end
+
 =begin
   # Scenario: User deletes a question
   #   Given I am signed in

From ca7789750af72448d911ecd9d721ae05af17e9a3 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Tue, 27 Jan 2015 17:53:05 +0100
Subject: [PATCH 036/231] made NProgress loading bar brighter (GitHub issue
 #73)

---
 app/assets/stylesheets/application.css.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 515ab0cc..8bf94e9c 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -51,6 +51,6 @@ body { padding-top: $navbar-height; }
 
 @import "font-awesome";
 
-$nprogress-color: darken($navbar-inverse-bg, 15%);
+$nprogress-color: lighten($navbar-inverse-bg, 25%);
 @import 'nprogress';
 @import 'nprogress-bootstrap';

From ddbff78926e329bf1d9b79eaa2fb7cccbc1a51e8 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 27 Jan 2015 18:13:24 +0100
Subject: [PATCH 037/231] add panel-footer to inbox panel

---
 app/views/inbox/_entry.html.haml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index fb65cce2..8acac5fa 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -23,8 +23,20 @@
       Answer
     %button.btn.btn-danger{name: 'ib-destroy', data: { ib_id: i.id }}
       Delete
-    - current_user.services.each do |service|
-      %label
-        %input{type: 'checkbox', name: 'ib-share', checked: :checked, data: { ib_id: i.id, service: service.provider }}
-        Post to
-        = service.provider.capitalize
\ No newline at end of file
+    %button.btn.btn-default
+      Options
+  .panel-footer
+    %h4 Sharing
+    - if @services.count > 0
+      .row
+      - current_user.services.each do |service|
+        .col-md-2.col-sm-4.col-xs-6
+          %label
+            %input{type: 'checkbox', name: 'ib-share', checked: :checked, data: { ib_id: i.id, service: service.provider }}
+            Post to
+            = service.provider.capitalize
+    - else
+      %p
+        You have not connected any services yet. Visit your
+        = link_to "service settings", services_path
+        to connect one.
\ No newline at end of file

From 9c2b0951bfcb2756a29053bf7afd817d514e5e5d Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 27 Jan 2015 18:25:20 +0100
Subject: [PATCH 038/231] add coffescript to expand options

---
 app/assets/javascripts/inbox.coffee | 15 +++++++++++++++
 app/views/inbox/_entry.html.haml    |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/inbox.coffee b/app/assets/javascripts/inbox.coffee
index 397fb515..50fabac3 100644
--- a/app/assets/javascripts/inbox.coffee
+++ b/app/assets/javascripts/inbox.coffee
@@ -121,3 +121,18 @@ $(document).on "click", "button[name=ib-destroy]", ->
       complete: (jqxhr, status) ->
         btn.button "reset"
         $("textarea[name=ib-answer][data-id=#{iid}]").removeAttr "readonly"
+
+# Toggle button
+$(document).on "click", "button[name=ib-options]", ->
+  btn = $(this)
+  ibid = btn[0].dataset.ib_id
+  state = btn[0].dataset.state
+  optionBox = $("#ib-options-#{ibid}")
+
+  switch state
+    when 'hidden'
+      optionBox.slideDown()
+      btn[0].dataset.state = 'shown'
+    when 'shown'
+      optionBox.slideUp()
+      btn[0].dataset.state = 'hidden'
\ No newline at end of file
diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 8acac5fa..6504a537 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -23,9 +23,9 @@
       Answer
     %button.btn.btn-danger{name: 'ib-destroy', data: { ib_id: i.id }}
       Delete
-    %button.btn.btn-default
+    %button.btn.btn-default{name: 'ib-options', data: { ib_id: i.id, state: :hidden }}
       Options
-  .panel-footer
+  .panel-footer{id: "ib-options-#{i.id}", style: 'display: none'}
     %h4 Sharing
     - if @services.count > 0
       .row

From a7fbc5b366f116fce8e31bf1979bb5352747e478 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Wed, 28 Jan 2015 06:49:17 +0100
Subject: [PATCH 039/231] fixed inbox entries and toggle button

---
 app/assets/javascripts/inbox.coffee | 3 ++-
 app/views/inbox/_entry.html.haml    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/inbox.coffee b/app/assets/javascripts/inbox.coffee
index 50fabac3..ff553e0b 100644
--- a/app/assets/javascripts/inbox.coffee
+++ b/app/assets/javascripts/inbox.coffee
@@ -122,10 +122,11 @@ $(document).on "click", "button[name=ib-destroy]", ->
         btn.button "reset"
         $("textarea[name=ib-answer][data-id=#{iid}]").removeAttr "readonly"
 
+
 # Toggle button
 $(document).on "click", "button[name=ib-options]", ->
   btn = $(this)
-  ibid = btn[0].dataset.ib_id
+  ibid = btn[0].dataset.ibId
   state = btn[0].dataset.state
   optionBox = $("#ib-options-#{ibid}")
 
diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 6504a537..2d55623c 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -24,10 +24,11 @@
     %button.btn.btn-danger{name: 'ib-destroy', data: { ib_id: i.id }}
       Delete
     %button.btn.btn-default{name: 'ib-options', data: { ib_id: i.id, state: :hidden }}
-      Options
+      %i.fa.fa-cog
+      %span.sr-only Options
   .panel-footer{id: "ib-options-#{i.id}", style: 'display: none'}
     %h4 Sharing
-    - if @services.count > 0
+    - if current_user.services.count > 0
       .row
       - current_user.services.each do |service|
         .col-md-2.col-sm-4.col-xs-6

From 0bf46a888fe00ad65f6002dcbca8faff1ed05f56 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 29 Jan 2015 16:45:58 +0100
Subject: [PATCH 040/231] added a new Markdown renderer (TwitteredMarkdown)
 which will be used for sharing to Twitter

---
 app/helpers/markdown_helper.rb     |  5 +++++
 app/models/services/twitter.rb     |  4 ++--
 app/services/twittered_markdown.rb | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 app/services/twittered_markdown.rb

diff --git a/app/helpers/markdown_helper.rb b/app/helpers/markdown_helper.rb
index b385f696..590956ce 100644
--- a/app/helpers/markdown_helper.rb
+++ b/app/helpers/markdown_helper.rb
@@ -9,4 +9,9 @@ module MarkdownHelper
     md = Redcarpet::Markdown.new(Redcarpet::Render::StripDown, MARKDOWN_OPTS)
     CGI.unescape_html(Sanitize.fragment(md.render(content), EVIL_TAGS)).strip
   end
+
+  def twitter_markdown(content)
+    md = Redcarpet::Markdown.new(TwitteredMarkdown, MARKDOWN_OPTS)
+    CGI.unescape_html(Sanitize.fragment(md.render(content), EVIL_TAGS)).strip
+  end
 end
\ No newline at end of file
diff --git a/app/models/services/twitter.rb b/app/models/services/twitter.rb
index bd3b6ca8..243536c7 100644
--- a/app/models/services/twitter.rb
+++ b/app/models/services/twitter.rb
@@ -28,8 +28,8 @@ class Services::Twitter < Service
 
     def prepare_tweet(answer)
       # TODO: improve this.
-      question_content = strip_markdown answer.question.content
-      answer_content = strip_markdown answer.content
+      question_content = twitter_markdown answer.question.content
+      answer_content = twitter_markdown answer.content
       answer_url = show_user_answer_url(
         id: answer.id,
         username: answer.user.screen_name,
diff --git a/app/services/twittered_markdown.rb b/app/services/twittered_markdown.rb
new file mode 100644
index 00000000..aeadf428
--- /dev/null
+++ b/app/services/twittered_markdown.rb
@@ -0,0 +1,23 @@
+class TwitteredMarkdown < Redcarpet::Render::StripDown
+
+  def preprocess(text)
+    wrap_mentions(text)
+  end
+
+  def wrap_mentions(text)
+    text.gsub! /(^|\s)@([a-zA-Z0-9_]{1,16})/ do
+      local_user = User.find_by_screen_name($2)
+      if local_user.nil?
+        "#{$1}#{$2}"
+      else
+        service = local_user.services.where(type: "Services::Twitter").first
+        if service.nil?
+          "#{$1}#{$2}"
+        else
+          "#{$1}@#{service.nickname}"
+        end
+      end
+    end
+    text
+  end
+end

From b3d81e18ab7832dda414e2562b6a73d0dc90edd2 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 30 Jan 2015 20:32:10 +0100
Subject: [PATCH 041/231] fix this shit

---
 app/views/inbox/_entry.html.haml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 2d55623c..ea6ff358 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -30,12 +30,12 @@
     %h4 Sharing
     - if current_user.services.count > 0
       .row
-      - current_user.services.each do |service|
-        .col-md-2.col-sm-4.col-xs-6
-          %label
-            %input{type: 'checkbox', name: 'ib-share', checked: :checked, data: { ib_id: i.id, service: service.provider }}
-            Post to
-            = service.provider.capitalize
+        - current_user.services.each do |service|
+          .col-md-2.col-sm-4.col-xs-6
+            %label
+              %input{type: 'checkbox', name: 'ib-share', checked: :checked, data: { ib_id: i.id, service: service.provider }}
+              Post to
+              = service.provider.capitalize
     - else
       %p
         You have not connected any services yet. Visit your

From caa6a06ab0c27aa98f7bc4963607909a3e754611 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 30 Jan 2015 20:34:28 +0100
Subject: [PATCH 042/231] small visual improvement

---
 app/views/inbox/_entry.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index ea6ff358..821daa36 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -31,7 +31,7 @@
     - if current_user.services.count > 0
       .row
         - current_user.services.each do |service|
-          .col-md-2.col-sm-4.col-xs-6
+          .col-md-3.col-sm-4.col-xs-6
             %label
               %input{type: 'checkbox', name: 'ib-share', checked: :checked, data: { ib_id: i.id, service: service.provider }}
               Post to

From 99c7aa8f86afb0bd961a93367f38b6c4a23bffd7 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 30 Jan 2015 22:46:44 +0100
Subject: [PATCH 043/231] add mobile navigation for lists and timelines

---
 app/views/group/index.html.haml        |  1 +
 app/views/public/index.html.haml       |  1 +
 app/views/shared/_sidebar.html.haml    |  2 +-
 app/views/static/_mobile-nav.html.haml | 14 ++++++++++++++
 app/views/static/index.html.haml       |  1 +
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/views/static/_mobile-nav.html.haml

diff --git a/app/views/group/index.html.haml b/app/views/group/index.html.haml
index d9f363bf..a4d167ff 100644
--- a/app/views/group/index.html.haml
+++ b/app/views/group/index.html.haml
@@ -1,3 +1,4 @@
+= render 'static/mobile-nav'
 .container.j2-page
   .col-md-3.col-sm-3
     = render 'shared/sidebar'
diff --git a/app/views/public/index.html.haml b/app/views/public/index.html.haml
index d9f363bf..a4d167ff 100644
--- a/app/views/public/index.html.haml
+++ b/app/views/public/index.html.haml
@@ -1,3 +1,4 @@
+= render 'static/mobile-nav'
 .container.j2-page
   .col-md-3.col-sm-3
     = render 'shared/sidebar'
diff --git a/app/views/shared/_sidebar.html.haml b/app/views/shared/_sidebar.html.haml
index 1fc18c9b..93f7ab4c 100644
--- a/app/views/shared/_sidebar.html.haml
+++ b/app/views/shared/_sidebar.html.haml
@@ -32,7 +32,7 @@
       .col-md-6.col-sm-6.col-xs-6
         %h4.entry-text#answered-count= current_user.smiled_count
         %h6.entry-subtext Smiles
-.panel.panel-default
+.panel.panel-default.hidden-xs
   .panel-body
     %ul.nav.nav-pills.nav-stacked
       = nav_entry "Timeline", root_path
diff --git a/app/views/static/_mobile-nav.html.haml b/app/views/static/_mobile-nav.html.haml
new file mode 100644
index 00000000..cedf46c2
--- /dev/null
+++ b/app/views/static/_mobile-nav.html.haml
@@ -0,0 +1,14 @@
+%nav.navbar.navbar-default.navbar-fixed-top.visible-xs{role: "navigation"}
+  .container
+    .navbar-header
+      %button.navbar-toggle{"data-target" => "#j2-tl-navbar-collapse", "data-toggle" => "collapse", type: "button"}
+        %span.sr-only Toggle navigation
+          %span.icon-bar
+          %span.icon-bar
+          %span.icon-bar
+      %a.navbar-brand{href: "/"} Timelines & Lists
+    #j2-tl-navbar-collapse.collapse.navbar-collapse
+      %ul.nav.navbar-nav
+        = nav_entry "Public", public_timeline_path
+        - current_user.groups.each do |group|
+          = nav_entry group.display_name, group_timeline_path(group.name)
diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index 14d88172..1102acdd 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -1,4 +1,5 @@
 - if user_signed_in?
+  = render 'static/mobile-nav'
   .container.j2-page
     .col-md-3.col-sm-3
       = render 'shared/sidebar'

From cac03fa31e808803b09da681c3f29f37f1c34700 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 30 Jan 2015 22:48:24 +0100
Subject: [PATCH 044/231] change fixed to static

---
 app/views/static/_mobile-nav.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/static/_mobile-nav.html.haml b/app/views/static/_mobile-nav.html.haml
index cedf46c2..4ab992a0 100644
--- a/app/views/static/_mobile-nav.html.haml
+++ b/app/views/static/_mobile-nav.html.haml
@@ -1,4 +1,4 @@
-%nav.navbar.navbar-default.navbar-fixed-top.visible-xs{role: "navigation"}
+%nav.navbar.navbar-default.navbar-static-top.visible-xs{role: "navigation"}
   .container
     .navbar-header
       %button.navbar-toggle{"data-target" => "#j2-tl-navbar-collapse", "data-toggle" => "collapse", type: "button"}

From 1c6533bb749bca4949d5bc89c9ca8d4b1e9fb00e Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 30 Jan 2015 22:48:38 +0100
Subject: [PATCH 045/231] change text

---
 app/views/static/_mobile-nav.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/static/_mobile-nav.html.haml b/app/views/static/_mobile-nav.html.haml
index 4ab992a0..643b9379 100644
--- a/app/views/static/_mobile-nav.html.haml
+++ b/app/views/static/_mobile-nav.html.haml
@@ -6,7 +6,7 @@
           %span.icon-bar
           %span.icon-bar
           %span.icon-bar
-      %a.navbar-brand{href: "/"} Timelines & Lists
+      %a.navbar-brand{href: "/"} Timelines
     #j2-tl-navbar-collapse.collapse.navbar-collapse
       %ul.nav.navbar-nav
         = nav_entry "Public", public_timeline_path

From bde9f395735c01c7580028901998fdf4433088e8 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Fri, 30 Jan 2015 22:52:05 +0100
Subject: [PATCH 046/231] fixed mobile navbar thing [ci skip]

---
 .../static/{_mobile-nav.html.haml => _mobile_nav.html.haml} | 6 +++---
 app/views/static/index.html.haml                            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename app/views/static/{_mobile-nav.html.haml => _mobile_nav.html.haml} (88%)

diff --git a/app/views/static/_mobile-nav.html.haml b/app/views/static/_mobile_nav.html.haml
similarity index 88%
rename from app/views/static/_mobile-nav.html.haml
rename to app/views/static/_mobile_nav.html.haml
index 643b9379..1bffbf09 100644
--- a/app/views/static/_mobile-nav.html.haml
+++ b/app/views/static/_mobile_nav.html.haml
@@ -3,9 +3,9 @@
     .navbar-header
       %button.navbar-toggle{"data-target" => "#j2-tl-navbar-collapse", "data-toggle" => "collapse", type: "button"}
         %span.sr-only Toggle navigation
-          %span.icon-bar
-          %span.icon-bar
-          %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
       %a.navbar-brand{href: "/"} Timelines
     #j2-tl-navbar-collapse.collapse.navbar-collapse
       %ul.nav.navbar-nav
diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index 1102acdd..cf67d51e 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -1,5 +1,5 @@
 - if user_signed_in?
-  = render 'static/mobile-nav'
+  = render 'static/mobile_nav'
   .container.j2-page
     .col-md-3.col-sm-3
       = render 'shared/sidebar'
@@ -17,4 +17,4 @@
           Load more
   .visible-xs= render 'shared/links'
 - else
-  = render 'static/front'
\ No newline at end of file
+  = render 'static/front'

From bca0344792a5364713d0c4ed0d8ff9d891b48433 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 30 Jan 2015 22:53:44 +0100
Subject: [PATCH 047/231] remove margin from navbar

---
 app/assets/stylesheets/base.css.scss   | 4 ++++
 app/views/static/_mobile_nav.html.haml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 6ce16f9b..48897a05 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -96,4 +96,8 @@ body {
 .j2-delete {
   color: $brand-danger;
   text-decoration: none;
+}
+
+.j2-navbar {
+  margin-bottom: 0px;
 }
\ No newline at end of file
diff --git a/app/views/static/_mobile_nav.html.haml b/app/views/static/_mobile_nav.html.haml
index 1bffbf09..24304d95 100644
--- a/app/views/static/_mobile_nav.html.haml
+++ b/app/views/static/_mobile_nav.html.haml
@@ -1,4 +1,4 @@
-%nav.navbar.navbar-default.navbar-static-top.visible-xs{role: "navigation"}
+%nav.navbar.navbar-default.navbar-static-top.j2-navbar.visible-xs{role: "navigation"}
   .container
     .navbar-header
       %button.navbar-toggle{"data-target" => "#j2-tl-navbar-collapse", "data-toggle" => "collapse", type: "button"}

From 393b92e0018e8c5988237fcd30681133ecd7bbe0 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Fri, 30 Jan 2015 22:55:29 +0100
Subject: [PATCH 048/231] =?UTF-8?q?=E2=80=A6=20[ci=20skip]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/group/index.html.haml  | 2 +-
 app/views/public/index.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/group/index.html.haml b/app/views/group/index.html.haml
index a4d167ff..070fff40 100644
--- a/app/views/group/index.html.haml
+++ b/app/views/group/index.html.haml
@@ -1,4 +1,4 @@
-= render 'static/mobile-nav'
+= render 'static/mobile_nav'
 .container.j2-page
   .col-md-3.col-sm-3
     = render 'shared/sidebar'
diff --git a/app/views/public/index.html.haml b/app/views/public/index.html.haml
index a4d167ff..070fff40 100644
--- a/app/views/public/index.html.haml
+++ b/app/views/public/index.html.haml
@@ -1,4 +1,4 @@
-= render 'static/mobile-nav'
+= render 'static/mobile_nav'
 .container.j2-page
   .col-md-3.col-sm-3
     = render 'shared/sidebar'

From 030e6ac6a67b33ab6fb84d3782ce595d85ab56da Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sat, 31 Jan 2015 00:47:28 +0100
Subject: [PATCH 049/231] add notification navbar

---
 .../notifications/_notification_nav.html.haml    | 16 ++++++++++++++++
 .../notifications/_notification_tabs.html.haml   |  2 +-
 app/views/notifications/index.html.haml          |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/views/notifications/_notification_nav.html.haml

diff --git a/app/views/notifications/_notification_nav.html.haml b/app/views/notifications/_notification_nav.html.haml
new file mode 100644
index 00000000..a2513801
--- /dev/null
+++ b/app/views/notifications/_notification_nav.html.haml
@@ -0,0 +1,16 @@
+%nav.navbar.navbar-default.navbar-static-top.j2-navbar.visible-xs{role: "navigation"}
+  .container
+    .navbar-header
+      %button.navbar-toggle{"data-target" => "#j2-tl-navbar-collapse", "data-toggle" => "collapse", type: "button"}
+        %span.sr-only Toggle navigation
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+      %a.navbar-brand{href: "/"} Notifications
+    #j2-tl-navbar-collapse.collapse.navbar-collapse
+      %ul.nav.navbar-nav
+        = nav_entry "All notifications", notifications_path
+        = nav_entry "Answers", notifications_path('answer')
+        = nav_entry "Smiles", notifications_path('smile')
+        = nav_entry "Comments", notifications_path('comment')
+        = nav_entry "Followers", notifications_path('relationship')
\ No newline at end of file
diff --git a/app/views/notifications/_notification_tabs.html.haml b/app/views/notifications/_notification_tabs.html.haml
index 4bb01b43..16f73e5d 100644
--- a/app/views/notifications/_notification_tabs.html.haml
+++ b/app/views/notifications/_notification_tabs.html.haml
@@ -1,5 +1,5 @@
 .col-md-3.col-xs-12.col-sm-3
-  .panel.panel-default
+  .panel.panel-default.hidden-xs
     .panel-body
       %ul.nav.nav-pills.nav-stacked
         = nav_entry "All notifications", notifications_path
diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index f394a2bd..4b12b4b4 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -1,3 +1,4 @@
+= render 'notifications/notification_nav'
 .container.j2-page
   = render 'notification_tabs'
   .col-md-9.col-xs-12.col-sm-9

From 9cb21d2458a86b6f5a6a33e8f7fa133fa20666db Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sat, 31 Jan 2015 00:49:31 +0100
Subject: [PATCH 050/231] add moderation navbar navbar

---
 app/views/moderation/_moderation_nav.html.haml  | 16 ++++++++++++++++
 app/views/moderation/_moderation_tabs.html.haml |  2 +-
 app/views/moderation/index.html.haml            |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 app/views/moderation/_moderation_nav.html.haml

diff --git a/app/views/moderation/_moderation_nav.html.haml b/app/views/moderation/_moderation_nav.html.haml
new file mode 100644
index 00000000..f33f013a
--- /dev/null
+++ b/app/views/moderation/_moderation_nav.html.haml
@@ -0,0 +1,16 @@
+%nav.navbar.navbar-default.navbar-static-top.j2-navbar.visible-xs{role: "navigation"}
+  .container
+    .navbar-header
+      %button.navbar-toggle{"data-target" => "#j2-tl-navbar-collapse", "data-toggle" => "collapse", type: "button"}
+        %span.sr-only Toggle navigation
+        %span.icon-bar
+        %span.icon-bar
+        %span.icon-bar
+      %a.navbar-brand{href: "/"} Moderation
+    #j2-tl-navbar-collapse.collapse.navbar-collapse
+      %ul.nav.navbar-nav
+        = nav_entry "All reports", moderation_path
+        = nav_entry "Answers",     moderation_path('answer')
+        = nav_entry "Comments",    moderation_path('comment')
+        = nav_entry "Users",       moderation_path('user')
+        = nav_entry "Questions",   moderation_path('question')
\ No newline at end of file
diff --git a/app/views/moderation/_moderation_tabs.html.haml b/app/views/moderation/_moderation_tabs.html.haml
index 05d93880..cb75096a 100644
--- a/app/views/moderation/_moderation_tabs.html.haml
+++ b/app/views/moderation/_moderation_tabs.html.haml
@@ -1,5 +1,5 @@
 .col-md-3.col-sm-3.col-xs-12
-  .panel.panel-default
+  .panel.panel-default.hidden-xs
     .panel-body
       %ul.nav.nav-pills.nav-stacked
         = nav_entry "All reports", moderation_path
diff --git a/app/views/moderation/index.html.haml b/app/views/moderation/index.html.haml
index a2407e94..5fb59763 100644
--- a/app/views/moderation/index.html.haml
+++ b/app/views/moderation/index.html.haml
@@ -1,3 +1,4 @@
+= render 'moderation/moderation_nav'
 .container.j2-page
   .row
     = render 'moderation/moderation_tabs'

From cff278793ec79856938d7961b739e1d4986b63f2 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sat, 31 Jan 2015 16:20:07 +0100
Subject: [PATCH 051/231] update timeline design

---
 app/views/shared/_sidebar.html.haml | 36 +++++++++++------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/app/views/shared/_sidebar.html.haml b/app/views/shared/_sidebar.html.haml
index 93f7ab4c..34018942 100644
--- a/app/views/shared/_sidebar.html.haml
+++ b/app/views/shared/_sidebar.html.haml
@@ -1,14 +1,18 @@
 .panel.panel-default.hidden-xs
+  %img.profile--avatar{src: current_user.profile_picture.url(:large)}
+  - unless inbox_count.nil?
+    .profile--panel-badge.panel-badge-info
+      %i.fa.fa-envelope
+      = pluralize(inbox_count, 'new question')
   .panel-body
-    %p
-      Welcome,
-      = current_user.screen_name
-    - unless inbox_count.nil?
-      %p
-        %strong
-          You have
-          = pluralize(inbox_count, 'new question')
-          in your inbox!
+    - if current_user.display_name.blank?
+      .profile--displayname
+        = current_user.screen_name
+    - else
+      .profile--displayname
+        = current_user.display_name
+      .profile--username
+        = current_user.screen_name
     .row
       %a{href: show_user_followers_path(current_user.screen_name)}
         .col-md-6.col-sm-6.col-xs-6
@@ -18,20 +22,6 @@
         .col-md-6.col-sm-6.col-xs-6
           %h4.entry-text#friend-count= current_user.friend_count
           %h6.entry-subtext Following
-    .row
-      .col-md-6.col-sm-6.col-xs-6
-        %h4.entry-text#asked-count= current_user.asked_count
-        %h6.entry-subtext Questions
-      .col-md-6.col-sm-6.col-xs-6
-        %h4.entry-text#answered-count= current_user.answered_count
-        %h6.entry-subtext Answers
-    .row
-      .col-md-6.col-sm-6.col-xs-6
-        %h4.entry-text#asked-count= current_user.commented_count
-        %h6.entry-subtext Comments
-      .col-md-6.col-sm-6.col-xs-6
-        %h4.entry-text#answered-count= current_user.smiled_count
-        %h6.entry-subtext Smiles
 .panel.panel-default.hidden-xs
   .panel-body
     %ul.nav.nav-pills.nav-stacked

From d1ed602353b0887e0b0d63d9ed27c361d67c6d2b Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sat, 31 Jan 2015 16:26:22 +0100
Subject: [PATCH 052/231] update test

---
 spec/features/users/inbox_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/users/inbox_spec.rb b/spec/features/users/inbox_spec.rb
index 19ba3581..9b9a99ed 100644
--- a/spec/features/users/inbox_spec.rb
+++ b/spec/features/users/inbox_spec.rb
@@ -24,7 +24,7 @@ feature "Inbox", :devise do
 
     login_as me, scope: :user
     visit root_path
-    expect(page).to have_text('1 new question')
+    expect(page).to have_text('1 new question'.upcase)
     page.driver.render Rails.root.join("tmp/#{Time.now.to_i}_1.png"), full: true
 
     click_link "Inbox"

From d09b8554d3f46bb114fb3da94f3c00f5b73eaa17 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sun, 1 Feb 2015 20:07:52 +0100
Subject: [PATCH 053/231] update placeholders

---
 app/views/user/edit.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/user/edit.html.haml b/app/views/user/edit.html.haml
index bd2540c7..f5d6af9c 100644
--- a/app/views/user/edit.html.haml
+++ b/app/views/user/edit.html.haml
@@ -27,11 +27,11 @@
 
           = f.text_field :motivation_header, label: "Motivation header", placeholder: 'Ask me anything!'
 
-          = f.text_field :website, label: "Website", placeholder: 'http://bad-dragon.com'
+          = f.text_field :website, label: "Website", placeholder: 'http://example.com'
 
-          = f.text_field :location, label: "Location", placeholder: 'Germoney'
+          = f.text_field :location, label: "Location", placeholder: 'Where are you?'
 
-          = f.text_area :bio, label: "Bio", placeholder: 'In Bio war ich nie gut x--DD'
+          = f.text_area :bio, label: "Bio", placeholder: 'Tell us something nice about you!'
 
           - for attrib in %i(crop_x crop_y crop_w crop_h)
             = f.hidden_field attrib, id: attrib

From 8882360e4b94e7ed5ae2b1072142e739743352be Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 2 Feb 2015 16:09:52 +0100
Subject: [PATCH 054/231] added 'search' to the list of forbidden user names
 [ci skip]

---
 app/validators/screen_name_validator.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/validators/screen_name_validator.rb b/app/validators/screen_name_validator.rb
index 3633c4b1..87375ddb 100644
--- a/app/validators/screen_name_validator.rb
+++ b/app/validators/screen_name_validator.rb
@@ -2,11 +2,11 @@ class ScreenNameValidator < ActiveModel::EachValidator
   FORBIDDEN_SCREEN_NAMES = %w(justask_admin retrospring_admin admin justask retrospring support about public
                               notifications inbox sign_in sign_up sidekiq moderation moderator mod administrator
                               siteadmin site_admin help retro_spring retroospring retrosprlng niisding nllsding
-                              group settings)
+                              group settings search pixeidesu plxeldesu plxeidesu)
 
   def validate_each(record, attribute, value)
     if FORBIDDEN_SCREEN_NAMES.include? value.downcase
       record.errors[attribute] << "Thou shalt not use this username!  Please choose another one."
     end
   end
-end
\ No newline at end of file
+end

From 3bf92f43f059670ef37e160b1d43f469edb234f4 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 3 Feb 2015 14:55:36 +0100
Subject: [PATCH 055/231] remove support from validator

---
 app/validators/screen_name_validator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/validators/screen_name_validator.rb b/app/validators/screen_name_validator.rb
index 3633c4b1..7b9d81de 100644
--- a/app/validators/screen_name_validator.rb
+++ b/app/validators/screen_name_validator.rb
@@ -1,5 +1,5 @@
 class ScreenNameValidator < ActiveModel::EachValidator
-  FORBIDDEN_SCREEN_NAMES = %w(justask_admin retrospring_admin admin justask retrospring support about public
+  FORBIDDEN_SCREEN_NAMES = %w(justask_admin retrospring_admin admin justask retrospring about public
                               notifications inbox sign_in sign_up sidekiq moderation moderator mod administrator
                               siteadmin site_admin help retro_spring retroospring retrosprlng niisding nllsding
                               group settings)

From 17f1c8f09156a482f708d413ed25e485f80ab5c8 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Tue, 3 Feb 2015 17:13:50 +0100
Subject: [PATCH 056/231] added user privileges modal

---
 app/views/user/_actions.html.haml             | 10 +++++++-
 app/views/user/_modal_privileges.html.haml    | 23 +++++++++++++++++++
 .../user/_modal_privileges_item.html.haml     |  9 ++++++++
 app/views/user/show.html.haml                 |  2 ++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 app/views/user/_modal_privileges.html.haml
 create mode 100644 app/views/user/_modal_privileges_item.html.haml

diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml
index b2b211e0..99114397 100644
--- a/app/views/user/_actions.html.haml
+++ b/app/views/user/_actions.html.haml
@@ -27,4 +27,12 @@
         %li
           %a{href: '#', data: { action: 'report-user', target: user.screen_name }}
             %i.fa.fa-exclamation-triangle
-            Report
\ No newline at end of file
+            Report
+        - if current_user.mod?
+          %li
+            %a{href: '#', data: { target: "#modal-privileges", toggle: :modal }}
+              %i.fa.fa-paw
+              Check
+              = succeed "'s" do
+                = user.screen_name
+              privileges
\ No newline at end of file
diff --git a/app/views/user/_modal_privileges.html.haml b/app/views/user/_modal_privileges.html.haml
new file mode 100644
index 00000000..a9104dbe
--- /dev/null
+++ b/app/views/user/_modal_privileges.html.haml
@@ -0,0 +1,23 @@
+#modal-privileges.modal.fade{"aria-hidden" => "true", "aria-labelledby" => "modal-privileges-label", :role => "dialog", :tabindex => "-1"}
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{"data-dismiss" => "modal", :type => "button"}
+          %span{"aria-hidden" => "true"} ×
+          %span.sr-only Close
+        %h4#modal-privileges-label.modal-title
+          Check
+          = succeed "'s" do
+            = @user.screen_name
+          privileges
+      .modal-body
+        %ul.list-group.groups--list
+          - unless @user.admin?
+            = render 'user/modal_privileges_item', privilege: 'banned', description: 'Hit the user with ye olde banhammer', user: @user
+          = render 'user/modal_privileges_item', privilege: 'blogger', description: 'The user gets that privilege if they blogged something (nice) about Retrospring.', user: @user
+          - if current_user.admin?
+            = render 'user/modal_privileges_item', privilege: 'supporter', description: 'oy vey muh shekels', user: @user
+            = render 'user/modal_privileges_item', privilege: 'moderator', user: @user
+            = render 'user/modal_privileges_item', privilege: 'admin', user: @user
+      .modal-footer
+        %button.btn.btn-primary{name: 'checked-privileges', type: :button, data: { dismiss: :modal }} Done
\ No newline at end of file
diff --git a/app/views/user/_modal_privileges_item.html.haml b/app/views/user/_modal_privileges_item.html.haml
new file mode 100644
index 00000000..799b2892
--- /dev/null
+++ b/app/views/user/_modal_privileges_item.html.haml
@@ -0,0 +1,9 @@
+- description ||= ''
+%li.list-group-item{id: "privilege-#{privilege}"}
+  .media
+    .pull-left.j2-table
+      %input.input--center{type: :checkbox, name: 'check-your-privileges', data: { type: privilege, user: user.screen_name }, checked: user.send("#{privilege}?"), autocomplete: 'off'}
+    .media-body
+      .list-group-item-heading= privilege.capitalize
+      - unless description.blank?
+        .list-group-item-text.text-muted.j2-up= description
\ No newline at end of file
diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index 087ecc93..a655c57d 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -17,3 +17,5 @@
   .visible-xs= render 'shared/links'
 - if user_signed_in?
   = render 'user/modal_group_memberships'
+  - if current_user.mod? and @user != current_user
+    = render 'user/modal_privileges'
\ No newline at end of file

From 96f4a9433f1b2dfb550f7176db162bd97aaa73c5 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Tue, 3 Feb 2015 17:31:04 +0100
Subject: [PATCH 057/231] moderation javascripts now only get loaded if the
 current_user is a moderator or above

---
 app/assets/javascripts/application.js.erb.coffee | 15 ++++++++++++++-
 app/assets/javascripts/moderation.js.erb.coffee  |  1 +
 app/views/layouts/application.html.haml          |  3 +++
 config/initializers/assets.rb                    |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/moderation.js.erb.coffee

diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee
index 5842510d..f34b63c9 100644
--- a/app/assets/javascripts/application.js.erb.coffee
+++ b/app/assets/javascripts/application.js.erb.coffee
@@ -9,7 +9,20 @@
 #= require cheet
 #= require jquery.guillotine
 #= require sweet-alert
-#= require_tree .
+# local requires to be seen by everyone:
+#= require_tree ./answerbox
+#= require_tree ./questionbox
+#= require groups
+#= require inbox
+#= require memes
+#= require notifications
+#= require pagination
+#= require piwik
+#= require question
+#= require settings
+#= require user
+# not required:
+# _tree ./moderation
 
 NProgress.configure
   showSpinner: false
diff --git a/app/assets/javascripts/moderation.js.erb.coffee b/app/assets/javascripts/moderation.js.erb.coffee
new file mode 100644
index 00000000..5a8a1551
--- /dev/null
+++ b/app/assets/javascripts/moderation.js.erb.coffee
@@ -0,0 +1 @@
+#= require_tree ./moderation
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 807074a4..8fd481eb 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -15,6 +15,9 @@
     %title= APP_CONFIG['site_name']
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    - if user_signed_in?
+      - if current_user.mod?
+        = javascript_include_tag 'moderation', 'data-turbolinks-track' => true
     = csrf_meta_tags
   %body
     = render 'layouts/header'
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index d2f4ec33..1f4fa74b 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( moderation.js )

From 06cc52ffc5e22efeaddf52f106254782d6c0bf6c Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Tue, 3 Feb 2015 17:48:30 +0100
Subject: [PATCH 058/231] made these checkboxes work

---
 .../javascripts/moderation/privileges.coffee  | 24 ++++++++++++++
 app/controllers/ajax/moderation_controller.rb | 33 +++++++++++++++++++
 .../ajax/moderation/privilege.json.jbuilder   |  2 ++
 config/routes.rb                              |  3 +-
 4 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/moderation/privileges.coffee
 create mode 100644 app/views/ajax/moderation/privilege.json.jbuilder

diff --git a/app/assets/javascripts/moderation/privileges.coffee b/app/assets/javascripts/moderation/privileges.coffee
new file mode 100644
index 00000000..6f676851
--- /dev/null
+++ b/app/assets/javascripts/moderation/privileges.coffee
@@ -0,0 +1,24 @@
+($ document).on "click", "input[type=checkbox][name=check-your-privileges]", ->
+  box = $(this)
+  box.attr 'disabled', 'disabled'
+
+  privType = box[0].dataset.type
+  boxChecked = box[0].checked
+
+  $.ajax
+    url: '/ajax/mod/privilege'
+    type: 'POST'
+    data:
+      user: box[0].dataset.user
+      type: privType
+      status: boxChecked
+    success: (data, status, jqxhr) ->
+      if data.success
+        box[0].checked = if data.checked? then data.checked else !boxChecked
+      showNotification data.message, data.success
+    error: (jqxhr, status, error) ->
+      box[0].checked = false
+      console.log jqxhr, status, error
+      showNotification "An error occurred, a developer should check the console for details", false
+    complete: (jqxhr, status) ->
+      box.removeAttr "disabled"
\ No newline at end of file
diff --git a/app/controllers/ajax/moderation_controller.rb b/app/controllers/ajax/moderation_controller.rb
index 32f6895c..2a635651 100644
--- a/app/controllers/ajax/moderation_controller.rb
+++ b/app/controllers/ajax/moderation_controller.rb
@@ -104,4 +104,37 @@ class Ajax::ModerationController < ApplicationController
     @message = "Successfully deleted comment."
     @success = true
   end
+
+  def privilege
+    @status = :err
+    @success = false
+
+    params.require :user
+    params.require :type
+    params.require :status
+
+    status = params[:status] == 'true'
+
+    target_user = User.find_by_screen_name(params[:user])
+
+    @message = "nope!"
+    return unless %w(banned blogger supporter moderator admin).include? params[:type].downcase
+
+    if (%w(supporter moderator admin).include?(params[:type].downcase) and !current_user.admin?) or
+      (params[:type].downcase == 'banned' and target_user.admin?)
+      @status = :nopriv
+      @message = "You'd better check YOUR privileges first!"
+      @success = false
+      return
+    end
+
+    @checked = status
+    target_user.send("#{params[:type]}=", status)
+    target_user.save!
+
+    @message = "Successfully checked this user's #{params[:type]} privilege."
+
+    @status = :okay
+    @success = true
+  end
 end
diff --git a/app/views/ajax/moderation/privilege.json.jbuilder b/app/views/ajax/moderation/privilege.json.jbuilder
new file mode 100644
index 00000000..707cf362
--- /dev/null
+++ b/app/views/ajax/moderation/privilege.json.jbuilder
@@ -0,0 +1,2 @@
+json.partial! 'ajax/shared/status'
+json.checked @checked
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 3c2e6050..a8e6fa97 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,7 +12,7 @@ Rails.application.routes.draw do
 
   # Moderation panel
   constraints ->(req) { req.env['warden'].authenticate?(scope: :user) &&
-                       (req.env['warden'].user.admin? or req.env['warden'].user.moderator?) } do
+                       (req.env['warden'].user.mod?) } do
     match '/moderation(/:type)', to: 'moderation#index', via: :get, as: :moderation, defaults: {type: 'all'}
     namespace :ajax do
       match '/mod/destroy_report', to: 'moderation#destroy_report', via: :post, as: :mod_destroy_report
@@ -20,6 +20,7 @@ Rails.application.routes.draw do
       match '/mod/destroy_comment', to: 'moderation#destroy_comment', via: :post, as: :mod_destroy_comment
       match '/mod/create_vote', to: 'moderation#vote', via: :post, as: :mod_create_vote
       match '/mod/destroy_vote', to: 'moderation#destroy_vote', via: :post, as: :mod_destroy_vote
+      match '/mod/privilege', to: 'moderation#privilege', via: :post, as: :mod_privilege
     end
   end
 

From 26cd72ba2ea43d805dd055759829f62c8467d8ce Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 3 Feb 2015 18:10:14 +0100
Subject: [PATCH 059/231] update modal

---
 app/views/user/_modal_privileges.html.haml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/views/user/_modal_privileges.html.haml b/app/views/user/_modal_privileges.html.haml
index a9104dbe..561a1fd9 100644
--- a/app/views/user/_modal_privileges.html.haml
+++ b/app/views/user/_modal_privileges.html.haml
@@ -10,14 +10,13 @@
           = succeed "'s" do
             = @user.screen_name
           privileges
-      .modal-body
-        %ul.list-group.groups--list
-          - unless @user.admin?
-            = render 'user/modal_privileges_item', privilege: 'banned', description: 'Hit the user with ye olde banhammer', user: @user
-          = render 'user/modal_privileges_item', privilege: 'blogger', description: 'The user gets that privilege if they blogged something (nice) about Retrospring.', user: @user
-          - if current_user.admin?
-            = render 'user/modal_privileges_item', privilege: 'supporter', description: 'oy vey muh shekels', user: @user
-            = render 'user/modal_privileges_item', privilege: 'moderator', user: @user
-            = render 'user/modal_privileges_item', privilege: 'admin', user: @user
+      %ul.list-group.groups--list
+        - unless @user.admin?
+          = render 'user/modal_privileges_item', privilege: 'banned', description: 'Hit the user with ye olde banhammer', user: @user
+        = render 'user/modal_privileges_item', privilege: 'blogger', description: 'The user gets that privilege if they blogged something (nice) about Retrospring.', user: @user
+        - if current_user.admin?
+          = render 'user/modal_privileges_item', privilege: 'supporter', description: 'This user supports the site with money', user: @user
+          = render 'user/modal_privileges_item', privilege: 'moderator', description: 'Someone trustworthy enough to help managing reports',user: @user
+          = render 'user/modal_privileges_item', privilege: 'admin', description: 'This user is part of the core team', user: @user
       .modal-footer
         %button.btn.btn-primary{name: 'checked-privileges', type: :button, data: { dismiss: :modal }} Done
\ No newline at end of file

From 66607a1eae6377a559a6f85a95bad675c5a6960f Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 3 Feb 2015 18:22:01 +0100
Subject: [PATCH 060/231] update modal

---
 app/views/user/_actions.html.haml          | 2 +-
 app/views/user/_modal_privileges.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml
index 99114397..6ed47740 100644
--- a/app/views/user/_actions.html.haml
+++ b/app/views/user/_actions.html.haml
@@ -31,7 +31,7 @@
         - if current_user.mod?
           %li
             %a{href: '#', data: { target: "#modal-privileges", toggle: :modal }}
-              %i.fa.fa-paw
+              %i.fa.fa-wrench
               Check
               = succeed "'s" do
                 = user.screen_name
diff --git a/app/views/user/_modal_privileges.html.haml b/app/views/user/_modal_privileges.html.haml
index 561a1fd9..9e1a041b 100644
--- a/app/views/user/_modal_privileges.html.haml
+++ b/app/views/user/_modal_privileges.html.haml
@@ -15,7 +15,7 @@
           = render 'user/modal_privileges_item', privilege: 'banned', description: 'Hit the user with ye olde banhammer', user: @user
         = render 'user/modal_privileges_item', privilege: 'blogger', description: 'The user gets that privilege if they blogged something (nice) about Retrospring.', user: @user
         - if current_user.admin?
-          = render 'user/modal_privileges_item', privilege: 'supporter', description: 'This user supports the site with money', user: @user
+          = render 'user/modal_privileges_item', privilege: 'supporter', description: 'This user monetarily supports the site', user: @user
           = render 'user/modal_privileges_item', privilege: 'moderator', description: 'Someone trustworthy enough to help managing reports',user: @user
           = render 'user/modal_privileges_item', privilege: 'admin', description: 'This user is part of the core team', user: @user
       .modal-footer

From cde8d8a30fe4a75fa984d55ec78ffd5acd7ed001 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 5 Feb 2015 15:17:15 +0100
Subject: [PATCH 061/231] remove padding on specific rows on mobile devices

---
 app/assets/stylesheets/base.css.scss | 7 +++++++
 app/views/static/index.html.haml     | 2 +-
 app/views/user/show.html.haml        | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 48897a05..ac7d4c73 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -100,4 +100,11 @@ body {
 
 .j2-navbar {
   margin-bottom: 0px;
+}
+
+@media (max-width: $screen-xs-max) {
+  .j2-col-reset {
+    padding-left: 0px;
+    padding-right: 0px;
+  }
 }
\ No newline at end of file
diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index cf67d51e..a3e2f94b 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -3,7 +3,7 @@
   .container.j2-page
     .col-md-3.col-sm-3
       = render 'shared/sidebar'
-    .col-md-9.col-xs-12.col-sm-9
+    .col-md-9.col-xs-12.col-sm-9.j2-col-reset
       = render 'layouts/messages'
 
       #timeline
diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index a655c57d..53401652 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -1,9 +1,9 @@
 .profile--header
 .container.j2-page
-  .col-md-3.col-xs-12.col-sm-4
+  .col-md-3.col-xs-12.col-sm-4.j2-col-reset
     = render 'user/profile_info'
     .hidden-xs= render 'shared/links'
-  .col-md-9.col-xs-12.col-sm-8
+  .col-md-9.col-xs-12.col-sm-8.j2-col-reset
     = render 'shared/questionbox'
     #answers
       - @answers.each do |a|

From 46d8769b922fc692e3334f06ec7ace071a42067c Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 5 Feb 2015 15:20:41 +0100
Subject: [PATCH 062/231] remove padding on even more pages

---
 app/views/group/index.html.haml      | 2 +-
 app/views/user/questions.html.haml   | 4 ++--
 app/views/user/show_follow.html.haml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/group/index.html.haml b/app/views/group/index.html.haml
index 070fff40..bb0a7648 100644
--- a/app/views/group/index.html.haml
+++ b/app/views/group/index.html.haml
@@ -2,7 +2,7 @@
 .container.j2-page
   .col-md-3.col-sm-3
     = render 'shared/sidebar'
-  .col-md-9.col-xs-12.col-sm-9
+  .col-md-9.col-xs-12.col-sm-9.j2-col-reset
     = render 'layouts/messages'
 
     #timeline
diff --git a/app/views/user/questions.html.haml b/app/views/user/questions.html.haml
index e1ce1c30..f5e4262e 100644
--- a/app/views/user/questions.html.haml
+++ b/app/views/user/questions.html.haml
@@ -1,9 +1,9 @@
 .profile--header
 .container.j2-page
-  .col-md-3.col-xs-12.col-sm-4
+  .col-md-3.col-xs-12.col-sm-4.j2-col-reset
     = render 'user/profile_info'
     .hidden-xs= render 'shared/links'
-  .col-md-9.col-xs-12.col-sm-8
+  .col-md-9.col-xs-12.col-sm-8.j2-col-reset
     %h1.j2-lh.hidden-xs= @title
     %h1.visible-xs= @title
     #questions
diff --git a/app/views/user/show_follow.html.haml b/app/views/user/show_follow.html.haml
index 54899d40..83f526da 100644
--- a/app/views/user/show_follow.html.haml
+++ b/app/views/user/show_follow.html.haml
@@ -1,9 +1,9 @@
 .profile--header
 .container.j2-page
-  .col-md-3.col-xs-12.col-sm-4
+  .col-md-3.col-xs-12.col-sm-4.j2-col-reset
     = render 'user/profile_info'
     .hidden-xs= render 'shared/links'
-  .col-md-9.col-xs-12.col-sm-8
+  .col-md-9.col-xs-12.col-sm-8.j2-col-reset
     %h1.j2-lh.hidden-xs= @title
     %h1.visible-xs= @title
     #users

From 85507607724134226c6572e296b5cebf6d9384dc Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sun, 8 Feb 2015 00:59:07 +0100
Subject: [PATCH 063/231] add inbox sidebar

---
 app/views/inbox/_sidebar.html.haml | 20 ++++++++++++++++++++
 app/views/inbox/show.html.haml     | 25 ++++---------------------
 2 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 app/views/inbox/_sidebar.html.haml

diff --git a/app/views/inbox/_sidebar.html.haml b/app/views/inbox/_sidebar.html.haml
new file mode 100644
index 00000000..27bd7a2c
--- /dev/null
+++ b/app/views/inbox/_sidebar.html.haml
@@ -0,0 +1,20 @@
+.panel.panel-default.inbox--panel
+  .panel-heading
+    %h3.panel-title Out of questions?
+  .panel-body
+    %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question
+  .panel.panel-default.inbox--panel
+    .panel-heading
+      %h3.panel-title Share
+    .panel-body
+      %a.btn.btn-block.btn-primary{target: '_blank', href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"}
+        %i.fa.fa-twitter
+        Share on Twitter
+      %a.btn.btn-block.btn-primary{target: '_blank', href: "http://www.tumblr.com/share/link?url=#{show_user_profile_url(current_user.screen_name)}&name=Ask%20me%20anything%21"}
+        %i.fa.fa-tumblr
+        Share on Tumblr
+  .panel.panel-default.warning--panel
+    .panel-heading
+      %h3.panel-title Actions
+    .panel-body
+      %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil), data: { ib_count: @inbox.count }} Delete all questions
\ No newline at end of file
diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml
index 31c95187..0d9098b2 100644
--- a/app/views/inbox/show.html.haml
+++ b/app/views/inbox/show.html.haml
@@ -1,26 +1,7 @@
 .container.j2-page
   .row
-    .col-md-3.col-xs-12.col-sm-3
-      .panel.panel-default.inbox--panel
-        .panel-heading
-          %h3.panel-title Out of questions?
-        .panel-body
-          %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question
-      .panel.panel-default.inbox--panel
-        .panel-heading
-          %h3.panel-title Share
-        .panel-body
-          %a.btn.btn-block.btn-primary{target: '_blank', href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"}
-            %i.fa.fa-twitter
-            Share on Twitter
-          %a.btn.btn-block.btn-primary{target: '_blank', href: "http://www.tumblr.com/share/link?url=#{show_user_profile_url(current_user.screen_name)}&name=Ask%20me%20anything%21"}
-            %i.fa.fa-tumblr
-            Share on Tumblr
-      .panel.panel-default.warning--panel
-        .panel-heading
-          %h3.panel-title Actions
-        .panel-body
-          %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil), data: { ib_count: @inbox.count }} Delete all questions
+    .col-md-3.col-xs-12.col-sm-3.hidden-xs
+      = render 'inbox/sidebar'
     .col-md-9.col-xs-12.col-sm-9
       = render 'layouts/messages'
       #entries
@@ -30,6 +11,8 @@
         - if @inbox.empty?
 
           Nothing to see here.
+    .col-md-9.col-xs-12.col-sm-9.visible-xs
+      = render 'inbox/sidebar'
 
 = render "shared/links"
 - @inbox.update_all(new: false)
\ No newline at end of file

From 3c6221eb1e03e826b5375671f67eb377cf4c92ea Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sun, 8 Feb 2015 02:54:57 +0100
Subject: [PATCH 064/231] indentation got fucked up here

---
 app/views/inbox/_sidebar.html.haml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/inbox/_sidebar.html.haml b/app/views/inbox/_sidebar.html.haml
index 27bd7a2c..c9629caf 100644
--- a/app/views/inbox/_sidebar.html.haml
+++ b/app/views/inbox/_sidebar.html.haml
@@ -3,18 +3,18 @@
     %h3.panel-title Out of questions?
   .panel-body
     %button.btn.btn-block.btn-info{type: :button, id: 'ib-generate-question'} Get new question
-  .panel.panel-default.inbox--panel
-    .panel-heading
-      %h3.panel-title Share
-    .panel-body
-      %a.btn.btn-block.btn-primary{target: '_blank', href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"}
-        %i.fa.fa-twitter
-        Share on Twitter
-      %a.btn.btn-block.btn-primary{target: '_blank', href: "http://www.tumblr.com/share/link?url=#{show_user_profile_url(current_user.screen_name)}&name=Ask%20me%20anything%21"}
-        %i.fa.fa-tumblr
-        Share on Tumblr
-  .panel.panel-default.warning--panel
-    .panel-heading
-      %h3.panel-title Actions
-    .panel-body
-      %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil), data: { ib_count: @inbox.count }} Delete all questions
\ No newline at end of file
+.panel.panel-default.inbox--panel
+  .panel-heading
+    %h3.panel-title Share
+  .panel-body
+    %a.btn.btn-block.btn-primary{target: '_blank', href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"}
+      %i.fa.fa-twitter
+      Share on Twitter
+    %a.btn.btn-block.btn-primary{target: '_blank', href: "http://www.tumblr.com/share/link?url=#{show_user_profile_url(current_user.screen_name)}&name=Ask%20me%20anything%21"}
+      %i.fa.fa-tumblr
+      Share on Tumblr
+.panel.panel-default.warning--panel
+  .panel-heading
+    %h3.panel-title Actions
+  .panel-body
+    %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil), data: { ib_count: @inbox.count }} Delete all questions
\ No newline at end of file

From 192c0a0931790856a3516e6450eeddaa397f4d71 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 9 Feb 2015 16:43:05 +0100
Subject: [PATCH 065/231] update ask button in navbar

---
 app/views/layouts/_header.html.haml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index a3835231..8bdf40d0 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -25,10 +25,12 @@
           = render "layouts/notifications"
         %ul.nav.navbar-nav.navbar-right
           %li
-            .btn.btn-primary.navbar-btn.btn-sm.hidden-xs{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
-              %i.fa.fa-pencil-square-o
+            %span{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"}
+              .btn.btn-link.navbar-btn.btn-sm.hidden-xs{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
+                %i.fa.fa-pencil-square-o
           %li.dropdown
             %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
+              %img.img-rounded.answerbox--img-small.hidden-xs{src: current_user.profile_picture.url(:small)}
               = current_user.screen_name
               %b.caret
             %ul.dropdown-menu

From 6ac227fd3192100a45efe46d4ee1c99f5dc4f633 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 9 Feb 2015 16:43:48 +0100
Subject: [PATCH 066/231] hide entire list item, not just the button

---
 app/views/layouts/_header.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 8bdf40d0..29c30086 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -24,9 +24,9 @@
           = nav_entry "Inbox", "/inbox", badge: inbox_count
           = render "layouts/notifications"
         %ul.nav.navbar-nav.navbar-right
-          %li
+          %li.hidden-xs
             %span{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"}
-              .btn.btn-link.navbar-btn.btn-sm.hidden-xs{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
+              .btn.btn-link.navbar-btn.btn-sm{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
                 %i.fa.fa-pencil-square-o
           %li.dropdown
             %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}

From 7e12a1c77a90021c0bda354a766d420eb9fe1587 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 9 Feb 2015 16:48:31 +0100
Subject: [PATCH 067/231] update notification display

---
 app/views/layouts/_header.html.haml        | 2 +-
 app/views/layouts/_notifications.html.haml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 29c30086..fca1ff72 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -22,8 +22,8 @@
         %ul.nav.navbar-nav
           = nav_entry "Timeline", root_path
           = nav_entry "Inbox", "/inbox", badge: inbox_count
-          = render "layouts/notifications"
         %ul.nav.navbar-nav.navbar-right
+          = render "layouts/notifications"
           %li.hidden-xs
             %span{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"}
               .btn.btn-link.navbar-btn.btn-sm{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml
index b29c8f98..7c272aa4 100644
--- a/app/views/layouts/_notifications.html.haml
+++ b/app/views/layouts/_notifications.html.haml
@@ -2,7 +2,11 @@
 - notifications = Notification.for(current_user).limit(4)
 %li.dropdown.hidden-xs
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
-    Notifications
+    - if notification_count.nil?
+      %i.fa.fa-bell-o
+    - else
+      %i.fa.fa-bell
+    %span.sr-only Notifications
     %span.badge= notification_count
   %ul.dropdown-menu.notification--dropdown
     - if notifications.count == 0

From ddbb7e63c87ee2ec508fd5c3e75803998dbe82ba Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 9 Feb 2015 17:39:34 +0100
Subject: [PATCH 068/231] remove small size for asking button

---
 app/views/layouts/_header.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index fca1ff72..97a3075e 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -26,7 +26,7 @@
           = render "layouts/notifications"
           %li.hidden-xs
             %span{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"}
-              .btn.btn-link.navbar-btn.btn-sm{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
+              .btn.btn-link.navbar-btn{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
                 %i.fa.fa-pencil-square-o
           %li.dropdown
             %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}

From 87cfff8809198f8c000153c48cbf04b78d95906c Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 9 Feb 2015 19:58:58 +0100
Subject: [PATCH 069/231] try to fix buggy tooltip

---
 app/views/layouts/_header.html.haml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 97a3075e..6bfaf658 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -24,10 +24,9 @@
           = nav_entry "Inbox", "/inbox", badge: inbox_count
         %ul.nav.navbar-nav.navbar-right
           = render "layouts/notifications"
-          %li.hidden-xs
-            %span{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"}
-              .btn.btn-link.navbar-btn{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
-                %i.fa.fa-pencil-square-o
+          %li.hidden-xs{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"}
+            .btn.btn-link.navbar-btn{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
+              %i.fa.fa-pencil-square-o
           %li.dropdown
             %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
               %img.img-rounded.answerbox--img-small.hidden-xs{src: current_user.profile_picture.url(:small)}

From 31d8e687252db38340ce7767b874bebbc8979323 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Tue, 10 Feb 2015 06:53:50 +0100
Subject: [PATCH 070/231] automatically mark notifications as read

---
 app/controllers/answer_controller.rb | 18 ++++++++++++++++++
 app/controllers/user_controller.rb   |  9 +++++++++
 2 files changed, 27 insertions(+)

diff --git a/app/controllers/answer_controller.rb b/app/controllers/answer_controller.rb
index 8a2734a0..4c8bd73e 100644
--- a/app/controllers/answer_controller.rb
+++ b/app/controllers/answer_controller.rb
@@ -2,5 +2,23 @@ class AnswerController < ApplicationController
   def show
     @answer = Answer.find(params[:id])
     @display_all = true
+
+    if user_signed_in?
+      notif = Notification.where(target_type: "Answer", target_id: @answer.id, recipient_id: current_user.id, new: true).first
+      unless notif.nil?
+        notif.new = false
+        notif.save
+      end
+      notif = Notification.where(target_type: "Comment", target_id: @answer.comments.pluck(:id), recipient_id: current_user.id, new: true).first
+      unless notif.nil?
+        notif.new = false
+        notif.save
+      end
+      notif = Notification.where(target_type: "Smile", target_id: @answer.smiles.pluck(:id), recipient_id: current_user.id, new: true).first
+      unless notif.nil?
+        notif.new = false
+        notif.save
+      end
+    end
   end
 end
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 25957157..4667e2b0 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -4,6 +4,15 @@ class UserController < ApplicationController
   def show
     @user = User.where('LOWER(screen_name) = ?', params[:username].downcase).first!
     @answers = @user.answers.reverse_order.paginate(page: params[:page])
+
+    if user_signed_in?
+      notif = Notification.where(target_type: "Relationship", target_id: @user.active_relationships.where(target_id: current_user.id).pluck(:id), recipient_id: current_user.id, new: true).first
+      unless notif.nil?
+        notif.new = false
+        notif.save
+      end
+    end
+
     respond_to do |format|
       format.html
       format.js

From e51b525fd5eb62e350e6633ef9eafbf3d419136a Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Tue, 10 Feb 2015 07:04:49 +0100
Subject: [PATCH 071/231] use :created_at for order

---
 app/models/notification.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index d14f5ece..d93e6821 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -4,7 +4,7 @@ class Notification < ActiveRecord::Base
 
   class << self
     def for(recipient, options={})
-      self.where(options.merge!(recipient: recipient)).order(:updated_at).reverse_order
+      self.where(options.merge!(recipient: recipient)).order(:created_at).reverse_order
     end
 
     def notify(recipient, target)

From c6864133d482515daecbdb05c555ca00527adb9d Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 10 Feb 2015 21:36:37 +0100
Subject: [PATCH 072/231] update terms/policy a bit

---
 app/views/static/privacy_policy.html.haml |  2 +-
 app/views/static/terms.html.haml          | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
index b0b13cc3..2b9706f0 100644
--- a/app/views/static/privacy_policy.html.haml
+++ b/app/views/static/privacy_policy.html.haml
@@ -25,4 +25,4 @@
       %h2 Our Policy Towards Children
       %p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
       %p
-        %em Effective: 18th January 2015
\ No newline at end of file
+        %em Effective: the time we will actually publish it plus some days
\ No newline at end of file
diff --git a/app/views/static/terms.html.haml b/app/views/static/terms.html.haml
index 6bf19eb6..892ab4a5 100644
--- a/app/views/static/terms.html.haml
+++ b/app/views/static/terms.html.haml
@@ -2,7 +2,7 @@
   .panel.panel-default
     .panel-body
       %h1 Terms of Use
-      %p These Terms of Service ("Terms") govern your access to and use of the services (the "Services" or “Retrospring”), and any  information, text, graphics, photos or other materials uploaded,  downloaded or appearing on the Services (collectively referred to as "Content").  Your access to and use of the Services are conditioned on your  acceptance of and compliance with these Terms. By accessing or using the  Services you agree to be bound by these Terms.
+      %p These Terms of Service ("Terms") as declared by the company (referred to as "Staff") govern your access to and use of the services (the "Services" or “Retrospring”), and any  information, text, graphics, photos or other materials uploaded,  downloaded or appearing on the Services (collectively referred to as "Content").  Your access to and use of the Services are conditioned on your  acceptance of and compliance with these Terms. By accessing or using the  Services you agree to be bound by these Terms.
       %h2 1. Basic Terms
       %p You are responsible for your use of the Services, for any Content you  post to the Services, and for any consequences thereof. The Content you  submit, post, or display will be able to be viewed by other users of the Services and through third party services and websites (go to the account settings page to control who sees your Content). You should only provide Content  that you are comfortable sharing with others under these Terms.
       %p You may use the Services only if you can form a binding contract with Retrospring and are not a person barred from receiving services under the  laws of any applicable jurisdiction.  If you are  accepting these Terms and using the Services on behalf of a company,  organization, government, or other legal entity, you represent and  warrant that you are authorized to do so. You may use the Services only  in compliance with these Terms and all applicable local, state,  national, and international laws, rules and regulations.
@@ -11,17 +11,18 @@
         Any information that you provide to Retrospring is subject to our
         = link_to "Privacy Policy", privacy_policy_path
         ,  which governs our collection and use of your information. You  understand that through your use of the Services you consent to the  collection and use (as set forth in the Privacy Policy) of this  information. As part of providing you the Services, we may need to provide you with  certain communications, such as service announcements and administrative  messages. These communications are considered part of the Services and  your Retrospring account, which you may not be able to opt-out from  receiving.
-      %h2 3. Passwords
-      %p You are responsible for safeguarding the password that you use to  access the Services and for any activities or actions under your  password. We encourage you to use "strong" passwords (passwords that use  a combination of upper and lower case letters, numbers and symbols)  with your account. Retrospring cannot and will not be liable for any loss or  damage arising from your failure to comply with the above.
-      %h2 4. Content on the Services
-      %p All Content, whether publicly posted or privately transmitted, is the  sole responsibility of the person who originated such Content. We may  not monitor or control the Content posted via the Services and, we  cannot take responsibility for such Content. Any use or reliance on any  Content or materials posted via the Services or obtained by you through  the Services is at your own risk.
-      %p We do not endorse, support, represent or guarantee the completeness,  truthfulness, accuracy, or reliability of any Content or communications  posted via the Services or endorse any opinions expressed via the  Services. You understand that by using the Services, you may be exposed  to Content that might be offensive, harmful, inaccurate or otherwise  inappropriate, or in some cases, postings that have been mislabeled or  are otherwise deceptive. Under no circumstances will Retrospring be liable  in any way for any Content, including, but not limited to, any errors or  omissions in any Content, or any loss or damage of any kind incurred as  a result of the use of any Content posted, emailed, transmitted or  otherwise made available via the Services or broadcast elsewhere.
-      %h2 5. Your Rights
-      %p You retain your rights to any Content you submit, post or display on or through the Services.
-      %h2 6. Restrictions on Content and Use of the Services
+      %h2 3. Conducts
+      %p All Content, whether publicly posted or privately transmitted, is the sole responsibility of the person who originated such Content. We may not monitor or control the Content posted via the Services and, we  cannot take responsibility for such Content. Any use or reliance on any Content or materials posted via the Services or obtained by you through the Services is at your own risk.
+      %p We do not endorse, support, represent or guarantee the completeness,  truthfulness, accuracy, or reliability of any Content or communications  posted via the Services or endorse any opinions expressed via the  Services excluding official information represented by the "Staff" of the Services.. You understand that by using the Services, you may be exposed  to Content that might be offensive, harmful, inaccurate or otherwise  inappropriate, or in some cases, postings that have been mislabeled or  are otherwise deceptive. Under no circumstances will Retrospring be liable  in any way for any Content, including, but not limited to, any errors or  omissions in any Content, or any loss or damage of any kind incurred as  a result of the use of any Content posted, emailed, transmitted or  otherwise made available via the Services or broadcast elsewhere.
+      %h2 4. Limitation of Liability
+      %p Retrospring makes no guarantee of availability of service and reserves the right to change, withdraw, suspend, or discontinue any functionality or feature of Retrospring's services. In no event shall Retrospring be liable for any damages whatsoever. This includes direct, indirect, incidental, special, consequential, or punitive damages arising out of the use of or inability to use Retrospring's services or any content thereon.
+      %h2 5. Restrictions on Content and Use of the Services
       %p We reserve the right at all times (but will not have an obligation) to remove or refuse to distribute any Content on the Services, to suspend  or terminate users, and to reclaim usernames without liability to you.   We also reserve the right to access, read, preserve, and disclose any  information as we reasonably believe is necessary to satisfy any  applicable law, regulation, legal process or governmental request, enforce the Terms, including investigation of potential violations  hereof, detect, prevent, or otherwise address fraud, security or  technical issues, respond to user support requests, or protect  the rights, property or safety of Retrospring, its users and the public.
-      %h2 9. Copyright Policy
+      %h2 6. Maintenance
+      %p Retrospring may perform maintenance services at any time. You acknowledge that such maintenance may require downtime, and contents or features on Retrospring may not load during this time as well as client functionality being disabled.
+      %p Retrospring requires occasional maintenances to improve, resolve, or update our service. These maintenances can take time, and can result in time without client functionality. We are not responsible for any loss of profile information or any other Content posted on the Service in these times.
+      %h2 7. Copyright Policy
       %p Retrospring respects the intellectual property rights of others and  expects users of the Services to do the same. We will respond to notices  of alleged copyright infringement that comply with applicable law and  are properly provided to us. If you believe that your Content has been  copied in a way that constitutes copyright infringement, please provide  us with the following information: a physical or electronic  signature of the copyright owner or a person authorized to act on their  behalf; identification of the copyrighted work claimed to have been  infringed; identification of the material that is claimed to be  infringing or to be the subject of infringing activity and that is to be  removed or access to which is to be disabled, and information  reasonably sufficient to permit us to locate the material; your  contact information, including your address, telephone number, and an  email address; a statement by you that you have a good faith belief  that use of the material in the manner complained of is not authorized  by the copyright owner, its agent, or the law; and a statement that  the information in the notification is accurate, and, under penalty of  perjury, that you are authorized to act on behalf of the copyright  owner.
       %p We reserve the right to remove Content alleged to be infringing  without prior notice, at our sole discretion, and without liability to  you. In appropriate circumstances, Retrospring will also terminate a user’s  account if the user is determined to be a repeat infringer.
       %p
-        %em Effective: 18th January 2015
\ No newline at end of file
+        %em Effective: the time we will actually publish it plus some days
\ No newline at end of file

From 5e9d455a2f335707799f6aae5d8be2a6a23c9bfe Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 10 Feb 2015 22:08:00 +0100
Subject: [PATCH 073/231] typo

---
 app/views/static/terms.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/static/terms.html.haml b/app/views/static/terms.html.haml
index 892ab4a5..036621c7 100644
--- a/app/views/static/terms.html.haml
+++ b/app/views/static/terms.html.haml
@@ -13,7 +13,7 @@
         ,  which governs our collection and use of your information. You  understand that through your use of the Services you consent to the  collection and use (as set forth in the Privacy Policy) of this  information. As part of providing you the Services, we may need to provide you with  certain communications, such as service announcements and administrative  messages. These communications are considered part of the Services and  your Retrospring account, which you may not be able to opt-out from  receiving.
       %h2 3. Conducts
       %p All Content, whether publicly posted or privately transmitted, is the sole responsibility of the person who originated such Content. We may not monitor or control the Content posted via the Services and, we  cannot take responsibility for such Content. Any use or reliance on any Content or materials posted via the Services or obtained by you through the Services is at your own risk.
-      %p We do not endorse, support, represent or guarantee the completeness,  truthfulness, accuracy, or reliability of any Content or communications  posted via the Services or endorse any opinions expressed via the  Services excluding official information represented by the "Staff" of the Services.. You understand that by using the Services, you may be exposed  to Content that might be offensive, harmful, inaccurate or otherwise  inappropriate, or in some cases, postings that have been mislabeled or  are otherwise deceptive. Under no circumstances will Retrospring be liable  in any way for any Content, including, but not limited to, any errors or  omissions in any Content, or any loss or damage of any kind incurred as  a result of the use of any Content posted, emailed, transmitted or  otherwise made available via the Services or broadcast elsewhere.
+      %p We do not endorse, support, represent or guarantee the completeness,  truthfulness, accuracy, or reliability of any Content or communications  posted via the Services or endorse any opinions expressed via the  Services excluding official information represented by the "Staff" of the Services. You understand that by using the Services, you may be exposed  to Content that might be offensive, harmful, inaccurate or otherwise  inappropriate, or in some cases, postings that have been mislabeled or  are otherwise deceptive. Under no circumstances will Retrospring be liable  in any way for any Content, including, but not limited to, any errors or  omissions in any Content, or any loss or damage of any kind incurred as  a result of the use of any Content posted, emailed, transmitted or  otherwise made available via the Services or broadcast elsewhere.
       %h2 4. Limitation of Liability
       %p Retrospring makes no guarantee of availability of service and reserves the right to change, withdraw, suspend, or discontinue any functionality or feature of Retrospring's services. In no event shall Retrospring be liable for any damages whatsoever. This includes direct, indirect, incidental, special, consequential, or punitive damages arising out of the use of or inability to use Retrospring's services or any content thereon.
       %h2 5. Restrictions on Content and Use of the Services

From cb13903493eea69dca7d51575d7224793e337186 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 15:57:05 +0100
Subject: [PATCH 074/231] update moderator display

---
 app/assets/stylesheets/base.css.scss | 8 ++++++++
 app/views/static/about.html.haml     | 6 ++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index ac7d4c73..98fa582d 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -68,6 +68,14 @@ body {
   list-style: none;
 }
 
+.about--moderator a {
+  text-decoration: none;
+}
+
+.about--moderator a:hover {
+  text-decoration: none;
+}
+
 .j2-up {
   text-transform: uppercase;
 }
diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index b8abc228..4ae341ab 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -42,10 +42,8 @@
           that look after you!
           %ul.about--moderator
             - User.where(moderator: true).each do |mod|
-              %li
-                %a{href: show_user_profile_path(mod.screen_name)}
-                  %img.answerbox--img-small{src: User.find_by_screen_name(mod.screen_name).profile_picture.url(:medium)}
-                = mod.screen_name
+              %a{href: show_user_profile_path(mod.screen_name), title: mod.screen_name, data: { toggle: :tooltip, placement: :top }}
+                %img.img-rounded.answerbox--img-small{src: mod.profile_picture.url(:small)}
     .col-sm-4
       .panel.panel-default
         .panel-body

From 0dfbac0bda70921524ab6f9b4eecba8a83282812 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 16:37:07 +0100
Subject: [PATCH 075/231] update profile dropdown, first draft

---
 app/assets/stylesheets/scss/navbar.scss | 16 ++++++++++++++
 app/views/layouts/_header.html.haml     | 17 +--------------
 app/views/layouts/_profile.html.haml    | 29 +++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 app/views/layouts/_profile.html.haml

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index daa4c796..afd4a8fc 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -84,4 +84,20 @@
   margin-right: 7px;
   margin-bottom: 7px;
   z-index: 99;
+}
+
+.profile--dropdown {
+  min-width: 220px;
+  margin-top: 0px !important;
+}
+
+.profile--dropdown-media {
+  padding: 3px 5px;
+}
+
+.profile--dropdown-img {
+  min-height: 45px;
+  min-width: 45px;
+  height: 45px;
+  width: 45px;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 6bfaf658..dbacfbe9 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -27,22 +27,7 @@
           %li.hidden-xs{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"}
             .btn.btn-link.navbar-btn{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
               %i.fa.fa-pencil-square-o
-          %li.dropdown
-            %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
-              %img.img-rounded.answerbox--img-small.hidden-xs{src: current_user.profile_picture.url(:small)}
-              = current_user.screen_name
-              %b.caret
-            %ul.dropdown-menu
-              %li= link_to "View profile", show_user_profile_path(current_user.screen_name)
-              %li= link_to "Settings", edit_user_registration_path
-              %li.divider
-              - if current_user.admin?
-                %li= link_to "Kontrollzentrum", rails_admin_path
-                %li= link_to "Sidekiq", sidekiq_web_path
-              - if current_user.mod?
-                %li= link_to "Moderation panel", moderation_path
-                %li.divider
-              %li= link_to "Logout",  destroy_user_session_path, method: :delete
+          = render "layouts/profile"
       - else
         %ul.nav.navbar-nav.navbar-right
           = nav_entry "Sign in", new_user_session_path
diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
new file mode 100644
index 00000000..82eb0860
--- /dev/null
+++ b/app/views/layouts/_profile.html.haml
@@ -0,0 +1,29 @@
+%li.dropdown
+  %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
+    %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
+    %span.visible-xs= current_user.screen_name
+    %b.caret
+  %ul.dropdown-menu.profile--dropdown
+    %li.hidden-xs
+      .media.profile--dropdown-media
+        .pull-left
+          %img.img-rounded.profile--dropdown-img{src: current_user.profile_picture.url(:medium)}
+        .media-body
+          - if @user.display_name.blank?
+            .profile--displayname
+              = @user.screen_name
+          - else
+            .profile--displayname
+              = @user.display_name
+            .profile--username
+              = @user.screen_name
+    %li= link_to "View profile", show_user_profile_path(current_user.screen_name)
+    %li= link_to "Settings", edit_user_registration_path
+    %li.divider
+    - if current_user.admin?
+      %li= link_to "Kontrollzentrum", rails_admin_path
+      %li= link_to "Sidekiq", sidekiq_web_path
+    - if current_user.mod?
+      %li= link_to "Moderation panel", moderation_path
+      %li.divider
+    %li= link_to "Logout",  destroy_user_session_path, method: :delete
\ No newline at end of file

From 55a4278c34452ef5c40387cdfa26b7c078cf2666 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 16:39:28 +0100
Subject: [PATCH 076/231] copycat failures

---
 app/views/layouts/_profile.html.haml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index 82eb0860..7a396a54 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -9,14 +9,14 @@
         .pull-left
           %img.img-rounded.profile--dropdown-img{src: current_user.profile_picture.url(:medium)}
         .media-body
-          - if @user.display_name.blank?
+          - if current_user.display_name.blank?
             .profile--displayname
-              = @user.screen_name
+              = current_user.screen_name
           - else
             .profile--displayname
-              = @user.display_name
+              = current_user.display_name
             .profile--username
-              = @user.screen_name
+              = current_user.screen_name
     %li= link_to "View profile", show_user_profile_path(current_user.screen_name)
     %li= link_to "Settings", edit_user_registration_path
     %li.divider

From 1ef032e69e27c092952035bf2c6654638ccf451b Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 16:48:14 +0100
Subject: [PATCH 077/231] some more changes

---
 app/assets/stylesheets/scss/navbar.scss | 14 ++++++++++++++
 app/views/layouts/_profile.html.haml    |  7 ++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index afd4a8fc..49d459ad 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -100,4 +100,18 @@
   min-width: 45px;
   height: 45px;
   width: 45px;
+}
+
+.profile--dropdown-username {
+  font-weight: 700;
+  font-size: 1.2em;
+  line-height: 1.33em;
+  margin-top: 9.5px;
+}
+
+.profile--dropdown-displayname {
+  font-weight: 700;
+  font-size: 1.2em;
+  line-height: 1.33em;
+  margin-top: 2px;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index 7a396a54..89504703 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -10,14 +10,15 @@
           %img.img-rounded.profile--dropdown-img{src: current_user.profile_picture.url(:medium)}
         .media-body
           - if current_user.display_name.blank?
-            .profile--displayname
+            .profile--dropdown-username
               = current_user.screen_name
           - else
-            .profile--displayname
+            .profile--dropdown-displayname
               = current_user.display_name
             .profile--username
               = current_user.screen_name
-    %li= link_to "View profile", show_user_profile_path(current_user.screen_name)
+    %li.divider.hidden-xs
+    %li.visible-xs= link_to "View profile", show_user_profile_path(current_user.screen_name)
     %li= link_to "Settings", edit_user_registration_path
     %li.divider
     - if current_user.admin?

From 89ea02e7af76625a55fd0bea852a94ca77742e33 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 16:51:04 +0100
Subject: [PATCH 078/231] the navbar is kinda broken

---
 app/assets/stylesheets/scss/navbar.scss | 5 +++++
 app/views/layouts/_profile.html.haml    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 49d459ad..62dd944a 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -114,4 +114,9 @@
   font-size: 1.2em;
   line-height: 1.33em;
   margin-top: 2px;
+}
+
+.profile--image-dropdown {
+  padding-top: 16px;
+  padding-bottom: 16px;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index 89504703..ba986ca0 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -1,4 +1,4 @@
-%li.dropdown
+%li.dropdown.profile--image-dropdown
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
     %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
     %span.visible-xs= current_user.screen_name

From ed3490c40c111175c8c5e4d3f15efadfd7f1a528 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 16:52:08 +0100
Subject: [PATCH 079/231] whoops

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 62dd944a..ac5e3b3f 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -116,7 +116,7 @@
   margin-top: 2px;
 }
 
-.profile--image-dropdown {
+.profile--image-dropdown a {
   padding-top: 16px;
   padding-bottom: 16px;
 }
\ No newline at end of file

From 8e9a893c7949e7a00f911cd5ffcdd77a9f0b2ac8 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 16:54:48 +0100
Subject: [PATCH 080/231] trying to fix this

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index ac5e3b3f..98f5b0d1 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -116,7 +116,7 @@
   margin-top: 2px;
 }
 
-.profile--image-dropdown a {
+.profile--image-dropdown .dropdown-toggle {
   padding-top: 16px;
   padding-bottom: 16px;
 }
\ No newline at end of file

From 136b4dbba5c986ca4498baaa7c76f86b23177b85 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 16:57:51 +0100
Subject: [PATCH 081/231] =?UTF-8?q?trying=20to=20fix=20this=C2=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/scss/navbar.scss | 6 +++---
 app/views/layouts/_profile.html.haml    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 98f5b0d1..9566777d 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -116,7 +116,7 @@
   margin-top: 2px;
 }
 
-.profile--image-dropdown .dropdown-toggle {
-  padding-top: 16px;
-  padding-bottom: 16px;
+.profile--image-dropdown {
+  padding-top: 16px !important;
+  padding-bottom: 16px !important;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index ba986ca0..93e5a9f4 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -1,5 +1,5 @@
-%li.dropdown.profile--image-dropdown
-  %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
+%li.dropdown
+  %a.dropdown-toggle.profile--image-dropdown{href: "#", "data-toggle" => "dropdown"}
     %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
     %span.visible-xs= current_user.screen_name
     %b.caret

From 4e7c0ec81907dab055f47bc4558d77bcbeccb97c Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 16:59:54 +0100
Subject: [PATCH 082/231] =?UTF-8?q?trying=20to=20fix=20this=C2=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 app/views/layouts/_profile.html.haml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 9566777d..15879c64 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -116,7 +116,7 @@
   margin-top: 2px;
 }
 
-.profile--image-dropdown {
+.profile--image-dropdown > a {
   padding-top: 16px !important;
   padding-bottom: 16px !important;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index 93e5a9f4..ba986ca0 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -1,5 +1,5 @@
-%li.dropdown
-  %a.dropdown-toggle.profile--image-dropdown{href: "#", "data-toggle" => "dropdown"}
+%li.dropdown.profile--image-dropdown
+  %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
     %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
     %span.visible-xs= current_user.screen_name
     %b.caret

From b9874ff423e6fc39b24cea6353324dce5c273332 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:01:50 +0100
Subject: [PATCH 083/231] more centered alignment for single usernames

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 15879c64..c1fc3462 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -106,7 +106,7 @@
   font-weight: 700;
   font-size: 1.2em;
   line-height: 1.33em;
-  margin-top: 9.5px;
+  margin-top: 10px;
 }
 
 .profile--dropdown-displayname {

From 8a83db4291295c7603ec79c5520b67f8fb1d2679 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:02:14 +0100
Subject: [PATCH 084/231] can we remove the important here?

---
 app/assets/stylesheets/scss/navbar.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index c1fc3462..53a2c6a7 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -117,6 +117,6 @@
 }
 
 .profile--image-dropdown > a {
-  padding-top: 16px !important;
-  padding-bottom: 16px !important;
+  padding-top: 16px;
+  padding-bottom: 16px;
 }
\ No newline at end of file

From 2e75649b71a9bfab286d868b281885ae3453c831 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:08:22 +0100
Subject: [PATCH 085/231] optimization to mobile display

---
 app/views/layouts/_profile.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index ba986ca0..020eaf6e 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -1,8 +1,8 @@
 %li.dropdown.profile--image-dropdown
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
     %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
-    %span.visible-xs= current_user.screen_name
-    %b.caret
+    .visible-xs= current_user.screen_name
+    %b.caret.visible-xs
   %ul.dropdown-menu.profile--dropdown
     %li.hidden-xs
       .media.profile--dropdown-media

From f46ebe5a30d9f326e69500b5396fb52f86952501 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:11:21 +0100
Subject: [PATCH 086/231] doing the worst things to css since its existence

---
 app/assets/stylesheets/scss/navbar.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 53a2c6a7..c1fc3462 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -117,6 +117,6 @@
 }
 
 .profile--image-dropdown > a {
-  padding-top: 16px;
-  padding-bottom: 16px;
+  padding-top: 16px !important;
+  padding-bottom: 16px !important;
 }
\ No newline at end of file

From 42dd275b2fba1c1a226c50042e218029bd628834 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:22:40 +0100
Subject: [PATCH 087/231] more optimizations to mobile display

---
 app/assets/stylesheets/scss/navbar.scss | 4 ++++
 app/views/layouts/_profile.html.haml    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index c1fc3462..c7dda8eb 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -119,4 +119,8 @@
 .profile--image-dropdown > a {
   padding-top: 16px !important;
   padding-bottom: 16px !important;
+}
+
+.navbar--inline-block {
+  display: inline-block !important;
 }
\ No newline at end of file
diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index 020eaf6e..f1caee58 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -2,7 +2,7 @@
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
     %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
     .visible-xs= current_user.screen_name
-    %b.caret.visible-xs
+    %b.caret.visible-xs.navbar--inline-block
   %ul.dropdown-menu.profile--dropdown
     %li.hidden-xs
       .media.profile--dropdown-media

From f2678cac0f50ec4b39c599e742031a33978803a9 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:23:46 +0100
Subject: [PATCH 088/231] applied to wrong item

---
 app/views/layouts/_profile.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index f1caee58..033b28f2 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -1,7 +1,7 @@
 %li.dropdown.profile--image-dropdown
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
     %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
-    .visible-xs= current_user.screen_name
+    .visible-xs.navbar--inline-block= current_user.screen_name
     %b.caret.visible-xs.navbar--inline-block
   %ul.dropdown-menu.profile--dropdown
     %li.hidden-xs

From 06d2af92cece5c9ca67680e73989eb7318eccd61 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:25:46 +0100
Subject: [PATCH 089/231] another way to fix this

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index c7dda8eb..6f8dcdeb 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -121,6 +121,6 @@
   padding-bottom: 16px !important;
 }
 
-.navbar--inline-block {
+.profile--image-dropdown .visible-xs {
   display: inline-block !important;
 }
\ No newline at end of file

From 910c1a81d65031d2809fe14c4e41cbcde43b6741 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:44:07 +0100
Subject: [PATCH 090/231] I heard you like importants in media queries so I put
 an important in your media query

---
 app/assets/stylesheets/scss/navbar.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 6f8dcdeb..8890e6ad 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -121,6 +121,8 @@
   padding-bottom: 16px !important;
 }
 
-.profile--image-dropdown .visible-xs {
-  display: inline-block !important;
+@media (max-width: $screen-xs-max) {
+  .profile--image-dropdown > .visible-xs {
+    display: inline-block !important;
+  }
 }
\ No newline at end of file

From 0f8940435d2228862fcf09b42dfd15a611697336 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:46:19 +0100
Subject: [PATCH 091/231] impoooortant

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 8890e6ad..4a002d10 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -123,6 +123,6 @@
 
 @media (max-width: $screen-xs-max) {
   .profile--image-dropdown > .visible-xs {
-    display: inline-block !important;
+    display: inline-block;
   }
 }
\ No newline at end of file

From c033f1f4b280f73dd72456262957d520af8c10ee Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:48:19 +0100
Subject: [PATCH 092/231] media queries for min and max size

---
 app/assets/stylesheets/scss/navbar.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 4a002d10..0022037c 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -123,6 +123,12 @@
 
 @media (max-width: $screen-xs-max) {
   .profile--image-dropdown > .visible-xs {
-    display: inline-block;
+    display: inline-block !important;
+  }
+}
+
+@media (min-width: $screen-sm-min) {
+  .profile--image-dropdown > .visible-xs {
+    display: none !important;
   }
 }
\ No newline at end of file

From 5c2d75ece96e55e636b5fad0ca02fb5aef733035 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 12 Feb 2015 17:48:46 +0100
Subject: [PATCH 093/231] now marking multiple "smiled" and "commented"
 notifications as read at once

---
 app/controllers/answer_controller.rb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/controllers/answer_controller.rb b/app/controllers/answer_controller.rb
index 4c8bd73e..9924b9bf 100644
--- a/app/controllers/answer_controller.rb
+++ b/app/controllers/answer_controller.rb
@@ -9,16 +9,10 @@ class AnswerController < ApplicationController
         notif.new = false
         notif.save
       end
-      notif = Notification.where(target_type: "Comment", target_id: @answer.comments.pluck(:id), recipient_id: current_user.id, new: true).first
-      unless notif.nil?
-        notif.new = false
-        notif.save
-      end
-      notif = Notification.where(target_type: "Smile", target_id: @answer.smiles.pluck(:id), recipient_id: current_user.id, new: true).first
-      unless notif.nil?
-        notif.new = false
-        notif.save
-      end
+      notif = Notification.where(target_type: "Comment", target_id: @answer.comments.pluck(:id), recipient_id: current_user.id, new: true)
+      notif.update_all(new: false) unless notif.empty?
+      notif = Notification.where(target_type: "Smile", target_id: @answer.smiles.pluck(:id), recipient_id: current_user.id, new: true)
+      notif.update_all(new: false) unless notif.empty?
     end
   end
 end

From f58ec9f2a6149c9b1a630f7c0987e4ed853c911a Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 17:50:13 +0100
Subject: [PATCH 094/231] another try to fix

---
 app/assets/stylesheets/scss/navbar.scss | 12 ------------
 app/views/layouts/_profile.html.haml    |  5 +++--
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 0022037c..c1fc3462 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -119,16 +119,4 @@
 .profile--image-dropdown > a {
   padding-top: 16px !important;
   padding-bottom: 16px !important;
-}
-
-@media (max-width: $screen-xs-max) {
-  .profile--image-dropdown > .visible-xs {
-    display: inline-block !important;
-  }
-}
-
-@media (min-width: $screen-sm-min) {
-  .profile--image-dropdown > .visible-xs {
-    display: none !important;
-  }
 }
\ No newline at end of file
diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index 033b28f2..a8f599de 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -1,8 +1,9 @@
 %li.dropdown.profile--image-dropdown
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
     %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
-    .visible-xs.navbar--inline-block= current_user.screen_name
-    %b.caret.visible-xs.navbar--inline-block
+    %span.visible-xs
+      = current_user.screen_name
+      %b.caret
   %ul.dropdown-menu.profile--dropdown
     %li.hidden-xs
       .media.profile--dropdown-media

From 9aabccdddc2ac3382d5556d69a107d0e3ae2fa6d Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 18:10:16 +0100
Subject: [PATCH 095/231] add links to profile

---
 app/views/layouts/_profile.html.haml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index a8f599de..49d16329 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -12,10 +12,12 @@
         .media-body
           - if current_user.display_name.blank?
             .profile--dropdown-username
-              = current_user.screen_name
+              %a{href: show_user_profile_path(current_user.screen_name)}
+                = current_user.screen_name
           - else
             .profile--dropdown-displayname
-              = current_user.display_name
+              %a{href: show_user_profile_path(current_user.screen_name)}
+                = current_user.display_name
             .profile--username
               = current_user.screen_name
     %li.divider.hidden-xs

From 2a854c1cda66ba9d5720027cc319cf44d86f2573 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 18:14:23 +0100
Subject: [PATCH 096/231] update paddings

---
 app/assets/stylesheets/scss/navbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index c1fc3462..1511f8fb 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -92,7 +92,7 @@
 }
 
 .profile--dropdown-media {
-  padding: 3px 5px;
+  padding: 3px 15px;
 }
 
 .profile--dropdown-img {

From e3bc0d6300bdeb8a82f0976c3178f21c834980e8 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Thu, 12 Feb 2015 21:59:46 +0100
Subject: [PATCH 097/231] add inbox pagination

---
 app/views/inbox/show.html.haml | 6 ++++++
 app/views/inbox/show.js.erb    | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 app/views/inbox/show.js.erb

diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml
index 0d9098b2..0619f301 100644
--- a/app/views/inbox/show.html.haml
+++ b/app/views/inbox/show.html.haml
@@ -8,6 +8,12 @@
         - @inbox.each do |i|
           = render 'inbox/entry', i: i
 
+        #pagination= will_paginate @inbox, renderer: BootstrapPagination::Rails, page_links: false
+
+        - if @inbox.next_page
+          %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @inbox.current_page }}
+            Load more
+
         - if @inbox.empty?
 
           Nothing to see here.
diff --git a/app/views/inbox/show.js.erb b/app/views/inbox/show.js.erb
new file mode 100644
index 00000000..5b6366c9
--- /dev/null
+++ b/app/views/inbox/show.js.erb
@@ -0,0 +1,8 @@
+$('#timeline').append('<% @timeline.each do |answer|
+  %><%= j render 'inbox/entry', a: answer
+%><% end %>');
+<% if @timeline.next_page %>
+$('#pagination').html('<%= j will_paginate @inbox, renderer: BootstrapPagination::Rails, page_links: false %>');
+<% else %>
+$('#pagination, #load-more-btn').remove();
+<% end %>
\ No newline at end of file

From cb606f942a2868ca628b4b446b82fc6c00bf3384 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Thu, 12 Feb 2015 22:09:11 +0100
Subject: [PATCH 098/231] fixed pagination for real

---
 app/controllers/inbox_controller.rb |  6 +++++-
 app/views/inbox/show.html.haml      | 14 +++++++-------
 app/views/inbox/show.js.erb         |  7 ++++---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/controllers/inbox_controller.rb b/app/controllers/inbox_controller.rb
index 076e1264..728141bd 100644
--- a/app/controllers/inbox_controller.rb
+++ b/app/controllers/inbox_controller.rb
@@ -2,6 +2,10 @@ class InboxController < ApplicationController
   before_filter :authenticate_user!
 
   def show
-    @inbox = Inbox.where(user: current_user).order(:created_at).reverse_order
+    @inbox = Inbox.where(user: current_user).order(:created_at).reverse_order.paginate(page: params[:page])
+    respond_to do |format|
+      format.html
+      format.js
+    end
   end
 end
diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml
index 0619f301..ced60bd5 100644
--- a/app/views/inbox/show.html.haml
+++ b/app/views/inbox/show.html.haml
@@ -8,15 +8,15 @@
         - @inbox.each do |i|
           = render 'inbox/entry', i: i
 
-        #pagination= will_paginate @inbox, renderer: BootstrapPagination::Rails, page_links: false
-
-        - if @inbox.next_page
-          %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @inbox.current_page }}
-            Load more
-
         - if @inbox.empty?
-
           Nothing to see here.
+
+      #pagination= will_paginate @inbox, renderer: BootstrapPagination::Rails, page_links: false
+
+      - if @inbox.next_page
+        %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @inbox.current_page }}
+          Load more
+
     .col-md-9.col-xs-12.col-sm-9.visible-xs
       = render 'inbox/sidebar'
 
diff --git a/app/views/inbox/show.js.erb b/app/views/inbox/show.js.erb
index 5b6366c9..e2463c02 100644
--- a/app/views/inbox/show.js.erb
+++ b/app/views/inbox/show.js.erb
@@ -1,8 +1,9 @@
-$('#timeline').append('<% @timeline.each do |answer|
-  %><%= j render 'inbox/entry', a: answer
+$('#entries').append('<% @inbox.each do |i|
+  %><%= j render 'inbox/entry', i: i
 %><% end %>');
 <% if @timeline.next_page %>
 $('#pagination').html('<%= j will_paginate @inbox, renderer: BootstrapPagination::Rails, page_links: false %>');
 <% else %>
 $('#pagination, #load-more-btn').remove();
-<% end %>
\ No newline at end of file
+<% end %>
+<% @inbox.update_all(new: false) %>
\ No newline at end of file

From 66c5e46a78287e59da2b6bcdb577236548366b4b Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Thu, 12 Feb 2015 22:10:50 +0100
Subject: [PATCH 099/231] this happens all the time

---
 app/views/inbox/show.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/inbox/show.js.erb b/app/views/inbox/show.js.erb
index e2463c02..8c2e959e 100644
--- a/app/views/inbox/show.js.erb
+++ b/app/views/inbox/show.js.erb
@@ -1,7 +1,7 @@
 $('#entries').append('<% @inbox.each do |i|
   %><%= j render 'inbox/entry', i: i
 %><% end %>');
-<% if @timeline.next_page %>
+<% if @inbox.next_page %>
 $('#pagination').html('<%= j will_paginate @inbox, renderer: BootstrapPagination::Rails, page_links: false %>');
 <% else %>
 $('#pagination, #load-more-btn').remove();

From d5fcec4d7d1c67230072e65670d20dd8d7d1524a Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Thu, 12 Feb 2015 22:15:01 +0100
Subject: [PATCH 100/231] hide that "Load more" button if you delete all
 questions

---
 app/assets/javascripts/inbox.coffee | 1 +
 app/views/inbox/_sidebar.html.haml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/inbox.coffee b/app/assets/javascripts/inbox.coffee
index ff553e0b..0741ce09 100644
--- a/app/assets/javascripts/inbox.coffee
+++ b/app/assets/javascripts/inbox.coffee
@@ -40,6 +40,7 @@
       success: (data, status, jqxhr) ->
         if data.success
           succ = yes
+          ($ "div#pagination, button#load-more-btn").slideUp()
           entries = ($ "div#entries")
           entries.slideUp 400, ->
             entries.html("Nothing to see here.")
diff --git a/app/views/inbox/_sidebar.html.haml b/app/views/inbox/_sidebar.html.haml
index c9629caf..dedb5906 100644
--- a/app/views/inbox/_sidebar.html.haml
+++ b/app/views/inbox/_sidebar.html.haml
@@ -17,4 +17,4 @@
   .panel-heading
     %h3.panel-title Actions
   .panel-body
-    %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (@inbox.empty? ? 'disabled' : nil), data: { ib_count: @inbox.count }} Delete all questions
\ No newline at end of file
+    %button.btn.btn-block.btn-danger{type: :button, id: 'ib-delete-all', disabled: (Inbox.where(user: current_user).empty? ? 'disabled' : nil), data: { ib_count: Inbox.where(user: current_user).count }} Delete all questions
\ No newline at end of file

From 8f9472a61192773bee778bfbb44da3406b3f8886 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 16 Feb 2015 16:32:29 +0100
Subject: [PATCH 101/231] update privacy policy

---
 app/views/static/privacy_policy.html.haml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
index 2b9706f0..7d179f55 100644
--- a/app/views/static/privacy_policy.html.haml
+++ b/app/views/static/privacy_policy.html.haml
@@ -5,17 +5,16 @@
       %p This Privacy Policy describes how and when Retrospring uses and collects your data, checks your information and shares with other Services.
       %h2 Information Collection and Use
       %h4 Basic Account Information
-      %p When you create a Retrospring account, you provide some personal information, such as your username, password, and email address. Asking questions anonymously or looking at user profiles does not require registration.
-      %h4 Additional Information
-      %p You may provide us with information for public displaying, like a short biography, a link to your website, your location or a profile picture. This information is viewable by any visitor of the site, registered or unregistered, and therefore should not contain any critical information about you or someone else.
+      %p Upon creation of a Retrospring account,  some personal information such as your username, password, and email address is collected and stored internally. Asking questions anonymously or browsing any other areas of the service does not require registration or the providing of any further information.
+      %p Public information like a short biography, a link to your website, your location or a profile picture can be provided after registration. This information is viewable by any visitor of the site, registered or unregistered, and therefore should not contain any critical information about you or someone else.
       %h4 Answers and Questions
       %p Our Service primarily is designed to ask your friends and other people from around the world questions or answer them. Most of the information you provide us is information you are asking us to make public. This information does not only include the questions, answers, comments and smiles, but also the groups you create, the people you follow and other bits of information that result from using our Service.
       %h4 Cookies
       %p Like many websites, we use cookies and similar technologies to collect  additional website usage data and to improve our Services. A cookie is a small data file that is transferred to your computer's hard disk. Retrospring uses persistant cookies to improve the users browsing experience and to to better understand how you interact with our Services. Most Internet browsers automatically accept cookies. You can instruct  your browser, by changing its settings, to stop accepting cookies or to  prompt you before accepting a cookie from the websites you visit.  However, the Services may not function properly if you disable cookies.
-      %h4 Log Data
-      %p When you use our Services, we may receive information ("Log Data")  such as your IP address, browser type, operating system, the referring  web page, pages visited, location, your mobile carrier, device information (including device and application IDs), search terms, and cookie information. We receive Log Data when you interact with our Services, for example, when you visit our websites or sign into our Services.
+      %h4 Non-personal Identification Information
+      %p When using our Services, we may receive technical information ("Non-personal Identification") information such as your IP address, browser type, operating system, the referring web page, pages visited, location, search terms, and cookie information. We receive this data when you interact with our Services, for example, when you visit our websites or sign into our Services.
       %h4 Third-Party Services
-      %p Retrospring uses a variety of third-party services to help provide our Services and to help us understand and improve the use of our Services, such as Piwik Analytics, or to share your answers to, if connected, other Services like Twitter, Tumblr or Facebook. These third-party service providers may collect information sent by your  browser as part of a web page request, such as cookies or your IP  address.
+      %p Retrospring uses a variety of third-party services to help provide our Services and to help us understand and improve the use of our Services, such as Piwik Analytics, or to share your answers to, if connected, other Services like Twitter, Tumblr or Facebook. These third-party service providers may collect information sent by your browser as part of a web page request, such as cookies or your IP address. Please refer to their Privacy Policies in regard to how they handle your data.
       %h2 Information Sharing
       %p Retrospring will keep any collected data (see "Information Collection and Use" above) encrypted on our servers. Any information shared with other Services is controlled by the user itself, as we only supply sharing to these. If a user isn't satisfied with Terms from another Service they shouldn't connect their accounts or remove access over the Sharing page on the profile settings page.
       %p Notwithstanding anything to the contrary in this Policy, we may preserve  or disclose your information if we believe that it is reasonably  necessary to comply with a law, regulation or legal request; to protect  the safety of any person; to address fraud, security or technical  issues; or to protect Retrospring's rights or property.  However, nothing in this Privacy Policy is intended to limit any legal defenses or objections that you may have to a third party’s, including a government’s, request to disclose your information.

From d87d18ae9dfa1135e15d99c4b5fe37ea231c0bb0 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Mon, 16 Feb 2015 19:23:58 +0100
Subject: [PATCH 102/231] change effective date

---
 app/views/static/privacy_policy.html.haml | 2 +-
 app/views/static/terms.html.haml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/static/privacy_policy.html.haml b/app/views/static/privacy_policy.html.haml
index 7d179f55..81bd95c7 100644
--- a/app/views/static/privacy_policy.html.haml
+++ b/app/views/static/privacy_policy.html.haml
@@ -24,4 +24,4 @@
       %h2 Our Policy Towards Children
       %p Our Services are not directed to persons under 14. If you become aware that your child has provided us with personal information without your consent, contact us on privacy@retrospring.net . We do not knowingly collect personal information from children under 14. If we become aware that a child under 14 has provided us with personal information, we take steps to remove such information and terminate the child's account.
       %p
-        %em Effective: the time we will actually publish it plus some days
\ No newline at end of file
+        %em Effective: 16th February 2015
\ No newline at end of file
diff --git a/app/views/static/terms.html.haml b/app/views/static/terms.html.haml
index 036621c7..81ae346c 100644
--- a/app/views/static/terms.html.haml
+++ b/app/views/static/terms.html.haml
@@ -25,4 +25,4 @@
       %p Retrospring respects the intellectual property rights of others and  expects users of the Services to do the same. We will respond to notices  of alleged copyright infringement that comply with applicable law and  are properly provided to us. If you believe that your Content has been  copied in a way that constitutes copyright infringement, please provide  us with the following information: a physical or electronic  signature of the copyright owner or a person authorized to act on their  behalf; identification of the copyrighted work claimed to have been  infringed; identification of the material that is claimed to be  infringing or to be the subject of infringing activity and that is to be  removed or access to which is to be disabled, and information  reasonably sufficient to permit us to locate the material; your  contact information, including your address, telephone number, and an  email address; a statement by you that you have a good faith belief  that use of the material in the manner complained of is not authorized  by the copyright owner, its agent, or the law; and a statement that  the information in the notification is accurate, and, under penalty of  perjury, that you are authorized to act on behalf of the copyright  owner.
       %p We reserve the right to remove Content alleged to be infringing  without prior notice, at our sole discretion, and without liability to  you. In appropriate circumstances, Retrospring will also terminate a user’s  account if the user is determined to be a repeat infringer.
       %p
-        %em Effective: the time we will actually publish it plus some days
\ No newline at end of file
+        %em Effective: 16th February 2015
\ No newline at end of file

From 6c4f5c11df5dc2950941545f21933ee5bebd1338 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 17 Feb 2015 00:53:09 +0100
Subject: [PATCH 103/231] fix growl notification positioning

---
 app/assets/stylesheets/base.css.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 98fa582d..2187476a 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -115,4 +115,8 @@ body {
     padding-left: 0px;
     padding-right: 0px;
   }
+}
+
+#growls .default {
+  top: 64px;
 }
\ No newline at end of file

From 9bffdec2a5e9c318a6c0536143bfe5de1efe9548 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 17 Feb 2015 00:56:12 +0100
Subject: [PATCH 104/231] fix growl notification positioning, this time for
 real

---
 app/assets/stylesheets/base.css.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 2187476a..6eb4184f 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -117,6 +117,7 @@ body {
   }
 }
 
-#growls .default {
-  top: 64px;
+#growls.default{
+  top:64px;
+  right:10px
 }
\ No newline at end of file

From c61b9ddf50c0019c904e3b7fda0d383a1dba5e00 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Tue, 17 Feb 2015 23:57:34 +0100
Subject: [PATCH 105/231] fix #83

---
 app/views/shared/_answerbox.html.haml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index f46c90c3..f94909bf 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -54,7 +54,17 @@
           = render 'shared/answerbox_buttons', a: a
     - else
       .row
-        .col-md-6.col-md-offset-6.col-sm-8.col-sm-offset-4.col-xs-6.col-xs-offset-6.text-right
+        .col-md-6.col-sm-4.col-xs-6.text-left.text-muted
+          - if a.question.author_is_anonymous?
+            %i.fa.fa-clock-o
+            %a{href: show_user_answer_path(a.user.screen_name, a.id)}
+              %span= time_ago_in_words(a.created_at)
+              ago
+          - else
+            %i.fa.fa-clock-o
+            %span= time_ago_in_words(a.created_at)
+            ago
+        .col-md-6.col-sm-8.col-xs-6.text-right
           = render 'shared/answerbox_buttons', a: a
   .panel-footer{id: "ab-comments-section-#{a.id}", style: @display_all.nil? ? 'display: none' : nil }
     %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a

From a451cab3e91b927c50641d22c71ce9420ebefd52 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Wed, 18 Feb 2015 00:07:38 +0100
Subject: [PATCH 106/231] show answer link in all cases

---
 app/views/shared/_answerbox.html.haml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index f94909bf..36062247 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -55,13 +55,8 @@
     - else
       .row
         .col-md-6.col-sm-4.col-xs-6.text-left.text-muted
-          - if a.question.author_is_anonymous?
-            %i.fa.fa-clock-o
-            %a{href: show_user_answer_path(a.user.screen_name, a.id)}
-              %span= time_ago_in_words(a.created_at)
-              ago
-          - else
-            %i.fa.fa-clock-o
+          %i.fa.fa-clock-o
+          %a{href: show_user_answer_path(a.user.screen_name, a.id)}
             %span= time_ago_in_words(a.created_at)
             ago
         .col-md-6.col-sm-8.col-xs-6.text-right

From a3bfa41baa349b18d78cf1ff55010f26f4cfc3fa Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 20 Feb 2015 00:18:43 +0100
Subject: [PATCH 107/231] add date tooltips to relative dates

---
 app/views/shared/_answerbox.html.haml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index 36062247..114a5699 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -10,10 +10,12 @@
             = user_screen_name a.question.user, a.question.author_is_anonymous
             asked
             - if @user.nil? or a.question.author_is_anonymous
-              = time_ago_in_words(a.question.created_at)
+              %span{title: a.question.created_at, data: { toggle: :tooltip, placement: :bottom }}
+                = time_ago_in_words(a.question.created_at)
             - else
               %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)}
-                = time_ago_in_words(a.question.created_at)
+                %span{title: a.question.created_at, data: { toggle: :tooltip, placement: :bottom }}
+                  = time_ago_in_words(a.question.created_at)
             ago
             - unless a.question.author_is_anonymous
               - if a.question.answer_count > 1
@@ -48,7 +50,8 @@
                 = user_screen_name a.user
               .answerbox--answer-date
                 %a{href: show_user_answer_path(a.user.screen_name, a.id)}
-                  %span= time_ago_in_words(a.created_at)
+                  %span{title: a.created_at, data: { toggle: :tooltip, placement: :bottom }}
+                    = time_ago_in_words(a.created_at)
                   ago
         .col-md-6.col-sm-8.col-xs-6.text-right
           = render 'shared/answerbox_buttons', a: a
@@ -57,7 +60,8 @@
         .col-md-6.col-sm-4.col-xs-6.text-left.text-muted
           %i.fa.fa-clock-o
           %a{href: show_user_answer_path(a.user.screen_name, a.id)}
-            %span= time_ago_in_words(a.created_at)
+            %span{title: a.created_at, data: { toggle: :tooltip, placement: :bottom }}
+              = time_ago_in_words(a.created_at)
             ago
         .col-md-6.col-sm-8.col-xs-6.text-right
           = render 'shared/answerbox_buttons', a: a

From 66cc15971e7d4b75fe954ca9901970c313e09208 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 20 Feb 2015 00:40:41 +0100
Subject: [PATCH 108/231] more date tooltips

---
 app/views/inbox/_entry.html.haml                |  3 ++-
 app/views/moderation/_moderationbox.html.haml   |  3 ++-
 app/views/notifications/_notification.html.haml | 12 ++++++++----
 app/views/question/show.html.haml               |  3 ++-
 app/views/shared/_question.html.haml            |  1 +
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/views/inbox/_entry.html.haml b/app/views/inbox/_entry.html.haml
index 821daa36..c93e7817 100644
--- a/app/views/inbox/_entry.html.haml
+++ b/app/views/inbox/_entry.html.haml
@@ -8,7 +8,8 @@
         %h6.text-muted.media-heading.answerbox--question-user
           = user_screen_name i.question.user, i.question.author_is_anonymous
           asked
-          = time_ago_in_words(i.question.created_at)
+          %span{title: i.question.created_at, data: { toggle: :tooltip, placement: :bottom }}
+            = time_ago_in_words(i.question.created_at)
           ago
           - unless i.question.author_is_anonymous
             - if i.question.answer_count > 0
diff --git a/app/views/moderation/_moderationbox.html.haml b/app/views/moderation/_moderationbox.html.haml
index 51eae25e..a671a220 100644
--- a/app/views/moderation/_moderationbox.html.haml
+++ b/app/views/moderation/_moderationbox.html.haml
@@ -4,7 +4,8 @@
     = user_screen_name report.user
     reported a
     = report.type.sub('Reports::', '')
-    = time_ago_in_words(report.created_at)
+    %span{title: report.created_at, data: { toggle: :tooltip, placement: :bottom }}
+      = time_ago_in_words(report.created_at)
     ago
   .panel-body
     %p
diff --git a/app/views/notifications/_notification.html.haml b/app/views/notifications/_notification.html.haml
index 00fb1ccb..efc508f6 100644
--- a/app/views/notifications/_notification.html.haml
+++ b/app/views/notifications/_notification.html.haml
@@ -11,7 +11,8 @@
             answered
             %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.id), title: "#{notification.target.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
               your question
-            = time_ago_in_words notification.target.created_at
+            %span{title: notification.target.created_at, data: { toggle: :tooltip, placement: :bottom }}
+              = time_ago_in_words notification.target.created_at
             ago
           .notification--icon
             %i.fa.fa-exclamation
@@ -23,7 +24,8 @@
             = user_screen_name notification.target.source
           %p.notification--text
             followed you
-            = time_ago_in_words notification.target.created_at
+            %span{title: notification.target.created_at, data: { toggle: :tooltip, placement: :bottom }}
+              = time_ago_in_words notification.target.created_at
             ago
           .notification--icon
             %i.fa.fa-users
@@ -37,7 +39,8 @@
             smiled at
             %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id), title: "#{notification.target.answer.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
               your answer
-            = time_ago_in_words notification.target.created_at
+            %span{title: notification.target.created_at, data: { toggle: :tooltip, placement: :bottom }}
+              = time_ago_in_words notification.target.created_at
             ago
           .notification--icon
             %i.fa.fa-smile-o
@@ -51,7 +54,8 @@
             commented on
             %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id), title: "#{notification.target.answer.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
               your answer
-            = time_ago_in_words notification.target.created_at
+            %span{title: notification.target.created_at, data: { toggle: :tooltip, placement: :bottom }}
+              = time_ago_in_words notification.target.created_at
             ago
           .notification--icon
             %i.fa.fa-comments
\ No newline at end of file
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index b259bfa5..b02aeaf5 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -10,7 +10,8 @@
           %h6.text-muted.media-heading.answerbox--question-user
             = user_screen_name @question.user, @question.author_is_anonymous
             asked
-            = time_ago_in_words(@question.created_at)
+            %span{title: @question.created_at, data: { toggle: :tooltip, placement: :bottom }}
+              = time_ago_in_words(@question.created_at)
             ago
           %p.answerbox--question-text= @question.content
 
diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml
index d2b79ee3..f2f4da75 100644
--- a/app/views/shared/_question.html.haml
+++ b/app/views/shared/_question.html.haml
@@ -6,6 +6,7 @@
           = user_screen_name q.user
           asked
           %a{href: show_user_question_path(q.user.screen_name, q.id)}
+            %span{title: q.created_at, data: { toggle: :tooltip, placement: :bottom }}
             = time_ago_in_words(q.created_at)
             ago
           - if q.answer_count > 1

From af598f585a4ffda3e9e76dd8811cecc35d9e4e5a Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 20 Feb 2015 01:12:24 +0100
Subject: [PATCH 109/231] added link to blog in the footer

---
 app/views/shared/_links.html.haml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/shared/_links.html.haml b/app/views/shared/_links.html.haml
index 96c05265..63ae9842 100644
--- a/app/views/shared/_links.html.haml
+++ b/app/views/shared/_links.html.haml
@@ -6,3 +6,6 @@
   = link_to "About", about_path
   ·
   = link_to "Bugs", 'https://github.com/retrospring/bugs/issues'
+  ·
+  / Tyler wanted this so much, here it is!
+  = link_to "Blog", 'https://blog.retrospring.net'
\ No newline at end of file

From da7b6845139077336b44ab1cfca95e409f966672 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Fri, 20 Feb 2015 01:23:48 +0100
Subject: [PATCH 110/231] add links to privacy policy and terms of service in
 footer

---
 app/views/shared/_links.html.haml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/shared/_links.html.haml b/app/views/shared/_links.html.haml
index 63ae9842..1c507e92 100644
--- a/app/views/shared/_links.html.haml
+++ b/app/views/shared/_links.html.haml
@@ -8,4 +8,8 @@
   = link_to "Bugs", 'https://github.com/retrospring/bugs/issues'
   ·
   / Tyler wanted this so much, here it is!
-  = link_to "Blog", 'https://blog.retrospring.net'
\ No newline at end of file
+  = link_to "Blog", 'https://blog.retrospring.net'
+  ·
+  = link_to "Terms of Service", terms_path
+  ·
+  = link_to "Privacy Policy", privacy_policy_path
\ No newline at end of file

From 92d4eafbbadd363705373bd5157f73713828de49 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sat, 28 Feb 2015 17:21:11 +0100
Subject: [PATCH 111/231] update questiongenerator

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 63dca713..c34fdbaa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'rails_admin'
 gem 'sidekiq'
 gem 'sinatra', require: false
 
-gem 'questiongenerator', git: 'https://github.com/justask/questiongenerator.git'
+gem 'questiongenerator', git: 'https://github.com/retrospring/questiongenerator.git'
 
 gem 'sanitize'
 gem 'redcarpet'
diff --git a/Gemfile.lock b/Gemfile.lock
index fc086541..50d396ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
-  remote: https://github.com/justask/questiongenerator.git
-  revision: 4f85dafbaf226e3dfbfad9ed3f169bab03b9a84c
+  remote: https://github.com/retrospring/questiongenerator.git
+  revision: 326d82728a96ff58bad4516c46f9abba06ba31df
   specs:
     questiongenerator (0.1.0)
 

From 487de37477bc400d729e703793eeafcdfa8a0820 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Sat, 28 Feb 2015 17:29:10 +0100
Subject: [PATCH 112/231] fix jihad issue #86

---
 app/views/inbox/show.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/inbox/show.js.erb b/app/views/inbox/show.js.erb
index 8c2e959e..32154b61 100644
--- a/app/views/inbox/show.js.erb
+++ b/app/views/inbox/show.js.erb
@@ -6,4 +6,4 @@ $('#pagination').html('<%= j will_paginate @inbox, renderer: BootstrapPagination
 <% else %>
 $('#pagination, #load-more-btn').remove();
 <% end %>
-<% @inbox.update_all(new: false) %>
\ No newline at end of file
+<% Inbox.where(id: @inbox.pluck(:id)).update_all(new: false) %>
\ No newline at end of file

From 40c3690c122237faad819d6496cbb3041ca8d963 Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Tue, 3 Mar 2015 19:58:22 +0100
Subject: [PATCH 113/231] change default font to Lato

---
 app/assets/stylesheets/application.css.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 8bf94e9c..65e8a599 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -6,9 +6,9 @@
  *= require_self
  */
 
-@import url(https://fonts.googleapis.com/css?family=Exo+2:400,700);
+@import url(http://fonts.googleapis.com/css?family=Lato:400,700);
 
-$font-family-sans-serif:  "Exo 2","Open Sans", "Helvetica Neue", Helvetica, "DejaVu Sans", Arial, sans-serif;
+$font-family-sans-serif:  "Lato","Open Sans", "Helvetica Neue", Helvetica, "DejaVu Sans", Arial, sans-serif;
 $font-family-serif:       Georgia, "DejaVu Serif", "Times New Roman", Times, serif;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
 $font-family-monospace:   "PragmataPro", Monaco, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace;

From 642b3e57101ae6f3cb5052e5c223f842e226aa7f Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Tue, 3 Mar 2015 20:15:43 +0100
Subject: [PATCH 114/231] HTTPS

---
 app/assets/stylesheets/application.css.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 65e8a599..26273c74 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -6,7 +6,7 @@
  *= require_self
  */
 
-@import url(http://fonts.googleapis.com/css?family=Lato:400,700);
+@import url(https://fonts.googleapis.com/css?family=Lato:400,700);
 
 $font-family-sans-serif:  "Lato","Open Sans", "Helvetica Neue", Helvetica, "DejaVu Sans", Arial, sans-serif;
 $font-family-serif:       Georgia, "DejaVu Serif", "Times New Roman", Times, serif;

From 1773ff0b33852b2a084d36a8213745837c5cd6b4 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Wed, 18 Mar 2015 21:26:42 +0100
Subject: [PATCH 115/231] remove myself from about page

---
 app/views/static/about.html.haml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 4ae341ab..693446d5 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -13,13 +13,6 @@
           = succeed '!' do
             = APP_CONFIG['site_name']
           %br/
-          .media
-            .pull-left
-              %a{href: show_user_profile_path('nilsding')}
-                %img.img-rounded.answerbox--img{src: User.find_by_screen_name('nilsding').profile_picture.url(:medium)}
-            .media-body
-              %h4.entry-text.entry-about nilsding
-              %h6.entry-subtext Backend, Server & Code
           .media
             .pull-left
               %a{href: show_user_profile_path('pixeldesu')}

From 5d3cd6ee7506d5c01c6a8d93d3383ec541e22f62 Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Fri, 27 Mar 2015 13:17:16 +0100
Subject: [PATCH 116/231] add deletion message to index

---
 app/views/static/index.html.haml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index a3e2f94b..989f5089 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -5,7 +5,13 @@
       = render 'shared/sidebar'
     .col-md-9.col-xs-12.col-sm-9.j2-col-reset
       = render 'layouts/messages'
-
+      .alert.alert-danger.alert-dismissible{"role": "alert"}
+        %button.close{data: {dismiss: :alert}, aria: {label: "Close"}}
+          %span{aria: {hidden: true}}
+            &times;
+        %strong
+          Retrospring will shut down
+        on 1.4.2015!
       #timeline
         - @timeline.each do |answer|
           = render 'shared/answerbox', a: answer

From 644b1b1316460c0c7e5c365b0d0d0fe395d6b90d Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Fri, 27 Mar 2015 13:21:46 +0100
Subject: [PATCH 117/231] add deletion message to index

---
 app/views/static/index.html.haml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index 989f5089..412679e1 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -5,10 +5,7 @@
       = render 'shared/sidebar'
     .col-md-9.col-xs-12.col-sm-9.j2-col-reset
       = render 'layouts/messages'
-      .alert.alert-danger.alert-dismissible{"role": "alert"}
-        %button.close{data: {dismiss: :alert}, aria: {label: "Close"}}
-          %span{aria: {hidden: true}}
-            &times;
+      .alert.alert-danger
         %strong
           Retrospring will shut down
         on 1.4.2015!

From fbb494f3ea65e5e1f45631809c083aa02227bf3d Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Fri, 27 Mar 2015 13:24:09 +0100
Subject: [PATCH 118/231] add deletion message to index

---
 app/views/static/index.html.haml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index 412679e1..d30dd3fd 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -5,7 +5,9 @@
       = render 'shared/sidebar'
     .col-md-9.col-xs-12.col-sm-9.j2-col-reset
       = render 'layouts/messages'
-      .alert.alert-danger
+      .alert.alert-danger.alert-dismissible{role: "alert"}
+        %button.close{type: "button", "data-dismiss" => "alert"}
+          %span{"aria-hidden" => "true"} &times;
         %strong
           Retrospring will shut down
         on 1.4.2015!

From 09b30506fdbad3fdbadbc1ff66c8c66f2e7e6c6c Mon Sep 17 00:00:00 2001
From: pixeldesu <pixeldesu@nerdwerks.org>
Date: Fri, 27 Mar 2015 13:25:50 +0100
Subject: [PATCH 119/231] add deletion message to index

---
 app/views/static/index.html.haml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index d30dd3fd..bee582eb 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -8,9 +8,7 @@
       .alert.alert-danger.alert-dismissible{role: "alert"}
         %button.close{type: "button", "data-dismiss" => "alert"}
           %span{"aria-hidden" => "true"} &times;
-        %strong
-          Retrospring will shut down
-        on 1.4.2015!
+        Retrospring will shut down on 1st April 2015!
       #timeline
         - @timeline.each do |answer|
           = render 'shared/answerbox', a: answer

From 4035ae4c7f6cb37f4df0abc02366d2adf07eb607 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Fri, 27 Mar 2015 16:51:04 +0100
Subject: [PATCH 120/231] added export rake task

---
 Rakefile | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/Rakefile b/Rakefile
index cce9964f..9bda58b7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -264,4 +264,118 @@ namespace :justask do
       print "\033[0m"
     end
   end
+
+  desc "Export data for an user"
+  task :export, [:email] => :environment do |t, args|
+    require 'json'
+    require 'yaml'
+    return if args[:email].nil?
+    obj = {}
+    format = '%t (%c/%C) [%b>%i] %e'
+    u = User.where("LOWER(email) = ?", args[:email].downcase).first!
+    export_dirname = "export_#{u.screen_name}_#{Time.now.to_i}"
+    export_filename = u.screen_name
+
+    %i(id screen_name display_name created_at sign_in_count last_sign_in_at friend_count follower_count asked_count answered_count commented_count smiled_count motivation_header bio website location moderator admin supporter banned blogger).each do |f|
+      obj[f] = u.send f
+    end
+
+    total = u.questions.count
+    progress = ProgressBar.create title: 'Processing questions', format: format, starting_at: 0, total: total
+    obj[:questions] = []
+    u.questions.each do |q|
+      qobj = {}
+      %i(id content author_is_anonymous created_at answer_count).each do |f|
+        qobj[f] = q.send f
+      end
+      obj[:questions] << qobj
+      progress.increment
+    end
+
+    total = u.answers.count
+    progress = ProgressBar.create title: 'Processing answers', format: format, starting_at: 0, total: total
+    obj[:answers] = []
+    u.answers.each do |a|
+      aobj = {}
+      %i(id content comment_count smile_count created_at).each do |f|
+        aobj[f] = a.send f
+      end
+      aobj[:question] = {}
+      %i(id content author_is_anonymous created_at answer_count).each do |f|
+        aobj[:question][f] = a.question.send f
+      end
+      aobj[:question][:user] = a.question.user.screen_name unless a.question.author_is_anonymous
+      aobj[:comments] = []
+      a.comments.each do |c|
+        cobj = {}
+        %i(id content created_at).each do |f|
+          cobj[f] = c.send f
+        end
+        cobj[:user] = c.user.screen_name
+        aobj[:comments] << cobj
+      end
+      obj[:answers] << aobj
+      progress.increment
+    end
+
+    total = u.comments.count
+    progress = ProgressBar.create title: 'Processing comments', format: format, starting_at: 0, total: total
+    obj[:comments] = []
+    u.comments.each do |c|
+      cobj = {}
+      %i(id content created_at).each do |f|
+        cobj[f] = c.send f
+      end
+      cobj[:answer] = {}
+      %i(id content comment_count smile_count created_at).each do |f|
+        cobj[:answer][f] = c.answer.send f
+      end
+      cobj[:answer][:question] = {}
+      %i(id content author_is_anonymous created_at answer_count).each do |f|
+        cobj[:answer][:question][f] = c.answer.question.send f
+      end
+      cobj[:answer][:question][:user] = c.answer.question.user.screen_name unless c.answer.question.author_is_anonymous
+      obj[:comments] << cobj
+      progress.increment
+    end
+
+    total = u.smiles.count
+    progress = ProgressBar.create title: 'Processing smiles', format: format, starting_at: 0, total: total
+    obj[:smiles] = []
+    u.smiles.each do |s|
+      sobj = {}
+      %i(id created_at).each do |f|
+        sobj[f] = s.send f
+      end
+
+      sobj[:answer] = {}
+      %i(id content comment_count smile_count created_at).each do |f|
+        sobj[:answer][f] = s.answer.send f
+      end
+      sobj[:answer][:question] = {}
+      %i(id content author_is_anonymous created_at answer_count).each do |f|
+        sobj[:answer][:question][f] = s.answer.question.send f
+      end
+      sobj[:answer][:question][:user] = s.answer.question.user.screen_name unless s.answer.question.author_is_anonymous
+
+      obj[:smiles] << sobj
+      progress.increment
+    end
+
+    `mkdir -p /usr/home/justask/justask/public/export`
+    `mkdir -p /tmp/rs_export/#{export_dirname}/picture`
+    if u.profile_picture
+      %i(large medium small original).each do |s|
+        `cp #{u.profile_picture.path s} /tmp/rs_export/#{export_dirname}/picture/#{s}_#{File.basename u.profile_picture.path}`
+      end
+    end
+    File.open "/tmp/rs_export/#{export_dirname}/#{export_filename}.json", 'w' do |f|
+      f.puts obj.to_json
+    end
+    File.open "/tmp/rs_export/#{export_dirname}/#{export_filename}.yml", 'w' do |f|
+      f.puts obj.to_yaml
+    end
+    `tar czvf public/export/#{export_dirname}.tar.gz -C /tmp/rs_export #{export_dirname}`
+    puts "\033[1mhttps://retrospring.net/export/#{export_dirname}.tar.gz\033[0m"
+  end
 end

From 242bc965567ac1e11d27854381ccbdebc85447a6 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Fri, 27 Mar 2015 18:06:30 +0100
Subject: [PATCH 121/231] update Rakefile

---
 Rakefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 9bda58b7..61aa95b2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -366,7 +366,8 @@ namespace :justask do
     `mkdir -p /tmp/rs_export/#{export_dirname}/picture`
     if u.profile_picture
       %i(large medium small original).each do |s|
-        `cp #{u.profile_picture.path s} /tmp/rs_export/#{export_dirname}/picture/#{s}_#{File.basename u.profile_picture.path}`
+        x = u.profile_picture.path(s).gsub('"', '\\"')
+        `cp "#{x}" "/tmp/rs_export/#{export_dirname}/picture/#{s}_#{File.basename x}"`
       end
     end
     File.open "/tmp/rs_export/#{export_dirname}/#{export_filename}.json", 'w' do |f|

From adee82bdf1350d1ed9f817b92b103c2c02d4f871 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Fri, 27 Mar 2015 23:10:57 +0100
Subject: [PATCH 122/231] le instant troll mode activated

---
 app/views/static/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index bee582eb..98982c4a 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -8,7 +8,7 @@
       .alert.alert-danger.alert-dismissible{role: "alert"}
         %button.close{type: "button", "data-dismiss" => "alert"}
           %span{"aria-hidden" => "true"} &times;
-        Retrospring will shut down on 1st April 2015!
+        Retrospring will shut down on 31st March 2015!
       #timeline
         - @timeline.each do |answer|
           = render 'shared/answerbox', a: answer

From 4857c47b9ea00b6aa3b8dcf8109ce79d1bd627a9 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 30 Mar 2015 09:36:10 +0200
Subject: [PATCH 123/231] update README

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9e20f73d..91973dec 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# justask [![build status](https://ci.rrerr.net/projects/9/status.png?ref=master)](https://ci.rrerr.net/projects/9?ref=master)
+# justask
 
 ## Requirements
 
-- UNIX-like system (Linux, *BSD, ...)
+- UNIX-like system (Linux, FreeBSD, ...)
 - Ruby 2.0.0+
 - Bundler
 - PostgreSQL
@@ -90,4 +90,8 @@ Add/remove moderators:
 Add/remove supporters:
 
     $ bundle exec rake 'justask:sup[someone_else]' RAILS_ENV=production
-    $ bundle exec rake 'justask:desup[someone_else]' RAILS_ENV=production
\ No newline at end of file
+    $ bundle exec rake 'justask:desup[someone_else]' RAILS_ENV=production
+
+Export user data:
+
+    $ bundle exec rake 'justask:export[jdoe@example.tld]' RAILS_ENV=production

From 64405b32ff25bf04ca93c67738a68f33d2c281a6 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:12:01 +0200
Subject: [PATCH 124/231] added nginx configuration, ASS runscript

---
 docs/ass.rb     | 33 +++++++++++++++++++++++
 docs/nginx.conf | 71 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 docs/ass.rb
 create mode 100644 docs/nginx.conf

diff --git a/docs/ass.rb b/docs/ass.rb
new file mode 100644
index 00000000..8e2043df
--- /dev/null
+++ b/docs/ass.rb
@@ -0,0 +1,33 @@
+# This ASS runscript starts justask in development mode on a FreeBSD host.
+# (c) 2015 nilsding
+# This file is a modification of https://github.com/retrospring/ass/blob/master/scripts/example-rails.rb
+
+Runscript.new do
+  before_start do
+    # set Rails environment to development
+    setenv :RAILS_ENV, 'development'
+
+    # install bundle
+    sh %|bundle install --without production mysql|
+
+    # edit and copy example justask config
+    sh %|sed -i .old -e 's/justask.rrerr.net/justask.local/g' -e 's/"Anonymous"/"Arno Nym"/g' -e 's/enabled: tru/enabled: fals/g' ./config/justask.yml.example|
+    sh %|cp ./config/justask.yml.example ./config/justask.yml|
+
+    # edit and copy postgres database config
+    sh %|sed -i .old -e 's/_production/_producktion/g' -e 's/justask_development/ja_devel/g' -e 's/username: postgres/username: nilsding/g' ./config/database.yml.postgres|
+    sh %|cp ./config/database.yml.postgres ./config/database.yml|
+
+    # migrate the database
+    sh %|bundle exec rake db:migrate|
+  end
+
+  start do
+    sh %|bundle exec rails server -b 127.0.0.1 -p 16933|, pid: :rails, wait: false
+  end
+
+  stop do
+    unset :RAILS_ENV
+    kill :rails, with: :SIGINT
+  end
+end
diff --git a/docs/nginx.conf b/docs/nginx.conf
new file mode 100644
index 00000000..ffb72b34
--- /dev/null
+++ b/docs/nginx.conf
@@ -0,0 +1,71 @@
+# justask nginx config
+
+# Redirect www.retrospring.net to retrospring.net, because it looks nicer.
+server {
+    listen *:80;
+    listen *:443;
+    server_name www.retrospring.net;
+    return 301 $scheme://retrospring.net$request_uri;
+}
+
+
+# This is a normal HTTP host which redirects all traffic to the HTTPS host.
+server {
+    listen *:80;
+    # Replace retrospring.net with your FQDN.
+    server_name retrospring.net;
+    server_tokens off;
+    # root doesn't have to be a valid path since we are redirecting
+    root /nowhere;
+    rewrite ^ https://$server_name$request_uri permanent;
+}
+
+
+# The actual configuration.
+server {
+    # SSL settings
+    listen 443 ssl;
+
+    ssl on;
+    ssl_certificate /usr/local/etc/nginx/ssl/certs/retrospring.net/retrospring.net.pem;
+    ssl_certificate_key /usr/local/etc/nginx/ssl/certs/retrospring.net/retrospring.net.key;
+
+    # use this header only if all subdomains support HTTPS!
+    #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains";
+
+    ssl_session_cache  builtin:1000  shared:SSL:10m;
+
+    # forward secrecy settings
+    ssl_protocols  TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers   on;
+    ssl_ciphers 'EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA';
+
+    # Replace retrospring.net with your FQDN
+    server_name retrospring.net;
+    server_tokens off;
+
+    # Replace /usr/home/justask/justask with the path to your justask installation
+    root /usr/home/justask/justask/public;
+    access_log /var/log/nginx/justask.log;
+
+    client_max_body_size 5M;
+    
+    error_page 404 = /404.html;
+    error_page 422 = /422.html;
+    error_page 500 = /500.html;
+    error_page 502 = /502.html;
+
+    try_files $uri @justask;
+
+    location @justask {
+        proxy_set_header  X-Real-IP  $remote_addr;
+        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $http_host;
+        proxy_max_temp_file_size 0;
+        
+        # Replace /usr/home/justask/justask with the path to your justask installation
+        proxy_pass http://unix:/usr/home/justask/justask/tmp/sockets/justask.sock;
+        break;
+    }
+}
+

From 7236a8c46f2f59df29558e29b062850445346e17 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:14:54 +0200
Subject: [PATCH 125/231] updated readme

---
 README.md | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 91973dec..a2294ac4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
-# justask
+# justask (aka. the software behind Retrospring)
+
+This is the source code that powered Retrospring.  Yep, all of it.  Including
+all the branches where we left off.
 
 ## Requirements
 
@@ -6,12 +9,26 @@
 - Ruby 2.0.0+
 - Bundler
 - PostgreSQL
-- Redis
+- Redis (for Sidekiq)
+- ImageMagick (for image processing)
 
 ## Installation (production)
 
+We've installed justask on FreeBSD 10 using rvm.  What we also did was
+creating a new, seperate user just for justask to run in.  On FreeBSD, this
+is done with:
+
+    # pw user add justask
+
 ### Database
 
+At Retrospring, we were using PostgreSQL as the database backend.  The
+software might work on MySQL too, but that was not tested.
+
+Installation from Ports (using `portmaster`):
+
+    # portmaster databases/postgresql93-server
+
 #### PostgreSQL
 
     $ sudo -u postgres psql -d template1
@@ -23,11 +40,16 @@ Try connecting to the database:
 
     $ psql -U justask -d justask_production
 
+### nginx
+
+See [docs/nginx.conf](https://github.com/nilsding/justask/blob/master/docs/nginx.conf)
+for the configuration we used on Retrospring.
+
 ### justask
 
 #### Clone the Source
 
-    $ git clone https://git.rrerr.net/nilsding/justask.git justask
+    $ git clone https://github.com/nilsding/justask.git justask
 
 #### Configure It
 
@@ -72,7 +94,7 @@ Try connecting to the database:
     # Development mode:
     $ bundle exec rails server
 
-Create an account on your justask installation.
+Now, create an account on your justask installation.
 
 To make yourself an admin, just execute:
 
@@ -82,12 +104,12 @@ If you want to remove admin status from a certain user, you can do this:
 
     $ bundle exec rake 'justask:deadmin[get_rekt]' RAILS_ENV=production
 
-Add/remove moderators:
+Add/remove moderators (this can be done via the web interface by visiting an user as an admin):
 
     $ bundle exec rake 'justask:mod[someone_else]' RAILS_ENV=production
     $ bundle exec rake 'justask:demod[someone_else]' RAILS_ENV=production
 
-Add/remove supporters:
+Add/remove supporters (this can be done via the web interface by visiting an user as an admin/mod):
 
     $ bundle exec rake 'justask:sup[someone_else]' RAILS_ENV=production
     $ bundle exec rake 'justask:desup[someone_else]' RAILS_ENV=production
@@ -95,3 +117,14 @@ Add/remove supporters:
 Export user data:
 
     $ bundle exec rake 'justask:export[jdoe@example.tld]' RAILS_ENV=production
+
+Find the user(s) with the most self-asked anonymous questions:
+
+    $ bundle exec rake justask:loners
+
+## The Official Retrospring Closedown Soundtrack™
+
+* [Scooter - Can't Stop The Hardcore](https://www.youtube.com/watch?v=nJ3bet-Y79w)
+* [Darude - Sandstorm](https://www.youtube.com/watch?v=y6120QOlsfU)
+* [Max Raabe - Oops I Did It Again](https://www.youtube.com/watch?v=qYr9kIyambE)
+

From 47cbbed7193cc1283c4c112614cccb3d925291c4 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:28:42 +0200
Subject: [PATCH 126/231] made admin listing changeable in justask.yml

---
 app/views/static/about.html.haml | 22 ++++++++--------------
 config/justask.yml.example       | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 693446d5..625d81c9 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -13,20 +13,14 @@
           = succeed '!' do
             = APP_CONFIG['site_name']
           %br/
-          .media
-            .pull-left
-              %a{href: show_user_profile_path('pixeldesu')}
-                %img.img-rounded.answerbox--img{src: User.find_by_screen_name('pixeldesu').profile_picture.url(:medium)}
-            .media-body
-              %h4.entry-text.entry-about pixeldesu
-              %h6.entry-subtext Frontend Design & Layout
-          .media
-            .pull-left
-              %a{href: show_user_profile_path('Filippus')}
-                %img.img-rounded.answerbox--img{src: User.find_by_screen_name('Filippus').profile_picture.url(:medium)}
-            .media-body
-              %h4.entry-text.entry-about Filippus
-              %h6.entry-subtext Moderator Management & Support
+          - APP_CONFIG['admins'].each do |adm|
+            .media
+              .pull-left
+                %a{href: show_user_profile_path(adm['screen_name'])}
+                  %img.img-rounded.answerbox--img{src: User.find_by_screen_name(adm['screen_name']).profile_picture.url(:medium)}
+              .media-body
+                %h4.entry-text.entry-about= adm['about_text']
+                %h6.entry-subtext= adm['subtext']
       .panel.panel-default
         .panel-body
           %h3 Moderators
diff --git a/config/justask.yml.example b/config/justask.yml.example
index b5a5cf72..2fa3321b 100644
--- a/config/justask.yml.example
+++ b/config/justask.yml.example
@@ -28,4 +28,17 @@ sharing:
     consumer_secret: ''
 
 # Redis
-redis_url: "redis://localhost:6379"
\ No newline at end of file
+redis_url: "redis://localhost:6379"
+
+# Site admins
+admins:
+  - screen_name: 'nilsding'
+    about_text: nilsding
+    subtext: Backend, Server & Code
+  - screen_name: 'pixeldesu'
+    about_text: pixeldesu
+    subtext: Frontend Design & Layout
+  - screen_name: 'Filippus'
+    about_text: Filippus
+    subtext: Moderator Management & Support
+

From c357036047f8d8a5202a1bfaf6a29768ff398f04 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:29:42 +0200
Subject: [PATCH 127/231] removed deployment-related stuff

---
 Capfile                     | 24 --------------------
 config/deploy.rb            | 31 -------------------------
 config/deploy/production.rb |  7 ------
 config/deploy/staging.rb    | 45 -------------------------------------
 4 files changed, 107 deletions(-)
 delete mode 100644 Capfile
 delete mode 100644 config/deploy.rb
 delete mode 100644 config/deploy/production.rb
 delete mode 100644 config/deploy/staging.rb

diff --git a/Capfile b/Capfile
deleted file mode 100644
index 6e64843e..00000000
--- a/Capfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Load DSL and set up stages
-require 'capistrano/setup'
-
-# Include default deployment tasks
-require 'capistrano/deploy'
-
-# Include tasks from other gems included in your Gemfile
-#
-# For documentation on these, see for example:
-#
-#   https://github.com/capistrano/rvm
-#   https://github.com/capistrano/rbenv
-#   https://github.com/capistrano/chruby
-#   https://github.com/capistrano/bundler
-#   https://github.com/capistrano/rails
-#   https://github.com/capistrano/passenger
-#
-require 'capistrano/rvm'
-require 'capistrano/bundler'
-require 'capistrano/rails'
-require 'capistrano/console'
-
-# Load custom tasks from `lib/capistrano/tasks' if you have any defined
-Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/config/deploy.rb b/config/deploy.rb
deleted file mode 100644
index 01f44e6d..00000000
--- a/config/deploy.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# config valid only for current version of Capistrano
-lock '3.3.5'
-
-set :application, 'justask'
-set :repo_url, 'git@git.rrerr.net:justask/justask.git'
-ask :branch, :master
-set :deploy_to, '/home/justask/cap/'
-set :scm, :git
-set :format, :pretty
-set :log_level, :debug
-
-# RVM
-set :rvm_type, :user
-set :rvm_ruby_version, '2.0.0'
-
-# Rails
-set :conditionally_migrate, true
-
-namespace :deploy do
-
-  after :updated do
-
-  end
-
-  after :restart, :clear_cache do
-    on roles(:web), in: :groups, limit: 3, wait: 10 do
-
-    end
-  end
-
-end
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
deleted file mode 100644
index d79adf18..00000000
--- a/config/deploy/production.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-server 'rrerr.net', user: 'justask', roles: %w{web app}
-
-set :ssh_options, {
-  keys: %w(~/.ssh/id_rsa),
-  forward_agent: false,
-  auth_methods: %w(publickey)
-}
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
deleted file mode 100644
index e664a6cd..00000000
--- a/config/deploy/staging.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Simple Role Syntax
-# ==================
-# Supports bulk-adding hosts to roles, the primary server in each group
-# is considered to be the first unless any hosts have the primary
-# property set.  Don't declare `role :all`, it's a meta role.
-
-role :app, %w{deploy@example.com}
-role :web, %w{deploy@example.com}
-role :db,  %w{deploy@example.com}
-
-
-# Extended Server Syntax
-# ======================
-# This can be used to drop a more detailed server definition into the
-# server list. The second argument is a, or duck-types, Hash and is
-# used to set extended properties on the server.
-
-server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value
-
-
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult[net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start).
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# And/or per server (overrides global)
-# ------------------------------------
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }

From 434e1a21bc73ef5136fd9e955505cebab632114e Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:31:09 +0200
Subject: [PATCH 128/231] removed shutdown message

---
 app/views/static/index.html.haml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml
index 98982c4a..3f76c635 100644
--- a/app/views/static/index.html.haml
+++ b/app/views/static/index.html.haml
@@ -5,10 +5,6 @@
       = render 'shared/sidebar'
     .col-md-9.col-xs-12.col-sm-9.j2-col-reset
       = render 'layouts/messages'
-      .alert.alert-danger.alert-dismissible{role: "alert"}
-        %button.close{type: "button", "data-dismiss" => "alert"}
-          %span{"aria-hidden" => "true"} &times;
-        Retrospring will shut down on 31st March 2015!
       #timeline
         - @timeline.each do |answer|
           = render 'shared/answerbox', a: answer

From 9131b29d968c91c5bd4a77ecac50e4ec696eb383 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:32:13 +0200
Subject: [PATCH 129/231] removed capistrano gem

---
 .capistrano/metrics |  1 -
 Gemfile             |  5 -----
 Gemfile.lock        | 26 --------------------------
 3 files changed, 32 deletions(-)
 delete mode 100644 .capistrano/metrics

diff --git a/.capistrano/metrics b/.capistrano/metrics
deleted file mode 100644
index 94a4335e..00000000
--- a/.capistrano/metrics
+++ /dev/null
@@ -1 +0,0 @@
-full
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index c34fdbaa..752f53f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,11 +60,6 @@ gem 'redis'
 
 group :development do
   gem 'spring'
-
-  # Capistrano for deployment
-  gem 'capistrano', '~> 3.1'
-  gem 'capistrano-rvm', group: :rvm
-  gem 'capistrano-rails', '~> 1.1'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 50d396ef..2824f547 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,21 +44,6 @@ GEM
       railties (>= 3.1)
     buftok (0.2.0)
     builder (3.2.2)
-    capistrano (3.3.5)
-      capistrano-stats (~> 1.1.0)
-      i18n
-      rake (>= 10.0.0)
-      sshkit (~> 1.3)
-    capistrano-bundler (1.1.3)
-      capistrano (~> 3.1)
-      sshkit (~> 1.2)
-    capistrano-rails (1.1.2)
-      capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
-    capistrano-rvm (0.1.2)
-      capistrano (~> 3.0)
-      sshkit (~> 1.2)
-    capistrano-stats (1.1.1)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -79,7 +64,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    colorize (0.7.5)
     connection_pool (2.1.0)
     crass (1.0.1)
     daemons (1.1.9)
@@ -158,9 +142,6 @@ GEM
     mysql2 (0.3.17)
     naught (1.0.0)
     nested_form (0.3.2)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     nokogumbo (1.2.0)
@@ -303,10 +284,6 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sshkit (1.6.1)
-      colorize (>= 0.7.0)
-      net-scp (>= 1.1.2)
-      net-ssh (>= 2.8.0)
     sweetalert-rails (0.3.3)
       railties (>= 3.1.0)
     thin (1.6.3)
@@ -364,9 +341,6 @@ DEPENDENCIES
   bootstrap-sass (~> 3.2.0.1)
   bootstrap_form
   bootswatch-rails
-  capistrano (~> 3.1)
-  capistrano-rails (~> 1.1)
-  capistrano-rvm
   capybara
   coffee-rails (~> 4.1.0)
   database_cleaner

From 296308402f2b96ee5b395cc11830aa1d08c976bf Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:35:55 +0200
Subject: [PATCH 130/231] update README

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index a2294ac4..8ad42bac 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,12 @@
 This is the source code that powered Retrospring.  Yep, all of it.  Including
 all the branches where we left off.
 
+<!--
+Except for the memes that happened 4 hours before the shutdown.  I've edited
+it right on the server, without a special branch or something.  If you want
+to, I can make a branch with all the modifications we made.
+-->
+
 ## Requirements
 
 - UNIX-like system (Linux, FreeBSD, ...)

From 7c64b771c2e2a4c7d3751ead0f1a3c17fecf797d Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Fri, 1 Aug 2014 11:50:37 +0200
Subject: [PATCH 131/231] added license (AGPLv3)

---
 LICENSE | 662 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 662 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..a871fcfd
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
+

From 24c7cd49b982cd0ee679c1a25c3b39d449f56880 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:39:55 +0200
Subject: [PATCH 132/231] update README

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 8ad42bac..26a53b1a 100644
--- a/README.md
+++ b/README.md
@@ -134,3 +134,6 @@ Find the user(s) with the most self-asked anonymous questions:
 * [Darude - Sandstorm](https://www.youtube.com/watch?v=y6120QOlsfU)
 * [Max Raabe - Oops I Did It Again](https://www.youtube.com/watch?v=qYr9kIyambE)
 
+## License
+
+AGPLv3.  

From 337bf93bb730df6c7350020c19005527abf9524e Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 2 Apr 2015 01:47:21 +0200
Subject: [PATCH 133/231] update TODO, lel.

---
 TODO | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index d3161e88..f9c7619f 100644
--- a/TODO
+++ b/TODO
@@ -2,10 +2,8 @@ Not done:
 [001|  0%] user blocking (prohibits blocked user from asking question to that person and seeing their answers)
 [007|  0%] (?) keyboard shortcuts
 [010|  0%] locales (these can wait for now)
-[012|  0%] (?) open source the entire thing – in late 2015 or 2016 maybe, after we got bought by fakelook.
 [015|  0%] make a public accessible API (maybe even as an oauth provider?)
 [016|  5%] WRYYYYte more specs
-[017| 50%] write "terms of service" and a privacy policy.
 [018|  0%] that annoying "we use cookies" thing every website in the EU must? add
 [020|  0%] helper function for profile headings to resize on certain string length
 [022|  0%] recommended follows
@@ -34,3 +32,5 @@ Finished:
 [019|100%] omniAuth (twatter, fakelook, goggles plus) for social networking elitists
 [021|100%] deleting comments
     |----- restructure comment design
+[012|100%] (?) open source the entire thing – in late 2015 or 2016 maybe, after we got bought by fakelook.
+[017|100%] write "terms of service" and a privacy policy.

From e023987398aec3769fbbfcc80aa5b13ebad89db6 Mon Sep 17 00:00:00 2001
From: "Andreas N." <git@pixelde.su>
Date: Thu, 2 Apr 2015 02:07:17 +0200
Subject: [PATCH 134/231] Update TODO

---
 TODO | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index f9c7619f..42ab8b31 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,11 @@
 Not done:
 [001|  0%] user blocking (prohibits blocked user from asking question to that person and seeing their answers)
-[007|  0%] (?) keyboard shortcuts
+[007| 20%] (?) keyboard shortcuts
+    |----- Open "Ask your followers" with Ctrl/Meta+M
 [010|  0%] locales (these can wait for now)
+    |----- (somewhat) working in justask/feature-semantic
 [015|  0%] make a public accessible API (maybe even as an oauth provider?)
 [016|  5%] WRYYYYte more specs
-[018|  0%] that annoying "we use cookies" thing every website in the EU must? add
 [020|  0%] helper function for profile headings to resize on certain string length
 [022|  0%] recommended follows
 [023|  0%] disabling group-questions
@@ -29,6 +30,7 @@ Finished:
 [009|100%] a notification view or something
 [013|100%] restructure questions (has_many :answers) for less redundancy in the DB when implementing #002
 [014|100%] generate questions if there are none in the inbox (probably make it as a gem)
+[018|100%] that annoying "we use cookies" thing every website in the EU must? add
 [019|100%] omniAuth (twatter, fakelook, goggles plus) for social networking elitists
 [021|100%] deleting comments
     |----- restructure comment design

From 865bbbd6b95d9788336faae8385c66147f12b5bb Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sat, 18 Apr 2015 21:08:20 +0200
Subject: [PATCH 135/231] add Github link to footer

---
 app/views/shared/_links.html.haml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/views/shared/_links.html.haml b/app/views/shared/_links.html.haml
index 1c507e92..f2910364 100644
--- a/app/views/shared/_links.html.haml
+++ b/app/views/shared/_links.html.haml
@@ -5,10 +5,7 @@
   ·
   = link_to "About", about_path
   ·
-  = link_to "Bugs", 'https://github.com/retrospring/bugs/issues'
-  ·
-  / Tyler wanted this so much, here it is!
-  = link_to "Blog", 'https://blog.retrospring.net'
+  = link_to "Github", 'https://github.com/retrospring/retrospring'
   ·
   = link_to "Terms of Service", terms_path
   ·

From 723d72c5874216f20fa0a8f32aa16d6b96e70459 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sat, 18 Apr 2015 21:11:18 +0200
Subject: [PATCH 136/231] update about page

---
 app/views/static/about.html.haml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 625d81c9..555aff0a 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -34,11 +34,13 @@
     .col-sm-4
       .panel.panel-default
         .panel-body
-          %h3 Alpha version
-          %p This is an alpha version, full of bugs.  Caveat emptor.
+          %h3 Unfinished
+          %p Retrospring is running on unfinished code, full of bugs. Caveat emptor.
           %p
-            Found a bug?  Have an idea for a must-have feature?  Please
-            = link_to "report them!", 'https://github.com/retrospring/bugs/issues'
+            Want to contribute? If you are a Ruby developer, CoffeeScript coder or frontend designer, you can now help
+            = APP_CONFIG['site_name']
+            to get the features everyone wanted! If you are not, you can still report bugs at our 
+            = link_to "Github repository!", 'https://github.com/retrospring/retrospring'
 
           %p
             Still have some questions? Check our

From d46a6ecb38f479b09f013280b0ea5eab708ddff4 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sat, 18 Apr 2015 21:21:45 +0200
Subject: [PATCH 137/231] update about page

---
 app/views/static/about.html.haml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 555aff0a..4dbc5c4a 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -70,21 +70,9 @@
     .col-sm-4
       .panel.panel-default
         .panel-body
-          %h3 Donate
-          We are not backed by any company, but we need some money to keep
-          our server infrastructure running.
-
-          %form{:action => "https://www.paypal.com/cgi-bin/webscr", :method => "post", :target => "_top"}
-            %input{:name => "cmd", :type => "hidden", :value => "_s-xclick"}/
-            %input{:name => "hosted_button_id", :type => "hidden", :value => "6ZT5MS6UGU6HC"}/
-            %input{:alt => "PayPal - The safer, easier way to pay online!", :border => "0", :name => "submit", :src => "https://www.paypalobjects.com/en_US/AT/i/btn/btn_donateCC_LG.gif", :type => "image"}/
-            %img{:alt => "", :border => "0", :height => "1", :src => "https://www.paypalobjects.com/de_DE/i/scr/pixel.gif", :width => "1"}/
-
-          Want to support us over a longer timespan? We also have a Patreon campaign!
-          %a.btn.btn-primary.btn-block{href: "https://patreon.com/retrospring"} Patreon
-      .panel.panel-default
-        .panel-body
-          %h3 Patrons
+          %h3 Funding
+          Currently Retrospring is running of the developers funds and will be able to sustain at the current needs of servers. Hereby want to thank the people who previously donated to our project and helped it grow. Everyone shown at the bottom of this panel has contributed to the project with donations or great input.
+          %h3 Supporter
           People that believe in our vision, and that's why we love them <3
           %ul.about--moderator
             - User.where(supporter: true).each do |sup|

From af170671ec67afd374376a653978b4484e016be5 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sat, 18 Apr 2015 21:50:08 +0200
Subject: [PATCH 138/231] update gems

---
 Gemfile      |   2 +-
 Gemfile.lock | 221 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 123 insertions(+), 100 deletions(-)

diff --git a/Gemfile b/Gemfile
index 752f53f1..da648c94 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 source 'https://rails-assets.org'
 
-gem 'rails', '4.1.8'
+gem 'rails', '4.2.1'
 
 gem 'pg', group: :postgres
 gem 'mysql2', group: :mysql
diff --git a/Gemfile.lock b/Gemfile.lock
index 2824f547..0ccea24c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/retrospring/questiongenerator.git
-  revision: 326d82728a96ff58bad4516c46f9abba06ba31df
+  revision: 902de3d7f930a4f67bbbbc414cc3556cc7114839
   specs:
     questiongenerator (0.1.0)
 
@@ -8,38 +8,47 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actionmailer (4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.8)
-      actionview (= 4.1.8)
-      activesupport (= 4.1.8)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.8)
-      activesupport (= 4.1.8)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.8)
-      activesupport (= 4.1.8)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.8)
-      activemodel (= 4.1.8)
-      activesupport (= 4.1.8)
-      arel (~> 5.0.0)
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
-    bcrypt (3.1.9)
+    addressable (2.3.8)
+    arel (6.0.0)
+    bcrypt (3.1.10)
     bootstrap-sass (3.2.0.2)
       sass (~> 3.2)
-    bootstrap_form (2.2.0)
+    bootstrap_form (2.3.0)
     bootswatch-rails (3.2.4)
       railties (>= 3.1)
     buftok (0.2.0)
@@ -55,20 +64,20 @@ GEM
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.5)
+    cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
-    connection_pool (2.1.0)
-    crass (1.0.1)
-    daemons (1.1.9)
-    database_cleaner (1.3.0)
-    delayed_paperclip (2.9.0)
+    coffee-script-source (1.9.1.1)
+    connection_pool (2.2.0)
+    crass (1.0.2)
+    daemons (1.2.2)
+    database_cleaner (1.4.1)
+    delayed_paperclip (2.9.1)
       paperclip (>= 3.3)
     devise (3.4.1)
       bcrypt (~> 3.0)
@@ -81,11 +90,10 @@ GEM
       devise (~> 3.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    dotenv (1.0.2)
-    equalizer (0.0.9)
+    equalizer (0.0.11)
     erubis (2.7.0)
-    eventmachine (1.0.3)
-    execjs (2.2.2)
+    eventmachine (1.0.7)
+    execjs (2.5.2)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
@@ -93,7 +101,7 @@ GEM
       railties (>= 3.0.0)
     faker (1.4.3)
       i18n (~> 0.5)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
@@ -101,52 +109,56 @@ GEM
       railties (>= 3.2, < 5.0)
     font-kit-rails (1.1.0)
       rails
-    foreman (0.76.0)
-      dotenv (~> 1.0.2)
+    foreman (0.78.0)
       thor (~> 0.19.1)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
-    hashie (3.3.2)
+    hashie (3.4.1)
     hike (1.2.3)
     hitimes (1.2.2)
-    http (0.6.3)
+    http (0.6.4)
       http_parser.rb (~> 0.6.0)
-    http_accept_language (2.0.2)
+    http_accept_language (2.0.5)
     http_parser.rb (0.6.0)
-    i18n (0.6.11)
-    jbuilder (2.2.5)
+    i18n (0.7.0)
+    jbuilder (2.2.13)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.3)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
     jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
-    json (1.8.1)
-    kaminari (0.16.1)
+    json (1.8.2)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.9.2)
+    kgio (2.9.3)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
-    multi_json (1.10.1)
+    mini_portile (0.6.2)
+    minitest (5.6.0)
+    multi_json (1.11.0)
     multipart-post (2.0.0)
-    mysql2 (0.3.17)
+    mysql2 (0.3.18)
     naught (1.0.0)
     nested_form (0.3.2)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nokogumbo (1.2.0)
       nokogiri
-    nprogress-rails (0.1.6.3)
+    nprogress-rails (0.1.6.6)
     oauth (0.4.7)
     omniauth (1.2.2)
       hashie (>= 1.2, < 4)
@@ -165,39 +177,48 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    pg (0.17.1)
-    poltergeist (1.5.1)
+    pg (0.18.1)
+    poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    rack (1.5.2)
+    rack (1.6.0)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
       rack (~> 1.1)
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.8)
-      actionmailer (= 4.1.8)
-      actionpack (= 4.1.8)
-      actionview (= 4.1.8)
-      activemodel (= 4.1.8)
-      activerecord (= 4.1.8)
-      activesupport (= 4.1.8)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.8)
-      sprockets-rails (~> 2.0)
-    rails-assets-growl (1.2.4)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-assets-growl (1.2.5)
       rails-assets-jquery
-    rails-assets-jquery (2.1.1)
-    rails_admin (0.6.5)
+    rails-assets-jquery (2.1.3)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    rails_admin (0.6.7)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
       haml (~> 4.0)
-      jquery-rails (~> 3.0)
+      jquery-rails (>= 3.0, < 5)
       jquery-ui-rails (~> 5.0)
       kaminari (~> 0.14)
       nested_form (~> 0.3)
@@ -205,23 +226,23 @@ GEM
       rails (~> 4.0)
       remotipart (~> 1.0)
       safe_yaml (~> 1.0)
-      sass-rails (~> 4.0)
-    railties (4.1.8)
-      actionpack (= 4.1.8)
-      activesupport (= 4.1.8)
+      sass-rails (>= 4.0, < 6)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
-    redcarpet (3.2.2)
-    redis (3.2.0)
-    redis-namespace (1.5.1)
+    redcarpet (3.2.3)
+    redis (3.2.1)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     remotipart (1.2.1)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     rspec-core (3.0.4)
       rspec-support (~> 3.0.0)
     rspec-expectations (3.0.4)
@@ -238,9 +259,9 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    ruby-progressbar (1.7.0)
+    ruby-progressbar (1.7.5)
     safe_yaml (1.0.4)
-    sanitize (3.1.0)
+    sanitize (3.1.2)
       crass (~> 1.0.1)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.2.0)
@@ -253,45 +274,45 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    sidekiq (3.3.0)
+    sidekiq (3.3.3)
       celluloid (>= 0.16.0)
-      connection_pool (>= 2.0.0)
+      connection_pool (>= 2.1.1)
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
-    simple_oauth (0.3.0)
-    simplecov (0.9.1)
+    simple_oauth (0.3.1)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     simplecov-json (0.2)
       json
       simplecov
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.5)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    spring (1.2.0)
+      tilt (>= 1.3, < 3)
+    spring (1.3.4)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sweetalert-rails (0.3.3)
+    sweetalert-rails (0.5.0)
       railties (>= 3.1.0)
     thin (1.6.3)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0)
       rack (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
@@ -304,7 +325,7 @@ GEM
       simple_oauth
     turbolinks (2.5.3)
       coffee-rails
-    twitter (5.13.0)
+    twitter (5.14.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
       equalizer (~> 0.0.9)
@@ -317,7 +338,7 @@ GEM
       simple_oauth (~> 0.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicorn (4.8.3)
@@ -326,7 +347,9 @@ GEM
       raindrops (~> 0.7)
     warden (1.2.3)
       rack (>= 1.0)
-    websocket-driver (0.4.0)
+    websocket-driver (0.5.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     will_paginate (3.0.7)
     will_paginate-bootstrap (1.0.1)
       will_paginate (>= 3.0.3)
@@ -366,7 +389,7 @@ DEPENDENCIES
   pg
   poltergeist
   questiongenerator!
-  rails (= 4.1.8)
+  rails (= 4.2.1)
   rails-assets-growl
   rails_admin
   redcarpet

From 77c8026e2f00b2b8efef8111d9b018d7d0d26442 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sat, 18 Apr 2015 21:56:05 +0200
Subject: [PATCH 139/231] renamed config.serve_static_assets to
 config.serve_static_files

---
 config/environments/production.rb | 2 +-
 config/environments/test.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index f37fd1a3..62f40aeb 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -20,7 +20,7 @@ Rails.application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 053f5b66..0d6459df 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files   = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

From 71a7effa29746c899869bcd10870260ca9bb7869 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sat, 18 Apr 2015 22:01:00 +0200
Subject: [PATCH 140/231] changed faq entry

---
 app/views/static/faq.html.haml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/static/faq.html.haml b/app/views/static/faq.html.haml
index 5704b81a..aba7387b 100644
--- a/app/views/static/faq.html.haml
+++ b/app/views/static/faq.html.haml
@@ -119,5 +119,8 @@
             8. Is this open-source software?
       .panel-collapse.collapse{id: "collapseNine", role: "tabpanel", aria: {labelledby: "faqNine"}}
         .panel-body
-          Currently not. We haven't decided if we want to publish the underlying software stack at some point.
+          Yep!  #{APP_CONFIG['site_name']} runs
+          = succeed ',' do
+            %a{href: 'https://github.com/nilsding/justask'} justask
+          an open source (AGPLv3) question and answer platform.
 

From e1d20db3e076bb4006514c90325d9df852ba7348 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sat, 18 Apr 2015 22:06:36 +0200
Subject: [PATCH 141/231] update faq and about

---
 app/views/static/about.html.haml | 8 ++++----
 app/views/static/faq.html.haml   | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 4dbc5c4a..439835cf 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -35,7 +35,9 @@
       .panel.panel-default
         .panel-body
           %h3 Unfinished
-          %p Retrospring is running on unfinished code, full of bugs. Caveat emptor.
+          %p
+            = APP_CONFIG['site_name']
+            is running on unfinished code, full of bugs. Caveat emptor.
           %p
             Want to contribute? If you are a Ruby developer, CoffeeScript coder or frontend designer, you can now help
             = APP_CONFIG['site_name']
@@ -71,9 +73,7 @@
       .panel.panel-default
         .panel-body
           %h3 Funding
-          Currently Retrospring is running of the developers funds and will be able to sustain at the current needs of servers. Hereby want to thank the people who previously donated to our project and helped it grow. Everyone shown at the bottom of this panel has contributed to the project with donations or great input.
-          %h3 Supporter
-          People that believe in our vision, and that's why we love them <3
+          Currently Retrospring is running of the developers funds and will be able to sustain at the current needs of servers. Hereby we want to thank the people who previously donated to our project and helped it grow. Everyone shown at the bottom of this panel has contributed to the project with donations or great input.
           %ul.about--moderator
             - User.where(supporter: true).each do |sup|
               %a{href: show_user_profile_path(sup.screen_name), title: sup.screen_name, data: { toggle: :tooltip, placement: :top }}
diff --git a/app/views/static/faq.html.haml b/app/views/static/faq.html.haml
index aba7387b..554a4e5f 100644
--- a/app/views/static/faq.html.haml
+++ b/app/views/static/faq.html.haml
@@ -122,5 +122,7 @@
           Yep!  #{APP_CONFIG['site_name']} runs
           = succeed ',' do
             %a{href: 'https://github.com/nilsding/justask'} justask
-          an open source (AGPLv3) question and answer platform.
+          an open source (AGPLv3) question and answer platform. If you want to contribute or report bugs you find in  #{APP_CONFIG['site_name']}, please look at our 
+          = link_to "Github repository!", "https://github.com/retrospring/retrospring"
+
 

From c917f5f59d18bb72fdc4fcccb41ab14facecf45a Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sat, 18 Apr 2015 22:12:58 +0200
Subject: [PATCH 142/231] removed support

---
 app/validators/screen_name_validator.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/validators/screen_name_validator.rb b/app/validators/screen_name_validator.rb
index 9edbaa5c..4191dca4 100644
--- a/app/validators/screen_name_validator.rb
+++ b/app/validators/screen_name_validator.rb
@@ -1,5 +1,5 @@
 class ScreenNameValidator < ActiveModel::EachValidator
-  FORBIDDEN_SCREEN_NAMES = %w(justask_admin retrospring_admin admin justask retrospring support about public
+  FORBIDDEN_SCREEN_NAMES = %w(justask_admin retrospring_admin admin justask retrospring about public
                               notifications inbox sign_in sign_up sidekiq moderation moderator mod administrator
                               siteadmin site_admin help retro_spring retroospring retrosprlng niisding nllsding 
                               pixeidesu plxeldesu plxeidesu terms privacy)
@@ -9,4 +9,4 @@ class ScreenNameValidator < ActiveModel::EachValidator
       record.errors[attribute] << "Thou shalt not use this username!  Please choose another one."
     end
   end
-end
\ No newline at end of file
+end

From 87a68768c3f15b47e9aa7198f10c4305912a28c8 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Sun, 19 Apr 2015 02:45:47 +0530
Subject: [PATCH 143/231] Don't tag people in questions with twitter

---
 app/models/services/twitter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/services/twitter.rb b/app/models/services/twitter.rb
index 243536c7..b27720a9 100644
--- a/app/models/services/twitter.rb
+++ b/app/models/services/twitter.rb
@@ -28,7 +28,7 @@ class Services::Twitter < Service
 
     def prepare_tweet(answer)
       # TODO: improve this.
-      question_content = twitter_markdown answer.question.content
+      question_content = twitter_markdown answer.question.content.gsub(/\@(\w+)/, '\1')
       answer_content = twitter_markdown answer.content
       answer_url = show_user_answer_url(
         id: answer.id,
@@ -39,4 +39,4 @@ class Services::Twitter < Service
       "#{question_content[0..54]}#{'…' if question_content.length > 55}" \
         " — #{answer_content[0..55]}#{'…' if answer_content.length > 56} #{answer_url}"
     end
-end
\ No newline at end of file
+end

From e48f18bf7e99bd9df00f2080cf84aec40fc8fd1e Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sat, 18 Apr 2015 23:35:08 +0200
Subject: [PATCH 144/231] remove (markdown) parsing for questions in tweets

---
 app/models/services/twitter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/services/twitter.rb b/app/models/services/twitter.rb
index 243536c7..c632a8cf 100644
--- a/app/models/services/twitter.rb
+++ b/app/models/services/twitter.rb
@@ -28,7 +28,7 @@ class Services::Twitter < Service
 
     def prepare_tweet(answer)
       # TODO: improve this.
-      question_content = twitter_markdown answer.question.content
+      question_content = answer.question.content
       answer_content = twitter_markdown answer.content
       answer_url = show_user_answer_url(
         id: answer.id,
@@ -39,4 +39,4 @@ class Services::Twitter < Service
       "#{question_content[0..54]}#{'…' if question_content.length > 55}" \
         " — #{answer_content[0..55]}#{'…' if answer_content.length > 56} #{answer_url}"
     end
-end
\ No newline at end of file
+end

From 8453c4482736b52c043f1878bf61f4539a04fbd9 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sat, 18 Apr 2015 23:39:28 +0200
Subject: [PATCH 145/231] Revert "remove (markdown) parsing for questions in
 tweets"

This reverts commit e48f18bf7e99bd9df00f2080cf84aec40fc8fd1e.
---
 app/models/services/twitter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/services/twitter.rb b/app/models/services/twitter.rb
index c632a8cf..243536c7 100644
--- a/app/models/services/twitter.rb
+++ b/app/models/services/twitter.rb
@@ -28,7 +28,7 @@ class Services::Twitter < Service
 
     def prepare_tweet(answer)
       # TODO: improve this.
-      question_content = answer.question.content
+      question_content = twitter_markdown answer.question.content
       answer_content = twitter_markdown answer.content
       answer_url = show_user_answer_url(
         id: answer.id,
@@ -39,4 +39,4 @@ class Services::Twitter < Service
       "#{question_content[0..54]}#{'…' if question_content.length > 55}" \
         " — #{answer_content[0..55]}#{'…' if answer_content.length > 56} #{answer_url}"
     end
-end
+end
\ No newline at end of file

From 1032363b5ac2d303fe08c3a443bfd0239351d5f7 Mon Sep 17 00:00:00 2001
From: Howl <github@thehowl.it>
Date: Sat, 18 Apr 2015 23:45:52 +0200
Subject: [PATCH 146/231] fix horrible link section in about page

---
 app/assets/stylesheets/base.css.scss | 4 ++++
 app/views/shared/_links.html.haml    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 6eb4184f..911a7c3b 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -120,4 +120,8 @@ body {
 #growls.default{
   top:64px;
   right:10px
+}
+
+.links {
+  padding-bottom: 10px;
 }
\ No newline at end of file
diff --git a/app/views/shared/_links.html.haml b/app/views/shared/_links.html.haml
index f2910364..2d3294a9 100644
--- a/app/views/shared/_links.html.haml
+++ b/app/views/shared/_links.html.haml
@@ -1,4 +1,4 @@
-.centre.text-muted
+.centre.text-muted.links
   &copy;
   = Date.today.year
   = APP_CONFIG['site_name']

From e2bfc26c75cba0f1815a3626b0181fade84d490d Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Sun, 19 Apr 2015 03:47:13 +0530
Subject: [PATCH 147/231] Markdown preview through AJAX (/ajax/preview)

---
 app/controllers/ajax/question_controller.rb   | 16 ++++++++++++++++
 app/views/ajax/question/preview.json.jbuilder |  2 ++
 config/routes.rb                              |  3 ++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/views/ajax/question/preview.json.jbuilder

diff --git a/app/controllers/ajax/question_controller.rb b/app/controllers/ajax/question_controller.rb
index 68af9982..ddd0d095 100644
--- a/app/controllers/ajax/question_controller.rb
+++ b/app/controllers/ajax/question_controller.rb
@@ -46,4 +46,20 @@ class Ajax::QuestionController < ApplicationController
     @message = "Question asked successfully."
     @success = true
   end
+
+  def preview
+    params.require :md
+
+    @message = "Failed to render markdown."
+    begin
+      @markdown = markdown(params[:md], Time.new)
+      @message = "Successfully rendered markdown."
+    rescue
+      @status = :fail
+      @success = false
+      return
+    end
+    @status = :okay
+    @success = true
+  end
 end
diff --git a/app/views/ajax/question/preview.json.jbuilder b/app/views/ajax/question/preview.json.jbuilder
new file mode 100644
index 00000000..6bf01010
--- /dev/null
+++ b/app/views/ajax/question/preview.json.jbuilder
@@ -0,0 +1,2 @@
+json.partial! 'ajax/shared/status'
+json.markdown @markdown if @markdown
diff --git a/config/routes.rb b/config/routes.rb
index 1e1f1f3e..d4af3769 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,6 +81,7 @@ Rails.application.routes.draw do
     match '/create_group', to: 'group#create', via: :post, as: :create_group
     match '/destroy_group', to: 'group#destroy', via: :post, as: :destroy_group
     match '/group_membership', to: 'group#membership', via: :post, as: :group_membership
+    match '/preview', to: "question#preview", via: :post, as: :preview
   end
 
   match '/public', to: 'public#index', via: :get, as: :public_timeline
@@ -89,7 +90,7 @@ Rails.application.routes.draw do
   match '/notifications(/:type)', to: 'notifications#index', via: :get, as: :notifications, defaults: {type: 'all'}
 
   match '/inbox', to: 'inbox#show', via: 'get'
-  
+
   match '/user/:username(/p/:page)', to: 'user#show', via: 'get', defaults: {page: 1}
   match '/@:username(/p/:page)', to: 'user#show', via: 'get', as: :show_user_profile_alt, defaults: {page: 1}
   match '/@:username/a/:id', to: 'answer#show', via: 'get', as: :show_user_answer_alt

From 399bdf21eebcc8702859b87a7c4d0748bf087981 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 00:42:58 +0200
Subject: [PATCH 148/231] include MarkdownHelper

---
 app/controllers/ajax/question_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/ajax/question_controller.rb b/app/controllers/ajax/question_controller.rb
index 68af9982..d1da4359 100644
--- a/app/controllers/ajax/question_controller.rb
+++ b/app/controllers/ajax/question_controller.rb
@@ -1,4 +1,6 @@
 class Ajax::QuestionController < ApplicationController
+  include MarkdownHelper
+
   def create
     params.require :question
     params.require :anonymousQuestion

From 5ce34de74f50c46f1988c6240fcedf55b2579460 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 01:24:50 +0200
Subject: [PATCH 149/231] added Rack initializer

---
 config/initializers/rack.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/initializers/rack.rb

diff --git a/config/initializers/rack.rb b/config/initializers/rack.rb
new file mode 100644
index 00000000..554b1d85
--- /dev/null
+++ b/config/initializers/rack.rb
@@ -0,0 +1 @@
+Rack::Utils.multipart_part_limit = 0

From 74fbfd1b244ade7ba87aae6acb7792a8a543535e Mon Sep 17 00:00:00 2001
From: "Jona H." <jona@schisma.co>
Date: Sun, 19 Apr 2015 14:10:15 +0200
Subject: [PATCH 150/231] poweRS

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 26a53b1a..5958cf85 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # justask (aka. the software behind Retrospring)
 
-This is the source code that powered Retrospring.  Yep, all of it.  Including
+This is the source code that powers Retrospring.  Yep, all of it.  Including
 all the branches where we left off.
 
 <!--

From 5baa9f17de7be39f1bb1373cc52c594947c20711 Mon Sep 17 00:00:00 2001
From: "Jona H." <jona@schisma.co>
Date: Sun, 19 Apr 2015 15:14:09 +0200
Subject: [PATCH 151/231] present tense

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5958cf85..83bdff92 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Try connecting to the database:
 ### nginx
 
 See [docs/nginx.conf](https://github.com/nilsding/justask/blob/master/docs/nginx.conf)
-for the configuration we used on Retrospring.
+for the configuration we use on Retrospring.
 
 ### justask
 

From 66e853e8ca00898868be7b6c66fda1e233134e12 Mon Sep 17 00:00:00 2001
From: "Jona H." <jona@schisma.co>
Date: Sun, 19 Apr 2015 15:14:52 +0200
Subject: [PATCH 152/231] more things

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 83bdff92..a33236a2 100644
--- a/README.md
+++ b/README.md
@@ -110,12 +110,12 @@ If you want to remove admin status from a certain user, you can do this:
 
     $ bundle exec rake 'justask:deadmin[get_rekt]' RAILS_ENV=production
 
-Add/remove moderators (this can be done via the web interface by visiting an user as an admin):
+Add/remove moderators (this can also be done via the web interface by visiting an user as an admin):
 
     $ bundle exec rake 'justask:mod[someone_else]' RAILS_ENV=production
     $ bundle exec rake 'justask:demod[someone_else]' RAILS_ENV=production
 
-Add/remove supporters (this can be done via the web interface by visiting an user as an admin/mod):
+Add/remove supporters (this can also be done via the web interface by visiting an user as an admin/mod):
 
     $ bundle exec rake 'justask:sup[someone_else]' RAILS_ENV=production
     $ bundle exec rake 'justask:desup[someone_else]' RAILS_ENV=production
@@ -128,7 +128,7 @@ Find the user(s) with the most self-asked anonymous questions:
 
     $ bundle exec rake justask:loners
 
-## The Official Retrospring Closedown Soundtrack™
+## The Official Retrospring Closedown Soundtrack™ (now redundant)
 
 * [Scooter - Can't Stop The Hardcore](https://www.youtube.com/watch?v=nJ3bet-Y79w)
 * [Darude - Sandstorm](https://www.youtube.com/watch?v=y6120QOlsfU)

From 4e185bbaa7925b3b7e9fc996cb6e587591ef6e28 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sun, 19 Apr 2015 16:49:53 +0200
Subject: [PATCH 153/231] change Bootswatch theme, general theme changes, list
 group helper

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  4 +-
 app/assets/stylesheets/application.css.scss   |  4 +-
 app/assets/stylesheets/base.css.scss          | 11 ++++
 app/assets/stylesheets/scss/navbar.scss       | 16 +++++-
 app/assets/stylesheets/scss/user.scss         |  6 +--
 app/helpers/application_helper.rb             | 18 +++++++
 app/views/layouts/_profile.html.haml          | 51 ++++++++++---------
 .../_notification_tabs.html.haml              | 13 +++--
 app/views/shared/_sidebar.html.haml           | 11 ++--
 app/views/static/about.html.haml              | 17 ++++---
 app/views/user/_settings_tabs.html.haml       | 11 ++--
 12 files changed, 104 insertions(+), 60 deletions(-)

diff --git a/Gemfile b/Gemfile
index da648c94..9c48ce5a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'devise-async'
 gem 'bootstrap_form'
 gem 'font-kit-rails'
 gem 'nprogress-rails'
-gem 'font-awesome-rails', '~> 4.2.0.0'
+gem 'font-awesome-rails', '~> 4.3.0.0'
 gem 'rails-assets-growl'
 gem "paperclip", "~> 4.2"
 gem 'delayed_paperclip'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0ccea24c..e5e5c83a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
-    font-awesome-rails (4.2.0.0)
+    font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     font-kit-rails (1.1.0)
       rails
@@ -372,7 +372,7 @@ DEPENDENCIES
   devise-async
   factory_girl_rails
   faker
-  font-awesome-rails (~> 4.2.0.0)
+  font-awesome-rails (~> 4.3.0.0)
   font-kit-rails
   foreman
   haml
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 26273c74..bbe044c2 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -41,11 +41,11 @@ $navbar-inverse-toggle-hover-bg: #512da8;
 $navbar-inverse-toggle-icon-bar-bg: #7e57c2;
 $navbar-inverse-toggle-border-color: #512da8;
 
-@import "bootswatch/paper/variables";
+@import "bootswatch/cosmo/variables";
 
 @import "bootstrap";
 body { padding-top: $navbar-height; }
-@import "bootswatch/paper/bootswatch";
+@import "bootswatch/cosmo/bootswatch";
 
 @import "base";
 
diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 911a7c3b..64492254 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -124,4 +124,15 @@ body {
 
 .links {
   padding-bottom: 10px;
+}
+
+.panel {
+  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.25);
+  box-shadow: 0 3px 9px rgba(0, 0, 0, 0.25);
+  -webkit-background-clip: padding-box;
+  background-clip: padding-box;
+}
+
+.panel-default {
+  border-color: transparent;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 1511f8fb..388d08de 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -1,11 +1,13 @@
 .navbar .nav .badge {
   padding: 3px 6px 3px;
   background-color: $navbar-inverse-link-active-bg;
+  color: #fff;
 }
 
 .navbar .nav .active .badge, li.dropdown.open a.dropdown-toggle span.badge {
   padding: 3px 6px 3px;
   background-color: $navbar-inverse-bg;
+  color: #fff;
 }
 
 .navbar--inbox-animation {
@@ -117,6 +119,16 @@
 }
 
 .profile--image-dropdown > a {
-  padding-top: 16px !important;
-  padding-bottom: 16px !important;
+  padding: 0px !important;
+}
+
+.profile--image-avatar {
+  min-height: 50px;
+  min-width: 50px;
+  height: 50px;
+  width: 50px;  
+}
+
+.navbar-inverse {
+  border: none;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/scss/user.scss b/app/assets/stylesheets/scss/user.scss
index 9111b7c3..f53cc3ab 100644
--- a/app/assets/stylesheets/scss/user.scss
+++ b/app/assets/stylesheets/scss/user.scss
@@ -67,8 +67,6 @@
 }
 
 .profile--avatar {
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
   width: 100%;
   height: auto;
   border: medium none;
@@ -77,8 +75,8 @@
 .profile--panel-badge {
   width: 100%;
   text-align: center;
-  padding-top: 0.05em;
-  padding-bottom: 0.05em;
+  padding-top: 0.15em;
+  padding-bottom: 0.15em;
   text-transform: uppercase;
   font-weight: bold;
   margin: 0;
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5873f7db..627f3408 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -20,6 +20,24 @@ module ApplicationHelper
 
     content_tag(:li, link_to(body.html_safe, path), class: ("#{'active ' if current_page? path}#{options[:class]}"))
   end
+
+  def list_group_item(body, path, options = {})
+    options = {
+      badge: nil,
+      badge_color: nil,
+      class: ''
+    }.merge(options)
+
+    unless options[:badge].nil? or options[:badge] == 0
+      # TODO: make this prettier?
+      body << " #{
+        content_tag(:span, options[:badge], class: ("badge#{
+          " badge-#{options[:badge_color]}" unless options[:badge_color].nil?
+        }"))}"
+    end
+
+    content_tag(:a, body.html_safe, href: path, class: ("list-group-item #{'active ' if current_page? path}#{options[:class]}"))
+  end
   
   ##
   # 
diff --git a/app/views/layouts/_profile.html.haml b/app/views/layouts/_profile.html.haml
index 49d16329..b7ab872a 100644
--- a/app/views/layouts/_profile.html.haml
+++ b/app/views/layouts/_profile.html.haml
@@ -1,33 +1,36 @@
 %li.dropdown.profile--image-dropdown
   %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
-    %img.img-rounded.answerbox--img.hidden-xs{src: current_user.profile_picture.url(:small)}
+    %img.profile--image-avatar.hidden-xs{src: current_user.profile_picture.url(:small)}
     %span.visible-xs
       = current_user.screen_name
       %b.caret
-  %ul.dropdown-menu.profile--dropdown
-    %li.hidden-xs
-      .media.profile--dropdown-media
-        .pull-left
-          %img.img-rounded.profile--dropdown-img{src: current_user.profile_picture.url(:medium)}
-        .media-body
-          - if current_user.display_name.blank?
-            .profile--dropdown-username
-              %a{href: show_user_profile_path(current_user.screen_name)}
-                = current_user.screen_name
-          - else
-            .profile--dropdown-displayname
-              %a{href: show_user_profile_path(current_user.screen_name)}
-                = current_user.display_name
-            .profile--username
-              = current_user.screen_name
-    %li.divider.hidden-xs
-    %li.visible-xs= link_to "View profile", show_user_profile_path(current_user.screen_name)
-    %li= link_to "Settings", edit_user_registration_path
+  %ul.dropdown-menu
+    %li.dropdown-header.hidden-xs= current_user.screen_name
+    %li
+      %a{href: show_user_profile_path(current_user.screen_name)}
+        %i.fa.fa-fw.fa-user
+        View profile
+    %li
+      %a{href: edit_user_registration_path}
+        %i.fa.fa-fw.fa-cog
+        Settings
     %li.divider
     - if current_user.admin?
-      %li= link_to "Kontrollzentrum", rails_admin_path
-      %li= link_to "Sidekiq", sidekiq_web_path
+      %li
+        %a{href: rails_admin_path}
+          %i.fa.fa-fw.fa-cogs
+          Kontrollzentrum
+      %li
+        %a{href: sidekiq_web_path}
+          %i.fa.fa-fw.fa-bar-chart
+          Sidekiq
     - if current_user.mod?
-      %li= link_to "Moderation panel", moderation_path
+      %li
+        %a{href: moderation_path}
+          %i.fa.fa-fw.fa-gavel
+          Moderation Panel
       %li.divider
-    %li= link_to "Logout",  destroy_user_session_path, method: :delete
\ No newline at end of file
+    %li
+      %a{href: destroy_user_session_path, data: {method: :delete} }
+        %i.fa.fa-fw.fa-sign-out
+        Logout
\ No newline at end of file
diff --git a/app/views/notifications/_notification_tabs.html.haml b/app/views/notifications/_notification_tabs.html.haml
index 16f73e5d..7224f9db 100644
--- a/app/views/notifications/_notification_tabs.html.haml
+++ b/app/views/notifications/_notification_tabs.html.haml
@@ -1,9 +1,8 @@
 .col-md-3.col-xs-12.col-sm-3
   .panel.panel-default.hidden-xs
-    .panel-body
-      %ul.nav.nav-pills.nav-stacked
-        = nav_entry "All notifications", notifications_path
-        = nav_entry "Answers", notifications_path('answer')
-        = nav_entry "Smiles", notifications_path('smile')
-        = nav_entry "Comments", notifications_path('comment')
-        = nav_entry "Followers", notifications_path('relationship')
\ No newline at end of file
+    .list-group
+      = list_group_item "All notifications", notifications_path, badge: Notification.where(new: true).count
+      = list_group_item "Answers", notifications_path('answer'), badge: Notification.where(target_type: "Answer", new: true).count
+      = list_group_item "Smiles", notifications_path('smile'), badge: Notification.where(target_type: "Smile", new: true).count
+      = list_group_item "Comments", notifications_path('comment'), badge: Notification.where(target_type: "Comment", new: true).count
+      = list_group_item "Followers", notifications_path('relationship'), badge: Notification.where(target_type: "Relationship", new: true).count
\ No newline at end of file
diff --git a/app/views/shared/_sidebar.html.haml b/app/views/shared/_sidebar.html.haml
index 34018942..ec135868 100644
--- a/app/views/shared/_sidebar.html.haml
+++ b/app/views/shared/_sidebar.html.haml
@@ -23,12 +23,11 @@
           %h4.entry-text#friend-count= current_user.friend_count
           %h6.entry-subtext Following
 .panel.panel-default.hidden-xs
-  .panel-body
-    %ul.nav.nav-pills.nav-stacked
-      = nav_entry "Timeline", root_path
-      = nav_entry "Public", public_timeline_path
-      - current_user.groups.each do |group|
-        = nav_entry group.display_name, group_timeline_path(group.name)
+  %ul.nav.nav-pills.nav-stacked
+    = list_group_item "Timeline", root_path
+    = list_group_item "Public", public_timeline_path
+    - current_user.groups.each do |group|
+      = list_group_item group.display_name, group_timeline_path(group.name)
 - unless @group.nil?
   .panel.panel-default.profile--panel.hidden-xs
     .panel-heading
diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 439835cf..7f200cbb 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -7,8 +7,9 @@
   .row
     .col-sm-4
       .panel.panel-default
+        .panel-heading
+          %h3.panel-title The Team
         .panel-body
-          %h3 The Team
           The people behind
           = succeed '!' do
             = APP_CONFIG['site_name']
@@ -22,8 +23,9 @@
                 %h4.entry-text.entry-about= adm['about_text']
                 %h6.entry-subtext= adm['subtext']
       .panel.panel-default
+        .panel-heading
+          %h3.panel-title Moderators
         .panel-body
-          %h3 Moderators
           The people on
           = APP_CONFIG['site_name']
           that look after you!
@@ -33,8 +35,9 @@
                 %img.img-rounded.answerbox--img-small{src: mod.profile_picture.url(:small)}
     .col-sm-4
       .panel.panel-default
+        .panel-heading
+          %h3.panel-title Unfinished Project
         .panel-body
-          %h3 Unfinished
           %p
             = APP_CONFIG['site_name']
             is running on unfinished code, full of bugs. Caveat emptor.
@@ -48,9 +51,10 @@
             Still have some questions? Check our
             = link_to "FAQ!", help_faq_path
       .panel.panel-default
+        .panel-heading
+          %h3.panel-title Statistics
         .panel-body
-          There are lies, damned lies, and then there are...
-          %h3 Statistics
+          %p All-time statistics for #{APP_CONFIG['site_name']}
           .row
             .col-xs-6
               %h4.entry-text#asked-count= Question.count
@@ -71,8 +75,9 @@
               %h6.entry-subtext Users
     .col-sm-4
       .panel.panel-default
+        .panel-heading
+          %h3.panel-title Funding
         .panel-body
-          %h3 Funding
           Currently Retrospring is running of the developers funds and will be able to sustain at the current needs of servers. Hereby we want to thank the people who previously donated to our project and helped it grow. Everyone shown at the bottom of this panel has contributed to the project with donations or great input.
           %ul.about--moderator
             - User.where(supporter: true).each do |sup|
diff --git a/app/views/user/_settings_tabs.html.haml b/app/views/user/_settings_tabs.html.haml
index 8bfe3c00..5583da38 100644
--- a/app/views/user/_settings_tabs.html.haml
+++ b/app/views/user/_settings_tabs.html.haml
@@ -1,11 +1,10 @@
 .col-md-3.col-xs-12.col-sm-3
   .panel.panel-default
-    .panel-body
-      %ul.nav.nav-pills.nav-stacked
-        = nav_entry "Account", edit_user_registration_path
-        = nav_entry "Profile", edit_user_profile_path
-        = nav_entry "Privacy", edit_user_privacy_path
-        = nav_entry "Sharing", services_path
+    .list-group
+      = list_group_item "Account", edit_user_registration_path
+      = list_group_item "Profile", edit_user_profile_path
+      = list_group_item "Privacy", edit_user_privacy_path
+      = list_group_item "Sharing", services_path
 
   
   .hidden-xs= render "shared/links"
\ No newline at end of file

From 55b2a98450bdf36845000d12d185adc56972e8d4 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 17:07:35 +0200
Subject: [PATCH 154/231] fixed notification badge fuckup

---
 app/views/notifications/_notification_tabs.html.haml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/notifications/_notification_tabs.html.haml b/app/views/notifications/_notification_tabs.html.haml
index 7224f9db..1849d32e 100644
--- a/app/views/notifications/_notification_tabs.html.haml
+++ b/app/views/notifications/_notification_tabs.html.haml
@@ -1,8 +1,8 @@
 .col-md-3.col-xs-12.col-sm-3
   .panel.panel-default.hidden-xs
     .list-group
-      = list_group_item "All notifications", notifications_path, badge: Notification.where(new: true).count
-      = list_group_item "Answers", notifications_path('answer'), badge: Notification.where(target_type: "Answer", new: true).count
-      = list_group_item "Smiles", notifications_path('smile'), badge: Notification.where(target_type: "Smile", new: true).count
-      = list_group_item "Comments", notifications_path('comment'), badge: Notification.where(target_type: "Comment", new: true).count
-      = list_group_item "Followers", notifications_path('relationship'), badge: Notification.where(target_type: "Relationship", new: true).count
\ No newline at end of file
+      = list_group_item "All notifications", notifications_path, badge: Notification.for(current_user).where(new: true).count
+      = list_group_item "Answers", notifications_path('answer'), badge: Notification.for(current_user).where(target_type: "Answer", new: true).count
+      = list_group_item "Smiles", notifications_path('smile'), badge: Notification.for(current_user).where(target_type: "Smile", new: true).count
+      = list_group_item "Comments", notifications_path('comment'), badge: Notification.for(current_user).where(target_type: "Comment", new: true).count
+      = list_group_item "Followers", notifications_path('relationship'), badge: Notification.for(current_user).where(target_type: "Relationship", new: true).count

From af9c905165cfa134191f94ea557eb06346daa6c6 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:24:36 +0200
Subject: [PATCH 155/231] added contributor column to users

---
 db/migrate/20150419201122_add_contributor_to_users.rb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20150419201122_add_contributor_to_users.rb

diff --git a/db/migrate/20150419201122_add_contributor_to_users.rb b/db/migrate/20150419201122_add_contributor_to_users.rb
new file mode 100644
index 00000000..b105796b
--- /dev/null
+++ b/db/migrate/20150419201122_add_contributor_to_users.rb
@@ -0,0 +1,5 @@
+class AddContributorToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :contributor, :boolean, default: :false
+  end
+end

From e671990a36d6fda77c204222a3872d309408543b Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:24:48 +0200
Subject: [PATCH 156/231] added contributor rake task

---
 Rakefile | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Rakefile b/Rakefile
index 61aa95b2..9f233c58 100644
--- a/Rakefile
+++ b/Rakefile
@@ -153,6 +153,26 @@ namespace :justask do
     puts "#{user.screen_name} is no longer an supporter."
   end
 
+  desc "Gives contributor status to an user."
+  task :contrib, [:screen_name] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    fail "user #{args[:screen_name]} not found" if user.nil?
+    user.contributor = true
+    user.save!
+    puts "#{user.screen_name} is now a contributor."
+  end
+
+  desc "Removes contributor status from an user."
+  task :decontrib, [:screen_name] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    fail "user #{args[:screen_name]} not found" if user.nil?
+    user.contributor = false
+    user.save!
+    puts "#{user.screen_name} is no longer a contributor."
+  end
+
   desc "Lists all users."
   task lusers: :environment do
     User.all.each do |u|

From ced880fe34ef39b6a898a83471355d745f096766 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:25:04 +0200
Subject: [PATCH 157/231] made contributor badge changable via web interface

---
 app/controllers/ajax/moderation_controller.rb | 2 +-
 app/views/user/_modal_privileges.html.haml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ajax/moderation_controller.rb b/app/controllers/ajax/moderation_controller.rb
index 2a635651..12580420 100644
--- a/app/controllers/ajax/moderation_controller.rb
+++ b/app/controllers/ajax/moderation_controller.rb
@@ -118,7 +118,7 @@ class Ajax::ModerationController < ApplicationController
     target_user = User.find_by_screen_name(params[:user])
 
     @message = "nope!"
-    return unless %w(banned blogger supporter moderator admin).include? params[:type].downcase
+    return unless %w(banned blogger supporter moderator admin contributor).include? params[:type].downcase
 
     if (%w(supporter moderator admin).include?(params[:type].downcase) and !current_user.admin?) or
       (params[:type].downcase == 'banned' and target_user.admin?)
diff --git a/app/views/user/_modal_privileges.html.haml b/app/views/user/_modal_privileges.html.haml
index 9e1a041b..3edbb981 100644
--- a/app/views/user/_modal_privileges.html.haml
+++ b/app/views/user/_modal_privileges.html.haml
@@ -14,9 +14,10 @@
         - unless @user.admin?
           = render 'user/modal_privileges_item', privilege: 'banned', description: 'Hit the user with ye olde banhammer', user: @user
         = render 'user/modal_privileges_item', privilege: 'blogger', description: 'The user gets that privilege if they blogged something (nice) about Retrospring.', user: @user
+        = render 'user/modal_privileges_item', privilege: 'contributor', description: "This user has contributed to justask#{" (the software behind #{APP_CONFIG['site_name']})" unless APP_CONFIG['site_name'] == 'justask'}.", user: @user
         - if current_user.admin?
           = render 'user/modal_privileges_item', privilege: 'supporter', description: 'This user monetarily supports the site', user: @user
           = render 'user/modal_privileges_item', privilege: 'moderator', description: 'Someone trustworthy enough to help managing reports',user: @user
           = render 'user/modal_privileges_item', privilege: 'admin', description: 'This user is part of the core team', user: @user
       .modal-footer
-        %button.btn.btn-primary{name: 'checked-privileges', type: :button, data: { dismiss: :modal }} Done
\ No newline at end of file
+        %button.btn.btn-primary{name: 'checked-privileges', type: :button, data: { dismiss: :modal }} Done

From c9b7e71290c1cb9c13a1178a465dda7c1a626ecf Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:25:21 +0200
Subject: [PATCH 158/231] added contributor badge to user profile view

---
 app/views/user/_profile_info.html.haml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/user/_profile_info.html.haml b/app/views/user/_profile_info.html.haml
index cdd4878d..f0f9f9ce 100644
--- a/app/views/user/_profile_info.html.haml
+++ b/app/views/user/_profile_info.html.haml
@@ -12,6 +12,10 @@
     .profile--panel-badge.panel-badge-warning
       %i.fa.fa-star
       Supporter
+  - if @user.contributor?
+    .profile--panel-badge.panel-badge-primary
+      %i.fa.fa-github
+      Contributor
   - if @user.blogger?
     .profile--panel-badge.panel-badge-info
       %i.fa.fa-pencil
@@ -43,4 +47,4 @@
         %i.fa.fa-location-arrow
         = @user.location
     = render 'user/actions', user: @user, type: :follower
-= render 'user/stats', user: @user
\ No newline at end of file
+= render 'user/stats', user: @user

From 04f157bebb28c96ffdfaf02d815c859846d1eebb Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:30:54 +0200
Subject: [PATCH 159/231] schema

---
 db/schema.rb | 74 ++++++++++++----------------------------------------
 1 file changed, 16 insertions(+), 58 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index d9f6fe4c..4e3d67ca 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,12 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150125191224) do
+ActiveRecord::Schema.define(version: 20150419201122) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "answers", force: true do |t|
+  create_table "answers", force: :cascade do |t|
     t.text     "content"
     t.integer  "question_id"
     t.integer  "comment_count", default: 0, null: false
@@ -28,7 +28,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
 
   add_index "answers", ["user_id", "created_at"], name: "index_answers_on_user_id_and_created_at", using: :btree
 
-  create_table "comments", force: true do |t|
+  create_table "comments", force: :cascade do |t|
     t.string   "content"
     t.integer  "answer_id"
     t.integer  "user_id"
@@ -38,7 +38,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
 
   add_index "comments", ["user_id", "created_at"], name: "index_comments_on_user_id_and_created_at", using: :btree
 
-  create_table "group_members", force: true do |t|
+  create_table "group_members", force: :cascade do |t|
     t.integer  "group_id",   null: false
     t.integer  "user_id",    null: false
     t.datetime "created_at"
@@ -49,7 +49,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
   add_index "group_members", ["group_id"], name: "index_group_members_on_group_id", using: :btree
   add_index "group_members", ["user_id"], name: "index_group_members_on_user_id", using: :btree
 
-  create_table "groups", force: true do |t|
+  create_table "groups", force: :cascade do |t|
     t.integer  "user_id",                     null: false
     t.string   "name"
     t.string   "display_name"
@@ -62,7 +62,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
   add_index "groups", ["user_id", "name"], name: "index_groups_on_user_id_and_name", unique: true, using: :btree
   add_index "groups", ["user_id"], name: "index_groups_on_user_id", using: :btree
 
-  create_table "inboxes", force: true do |t|
+  create_table "inboxes", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "question_id"
     t.boolean  "new"
@@ -70,7 +70,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
     t.datetime "updated_at"
   end
 
-  create_table "moderation_comments", force: true do |t|
+  create_table "moderation_comments", force: :cascade do |t|
     t.integer  "report_id"
     t.integer  "user_id"
     t.string   "content"
@@ -80,7 +80,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
 
   add_index "moderation_comments", ["user_id", "created_at"], name: "index_moderation_comments_on_user_id_and_created_at", using: :btree
 
-  create_table "moderation_votes", force: true do |t|
+  create_table "moderation_votes", force: :cascade do |t|
     t.integer  "report_id",                  null: false
     t.integer  "user_id",                    null: false
     t.boolean  "upvote",     default: false, null: false
@@ -92,7 +92,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
   add_index "moderation_votes", ["user_id", "report_id"], name: "index_moderation_votes_on_user_id_and_report_id", unique: true, using: :btree
   add_index "moderation_votes", ["user_id"], name: "index_moderation_votes_on_user_id", using: :btree
 
-  create_table "notifications", force: true do |t|
+  create_table "notifications", force: :cascade do |t|
     t.string   "target_type"
     t.integer  "target_id"
     t.integer  "recipient_id"
@@ -101,50 +101,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
     t.datetime "updated_at"
   end
 
-  create_table "oauth_access_grants", force: true do |t|
-    t.integer  "resource_owner_id", null: false
-    t.integer  "application_id",    null: false
-    t.string   "token",             null: false
-    t.integer  "expires_in",        null: false
-    t.text     "redirect_uri",      null: false
-    t.datetime "created_at",        null: false
-    t.datetime "revoked_at"
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
-
-  create_table "oauth_access_tokens", force: true do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             null: false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at",        null: false
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
-  add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
-  add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
-
-  create_table "oauth_applications", force: true do |t|
-    t.string   "name",                      null: false
-    t.string   "uid",                       null: false
-    t.string   "secret",                    null: false
-    t.text     "redirect_uri",              null: false
-    t.string   "scopes",       default: "", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-  end
-
-  add_index "oauth_applications", ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
-  add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
-
-  create_table "questions", force: true do |t|
+  create_table "questions", force: :cascade do |t|
     t.string   "content"
     t.boolean  "author_is_anonymous"
     t.string   "author_name"
@@ -157,7 +114,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
 
   add_index "questions", ["user_id", "created_at"], name: "index_questions_on_user_id_and_created_at", using: :btree
 
-  create_table "relationships", force: true do |t|
+  create_table "relationships", force: :cascade do |t|
     t.integer  "source_id"
     t.integer  "target_id"
     t.datetime "created_at"
@@ -168,7 +125,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
   add_index "relationships", ["source_id"], name: "index_relationships_on_source_id", using: :btree
   add_index "relationships", ["target_id"], name: "index_relationships_on_target_id", using: :btree
 
-  create_table "reports", force: true do |t|
+  create_table "reports", force: :cascade do |t|
     t.string   "type",                       null: false
     t.integer  "target_id",                  null: false
     t.integer  "user_id",                    null: false
@@ -177,7 +134,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
     t.boolean  "deleted",    default: false
   end
 
-  create_table "services", force: true do |t|
+  create_table "services", force: :cascade do |t|
     t.string   "type",          null: false
     t.integer  "user_id",       null: false
     t.string   "uid"
@@ -188,7 +145,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
     t.datetime "updated_at"
   end
 
-  create_table "smiles", force: true do |t|
+  create_table "smiles", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "answer_id"
     t.datetime "created_at"
@@ -199,7 +156,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
   add_index "smiles", ["user_id", "answer_id"], name: "index_smiles_on_user_id_and_answer_id", unique: true, using: :btree
   add_index "smiles", ["user_id"], name: "index_smiles_on_user_id", using: :btree
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "email",                             default: "",    null: false
     t.string   "encrypted_password",                default: "",    null: false
     t.string   "reset_password_token"
@@ -242,6 +199,7 @@ ActiveRecord::Schema.define(version: 20150125191224) do
     t.boolean  "privacy_show_in_search",            default: true
     t.boolean  "banned",                            default: false
     t.boolean  "blogger",                           default: false
+    t.boolean  "contributor",                       default: false
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree

From 7b637fd81b49abe0a72a808be4b397744a7f768a Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:31:14 +0200
Subject: [PATCH 160/231] added contributors to about section

---
 app/views/static/about.html.haml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 7f200cbb..048cff1b 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -83,5 +83,18 @@
             - User.where(supporter: true).each do |sup|
               %a{href: show_user_profile_path(sup.screen_name), title: sup.screen_name, data: { toggle: :tooltip, placement: :top }}
                 %img.img-rounded.answerbox--img-small{src: sup.profile_picture.url(:medium)}
+      .panel.panel-default
+        .panel-heading
+          %h3.panel-title Contributors
+        .panel-body
+          %p These people have contributed to #{APP_CONFIG['site_name']}'s source code.
+          %p
+            Want to get listed here?
+            = link_to "Fork this repo", 'https://github.com/retrospring/retrospring'
+            and create a new pull request with your changes.
+          %ul.about--moderator
+            - User.where(contributor: true).each do |sup|
+              %a{href: show_user_profile_path(sup.screen_name), title: sup.screen_name, data: { toggle: :tooltip, placement: :top }}
+                %img.img-rounded.answerbox--img-small{src: sup.profile_picture.url(:medium)}
 
 = render "shared/links"

From d669d66d4abe6855df6bb62011e5013db5002e60 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:36:50 +0200
Subject: [PATCH 161/231] formatting

---
 app/views/static/about.html.haml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 048cff1b..9b1ac4b7 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -26,9 +26,10 @@
         .panel-heading
           %h3.panel-title Moderators
         .panel-body
-          The people on
-          = APP_CONFIG['site_name']
-          that look after you!
+          %p
+            The people on
+            = APP_CONFIG['site_name']
+            that look after you!
           %ul.about--moderator
             - User.where(moderator: true).each do |mod|
               %a{href: show_user_profile_path(mod.screen_name), title: mod.screen_name, data: { toggle: :tooltip, placement: :top }}
@@ -44,8 +45,9 @@
           %p
             Want to contribute? If you are a Ruby developer, CoffeeScript coder or frontend designer, you can now help
             = APP_CONFIG['site_name']
-            to get the features everyone wanted! If you are not, you can still report bugs at our 
-            = link_to "Github repository!", 'https://github.com/retrospring/retrospring'
+            to get the features everyone wanted.  If that's not the case, you can still report bugs at our
+            = succeed '.' do
+              = link_to "Github repository", 'https://github.com/retrospring/retrospring'
 
           %p
             Still have some questions? Check our
@@ -78,7 +80,7 @@
         .panel-heading
           %h3.panel-title Funding
         .panel-body
-          Currently Retrospring is running of the developers funds and will be able to sustain at the current needs of servers. Hereby we want to thank the people who previously donated to our project and helped it grow. Everyone shown at the bottom of this panel has contributed to the project with donations or great input.
+          %p Currently Retrospring is running of the developers funds and will be able to sustain at the current needs of servers. Hereby we want to thank the people who previously donated to our project and helped it grow. Everyone shown at the bottom of this panel has contributed to the project with donations or great input.
           %ul.about--moderator
             - User.where(supporter: true).each do |sup|
               %a{href: show_user_profile_path(sup.screen_name), title: sup.screen_name, data: { toggle: :tooltip, placement: :top }}

From b6499ddd42481b6cd7a248224574aff8bb48b6ef Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:38:10 +0200
Subject: [PATCH 162/231] UNCAPS!!!!!!!!!!!

---
 app/views/user/_modal_privileges_item.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/user/_modal_privileges_item.html.haml b/app/views/user/_modal_privileges_item.html.haml
index 799b2892..92d498dd 100644
--- a/app/views/user/_modal_privileges_item.html.haml
+++ b/app/views/user/_modal_privileges_item.html.haml
@@ -6,4 +6,4 @@
     .media-body
       .list-group-item-heading= privilege.capitalize
       - unless description.blank?
-        .list-group-item-text.text-muted.j2-up= description
\ No newline at end of file
+        .list-group-item-text.text-muted= description

From fe707aeae77dbc4ef70d2074e7ee9e21826f2ad7 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Sun, 19 Apr 2015 22:40:00 +0200
Subject: [PATCH 163/231] removed unneeded binstubs

---
 bin/cap    | 16 ----------------
 bin/capify | 16 ----------------
 2 files changed, 32 deletions(-)
 delete mode 100755 bin/cap
 delete mode 100755 bin/capify

diff --git a/bin/cap b/bin/cap
deleted file mode 100755
index 30352d4d..00000000
--- a/bin/cap
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'cap' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('capistrano', 'cap')
diff --git a/bin/capify b/bin/capify
deleted file mode 100755
index 0f486e81..00000000
--- a/bin/capify
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'capify' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('capistrano', 'capify')

From 40b32975ea55daa02ae7e0bdf66386da4d797fd4 Mon Sep 17 00:00:00 2001
From: schisma <jona@schisma.co>
Date: Sun, 19 Apr 2015 23:13:53 +0200
Subject: [PATCH 164/231] new 404 page

---
 public/404.html | 87 +++++++++++++------------------------------------
 1 file changed, 22 insertions(+), 65 deletions(-)

diff --git a/public/404.html b/public/404.html
index a3f3bc01..4d04dc20 100644
--- a/public/404.html
+++ b/public/404.html
@@ -4,83 +4,40 @@
   <title>Page not found!!1! (404)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-    body {
-      background-color: #EFEFEF;
-      color: #2E2F30;
-      text-align: center;
-      font-family: arial, sans-serif;
+    body { 
+      padding: 0;
       margin: 0;
-    }
-
-    a { color: #4183c4; text-decoration: none; }
-    a:hover { text-decoration: underline; }
-
-    div.dialog {
-      width: 95%;
-      max-width: 33em;
-      margin: 4em auto 0;
-    }
-
-    div.dialog > div {
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #BBB;
-      border-top: #00A0F0 solid 4px;
-      border-top-left-radius: 9px;
-      border-top-right-radius: 9px;
-      background-color: white;
-      padding: 7px 12% 0;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+      overflow: hidden;
     }
 
     h1 {
-      font-size: 100%;
-      color: #0b79C5;
-      line-height: 1.5em;
+      font-family: sans-serif;
+      font-size: 1.5em;
+      margin-left: 10px;
+      margin-top: 10px;
     }
 
-    div.dialog img { margin-bottom: 0.5em; }
-
-    div.dialog > p {
-      margin: 0 0 1em;
-      padding: 1em;
-      background-color: #F7F7F7;
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #999;
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px;
-      border-top-color: #DADADA;
-      color: #666;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+    h1 > small {
+      font-size: 0.7em;
+      font-weight: 300;
     }
 
-    div.links {
-      margin-top: 2em;
-      color: #999;
-    }
+    @media only screen and (max-device-width: 480px) {
+      canvas {
+        display: none;
+      }
 
-    div.links a {
-      color: #666;
-      font-weight: 200;
-      font-size: 14px;
-      margin: 0 10px;
+      h1::after {
+        content: ' ...there is nothing here if you are on a mobile device';
+      }
     }
   </style>
 </head>
 <body>
-  <div class="dialog">
-    <div>
-      <h1>The page you were looking for doesn't exist.</h1>
-      <p>You may have mistyped the address or the page may have moved.</p>
-    </div>
-    <p>If you think you found a bug, please let us know.</p>
-  </div>
-  <div class="links">
-    <a href="https://github.com/retrospring/bugs/issues">Bug tracker</a> &middot;
-    <a href="https://twitter.com/retro_spring">Twitter</a>
-  </div>
+  <canvas id="canvas"></canvas>
+  <h1>404. It dun goofed. <small>But play some Pong while you're at it.</small></h1>
+  <script type="text/javascript">
+    function paintCanvas(){ctx.fillStyle="black",ctx.fillRect(0,0,W,H)}function Paddle(a){this.h=5,this.w=150,this.x=W/2-this.w/2,this.y="top"==a?0:H-this.h}function createParticles(a,b,c){this.x=a||0,this.y=b||0,this.radius=1.2,this.vx=-1.5+3*Math.random(),this.vy=c*Math.random()*1.5}function draw(){paintCanvas();for(var a=0;a<paddles.length;a++)p=paddles[a],ctx.fillStyle="white",ctx.fillRect(p.x,p.y,p.w,p.h);ball.draw(),update()}function increaseSpd(){points%4==0&&Math.abs(ball.vx)<15&&(ball.vx+=ball.vx<0?-1:1,ball.vy+=ball.vy<0?-2:2)}function trackPosition(a){mouse.x=a.pageX,mouse.y=a.pageY}function update(){if(updateScore(),mouse.x&&mouse.y)for(var a=1;a<paddles.length;a++)p=paddles[a],p.x=mouse.x-p.w/2;if(ball.x+=ball.vx,ball.y+=ball.vy,p1=paddles[1],p2=paddles[2],collides(ball,p1)?collideAction(ball,p1):collides(ball,p2)?collideAction(ball,p2):(ball.y+ball.r>H?(ball.y=H-ball.r,gameOver()):ball.y<0&&(ball.y=ball.r,gameOver()),ball.x+ball.r>W?(ball.vx=-ball.vx,ball.x=W-ball.r):ball.x-ball.r<0&&(ball.vx=-ball.vx,ball.x=ball.r)),1==flag)for(var b=0;b<particlesCount;b++)particles.push(new createParticles(particlePos.x,particlePos.y,multiplier));emitParticles(),flag=0}function collides(a,b){return a.x+ball.r>=b.x&&a.x-ball.r<=b.x+b.w?a.y>=b.y-b.h&&b.y>0?(paddleHit=1,!0):a.y<=b.h&&0==b.y?(paddleHit=2,!0):!1:void 0}function collideAction(a,b){a.vy=-a.vy,1==paddleHit?(a.y=b.y-b.h,particlePos.y=a.y+a.r,multiplier=-1):2==paddleHit&&(a.y=b.h+a.r,particlePos.y=a.y-a.r,multiplier=1),points++,increaseSpd(),collision&&(points>0&&collision.pause(),collision.currentTime=0,collision.play()),particlePos.x=a.x,flag=1}function emitParticles(){for(var a=0;a<particles.length;a++)par=particles[a],ctx.beginPath(),ctx.fillStyle="white",par.radius>0&&ctx.arc(par.x,par.y,par.radius,0,2*Math.PI,!1),ctx.fill(),par.x+=par.vx,par.y+=par.vy,par.radius=Math.max(par.radius-.05,0)}function updateScore(){ctx.fillStlye="white",ctx.font="16px Arial, sans-serif",ctx.textAlign="left",ctx.textBaseline="top",ctx.fillText("Score: "+points,20,20)}function gameOver(){ctx.fillStlye="white",ctx.font="20px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillText("Game Over - You scored "+points+" points!",W/2,H/2+25),cancelRequestAnimFrame(init),over=1,restartBtn.draw()}function animloop(){init=requestAnimFrame(animloop),draw()}function startScreen(){draw(),startBtn.draw()}function btnClick(a){{var b=a.pageX;a.pageY}b>=startBtn.x&&b<=startBtn.x+startBtn.w&&(animloop(),startBtn={}),1==over&&b>=restartBtn.x&&b<=restartBtn.x+restartBtn.w&&(ball.x=20,ball.y=20,points=0,ball.vx=4,ball.vy=8,animloop(),over=0)}window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){return window.setTimeout(a,1e3/60)}}(),window.cancelRequestAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelRequestAnimationFrame||window.mozCancelRequestAnimationFrame||window.oCancelRequestAnimationFrame||window.msCancelRequestAnimationFrame||clearTimeout}();var canvas=document.getElementById("canvas"),ctx=canvas.getContext("2d"),W=window.innerWidth,H=window.innerHeight/1.09,particles=[],ball={},paddles=[2],mouse={},points=0,fps=60,particlesCount=20,flag=0,particlePos={},multipler=1,startBtn={},restartBtn={},over=0,init,paddleHit;canvas.addEventListener("mousemove",trackPosition,!0),canvas.addEventListener("mousedown",btnClick,!0),collision=document.getElementById("collide"),canvas.width=W,canvas.height=H,paddles.push(new Paddle("bottom")),paddles.push(new Paddle("top")),ball={x:50,y:50,r:5,c:"white",vx:4,vy:8,draw:function(){ctx.beginPath(),ctx.fillStyle=this.c,ctx.arc(this.x,this.y,this.r,0,2*Math.PI,!1),ctx.fill()}},startBtn={w:100,h:50,x:W/2-50,y:H/2-25,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Start",W/2,H/2)}},restartBtn={w:100,h:50,x:W/2-50,y:H/2-50,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Restart",W/2,H/2-25)}},startScreen();
+  </script>
 </body>
 </html>

From 4d2423f6a3f0ac7975cbcb88e22b42933bf4a6f0 Mon Sep 17 00:00:00 2001
From: schisma <jona@schisma.co>
Date: Sun, 19 Apr 2015 23:27:53 +0200
Subject: [PATCH 165/231] colors and more error pages

---
 public/404.html |  17 +++++++-
 public/422.html | 104 ++++++++++++++++++------------------------------
 public/500.html | 103 +++++++++++++++++------------------------------
 3 files changed, 90 insertions(+), 134 deletions(-)

diff --git a/public/404.html b/public/404.html
index 4d04dc20..1614037a 100644
--- a/public/404.html
+++ b/public/404.html
@@ -13,6 +13,7 @@
     h1 {
       font-family: sans-serif;
       font-size: 1.5em;
+      display: inline-block;
       margin-left: 10px;
       margin-top: 10px;
     }
@@ -21,6 +22,18 @@
       font-size: 0.7em;
       font-weight: 300;
     }
+    
+    span#links {
+      font-family: sans-serif;
+      float: right;
+      margin-right: 10px;
+      margin-top: 17px;
+    }
+    
+    span#links > a {
+      color: #5E35B1;
+      text-decoration: none;
+    }
 
     @media only screen and (max-device-width: 480px) {
       canvas {
@@ -35,9 +48,9 @@
 </head>
 <body>
   <canvas id="canvas"></canvas>
-  <h1>404. It dun goofed. <small>But play some Pong while you're at it.</small></h1>
+  <h1>404. It dun goofed. <small>But play some Pong while you're at it.</small></h1><span id="links"><a href="http://github.com/Retrospring/bugs">Is it a bug?</a> · <a href="http://retrospring.net">Back to Retrospring</a></span>
   <script type="text/javascript">
-    function paintCanvas(){ctx.fillStyle="black",ctx.fillRect(0,0,W,H)}function Paddle(a){this.h=5,this.w=150,this.x=W/2-this.w/2,this.y="top"==a?0:H-this.h}function createParticles(a,b,c){this.x=a||0,this.y=b||0,this.radius=1.2,this.vx=-1.5+3*Math.random(),this.vy=c*Math.random()*1.5}function draw(){paintCanvas();for(var a=0;a<paddles.length;a++)p=paddles[a],ctx.fillStyle="white",ctx.fillRect(p.x,p.y,p.w,p.h);ball.draw(),update()}function increaseSpd(){points%4==0&&Math.abs(ball.vx)<15&&(ball.vx+=ball.vx<0?-1:1,ball.vy+=ball.vy<0?-2:2)}function trackPosition(a){mouse.x=a.pageX,mouse.y=a.pageY}function update(){if(updateScore(),mouse.x&&mouse.y)for(var a=1;a<paddles.length;a++)p=paddles[a],p.x=mouse.x-p.w/2;if(ball.x+=ball.vx,ball.y+=ball.vy,p1=paddles[1],p2=paddles[2],collides(ball,p1)?collideAction(ball,p1):collides(ball,p2)?collideAction(ball,p2):(ball.y+ball.r>H?(ball.y=H-ball.r,gameOver()):ball.y<0&&(ball.y=ball.r,gameOver()),ball.x+ball.r>W?(ball.vx=-ball.vx,ball.x=W-ball.r):ball.x-ball.r<0&&(ball.vx=-ball.vx,ball.x=ball.r)),1==flag)for(var b=0;b<particlesCount;b++)particles.push(new createParticles(particlePos.x,particlePos.y,multiplier));emitParticles(),flag=0}function collides(a,b){return a.x+ball.r>=b.x&&a.x-ball.r<=b.x+b.w?a.y>=b.y-b.h&&b.y>0?(paddleHit=1,!0):a.y<=b.h&&0==b.y?(paddleHit=2,!0):!1:void 0}function collideAction(a,b){a.vy=-a.vy,1==paddleHit?(a.y=b.y-b.h,particlePos.y=a.y+a.r,multiplier=-1):2==paddleHit&&(a.y=b.h+a.r,particlePos.y=a.y-a.r,multiplier=1),points++,increaseSpd(),collision&&(points>0&&collision.pause(),collision.currentTime=0,collision.play()),particlePos.x=a.x,flag=1}function emitParticles(){for(var a=0;a<particles.length;a++)par=particles[a],ctx.beginPath(),ctx.fillStyle="white",par.radius>0&&ctx.arc(par.x,par.y,par.radius,0,2*Math.PI,!1),ctx.fill(),par.x+=par.vx,par.y+=par.vy,par.radius=Math.max(par.radius-.05,0)}function updateScore(){ctx.fillStlye="white",ctx.font="16px Arial, sans-serif",ctx.textAlign="left",ctx.textBaseline="top",ctx.fillText("Score: "+points,20,20)}function gameOver(){ctx.fillStlye="white",ctx.font="20px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillText("Game Over - You scored "+points+" points!",W/2,H/2+25),cancelRequestAnimFrame(init),over=1,restartBtn.draw()}function animloop(){init=requestAnimFrame(animloop),draw()}function startScreen(){draw(),startBtn.draw()}function btnClick(a){{var b=a.pageX;a.pageY}b>=startBtn.x&&b<=startBtn.x+startBtn.w&&(animloop(),startBtn={}),1==over&&b>=restartBtn.x&&b<=restartBtn.x+restartBtn.w&&(ball.x=20,ball.y=20,points=0,ball.vx=4,ball.vy=8,animloop(),over=0)}window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){return window.setTimeout(a,1e3/60)}}(),window.cancelRequestAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelRequestAnimationFrame||window.mozCancelRequestAnimationFrame||window.oCancelRequestAnimationFrame||window.msCancelRequestAnimationFrame||clearTimeout}();var canvas=document.getElementById("canvas"),ctx=canvas.getContext("2d"),W=window.innerWidth,H=window.innerHeight/1.09,particles=[],ball={},paddles=[2],mouse={},points=0,fps=60,particlesCount=20,flag=0,particlePos={},multipler=1,startBtn={},restartBtn={},over=0,init,paddleHit;canvas.addEventListener("mousemove",trackPosition,!0),canvas.addEventListener("mousedown",btnClick,!0),collision=document.getElementById("collide"),canvas.width=W,canvas.height=H,paddles.push(new Paddle("bottom")),paddles.push(new Paddle("top")),ball={x:50,y:50,r:5,c:"white",vx:4,vy:8,draw:function(){ctx.beginPath(),ctx.fillStyle=this.c,ctx.arc(this.x,this.y,this.r,0,2*Math.PI,!1),ctx.fill()}},startBtn={w:100,h:50,x:W/2-50,y:H/2-25,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Start",W/2,H/2)}},restartBtn={w:100,h:50,x:W/2-50,y:H/2-50,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Restart",W/2,H/2-25)}},startScreen();
+    function paintCanvas(){ctx.fillStyle="#5E35B1",ctx.fillRect(0,0,W,H)}function Paddle(a){this.h=5,this.w=150,this.x=W/2-this.w/2,this.y="top"==a?0:H-this.h}function createParticles(a,b,c){this.x=a||0,this.y=b||0,this.radius=1.2,this.vx=-1.5+3*Math.random(),this.vy=c*Math.random()*1.5}function draw(){paintCanvas();for(var a=0;a<paddles.length;a++)p=paddles[a],ctx.fillStyle="white",ctx.fillRect(p.x,p.y,p.w,p.h);ball.draw(),update()}function increaseSpd(){points%4==0&&Math.abs(ball.vx)<15&&(ball.vx+=ball.vx<0?-1:1,ball.vy+=ball.vy<0?-2:2)}function trackPosition(a){mouse.x=a.pageX,mouse.y=a.pageY}function update(){if(updateScore(),mouse.x&&mouse.y)for(var a=1;a<paddles.length;a++)p=paddles[a],p.x=mouse.x-p.w/2;if(ball.x+=ball.vx,ball.y+=ball.vy,p1=paddles[1],p2=paddles[2],collides(ball,p1)?collideAction(ball,p1):collides(ball,p2)?collideAction(ball,p2):(ball.y+ball.r>H?(ball.y=H-ball.r,gameOver()):ball.y<0&&(ball.y=ball.r,gameOver()),ball.x+ball.r>W?(ball.vx=-ball.vx,ball.x=W-ball.r):ball.x-ball.r<0&&(ball.vx=-ball.vx,ball.x=ball.r)),1==flag)for(var b=0;b<particlesCount;b++)particles.push(new createParticles(particlePos.x,particlePos.y,multiplier));emitParticles(),flag=0}function collides(a,b){return a.x+ball.r>=b.x&&a.x-ball.r<=b.x+b.w?a.y>=b.y-b.h&&b.y>0?(paddleHit=1,!0):a.y<=b.h&&0==b.y?(paddleHit=2,!0):!1:void 0}function collideAction(a,b){a.vy=-a.vy,1==paddleHit?(a.y=b.y-b.h,particlePos.y=a.y+a.r,multiplier=-1):2==paddleHit&&(a.y=b.h+a.r,particlePos.y=a.y-a.r,multiplier=1),points++,increaseSpd(),collision&&(points>0&&collision.pause(),collision.currentTime=0,collision.play()),particlePos.x=a.x,flag=1}function emitParticles(){for(var a=0;a<particles.length;a++)par=particles[a],ctx.beginPath(),ctx.fillStyle="white",par.radius>0&&ctx.arc(par.x,par.y,par.radius,0,2*Math.PI,!1),ctx.fill(),par.x+=par.vx,par.y+=par.vy,par.radius=Math.max(par.radius-.05,0)}function updateScore(){ctx.fillStlye="white",ctx.font="16px Arial, sans-serif",ctx.textAlign="left",ctx.textBaseline="top",ctx.fillText("Score: "+points,20,20)}function gameOver(){ctx.fillStlye="white",ctx.font="20px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillText("Game Over - You scored "+points+" points!",W/2,H/2+25),cancelRequestAnimFrame(init),over=1,restartBtn.draw()}function animloop(){init=requestAnimFrame(animloop),draw()}function startScreen(){draw(),startBtn.draw()}function btnClick(a){{var b=a.pageX;a.pageY}b>=startBtn.x&&b<=startBtn.x+startBtn.w&&(animloop(),startBtn={}),1==over&&b>=restartBtn.x&&b<=restartBtn.x+restartBtn.w&&(ball.x=20,ball.y=20,points=0,ball.vx=4,ball.vy=8,animloop(),over=0)}window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){return window.setTimeout(a,1e3/60)}}(),window.cancelRequestAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelRequestAnimationFrame||window.mozCancelRequestAnimationFrame||window.oCancelRequestAnimationFrame||window.msCancelRequestAnimationFrame||clearTimeout}();var canvas=document.getElementById("canvas"),ctx=canvas.getContext("2d"),W=window.innerWidth,H=window.innerHeight/1.09,particles=[],ball={},paddles=[2],mouse={},points=0,fps=60,particlesCount=20,flag=0,particlePos={},multipler=1,startBtn={},restartBtn={},over=0,init,paddleHit;canvas.addEventListener("mousemove",trackPosition,!0),canvas.addEventListener("mousedown",btnClick,!0),collision=document.getElementById("collide"),canvas.width=W,canvas.height=H,paddles.push(new Paddle("bottom")),paddles.push(new Paddle("top")),ball={x:50,y:50,r:5,c:"white",vx:4,vy:8,draw:function(){ctx.beginPath(),ctx.fillStyle=this.c,ctx.arc(this.x,this.y,this.r,0,2*Math.PI,!1),ctx.fill()}},startBtn={w:100,h:50,x:W/2-50,y:H/2-25,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Start",W/2,H/2)}},restartBtn={w:100,h:50,x:W/2-50,y:H/2-50,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Restart",W/2,H/2-25)}},startScreen();
   </script>
 </body>
 </html>
diff --git a/public/422.html b/public/422.html
index 1ad40533..d32a1daa 100644
--- a/public/422.html
+++ b/public/422.html
@@ -1,86 +1,58 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>The change you wanted was rejected (422)</title>
+  <title>Page not found!!1! (404)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-    body {
-      background-color: #EFEFEF;
-      color: #2E2F30;
-      text-align: center;
-      font-family: arial, sans-serif;
+    body { 
+      padding: 0;
       margin: 0;
-    }
-
-    a { color: #4183c4; text-decoration: none; }
-    a:hover { text-decoration: underline; }
-
-    div.dialog {
-      width: 95%;
-      max-width: 33em;
-      margin: 4em auto 0;
-    }
-
-    div.dialog > div {
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #BBB;
-      border-top: #00A0F0 solid 4px;
-      border-top-left-radius: 9px;
-      border-top-right-radius: 9px;
-      background-color: white;
-      padding: 7px 12% 0;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+      overflow: hidden;
     }
 
     h1 {
-      font-size: 100%;
-      color: #0b79C5;
-      line-height: 1.5em;
+      font-family: sans-serif;
+      font-size: 1.5em;
+      display: inline-block;
+      margin-left: 10px;
+      margin-top: 10px;
     }
 
-    div.dialog img { margin-bottom: 0.5em; }
-
-    div.dialog > p {
-      margin: 0 0 1em;
-      padding: 1em;
-      background-color: #F7F7F7;
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #999;
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px;
-      border-top-color: #DADADA;
-      color: #666;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+    h1 > small {
+      font-size: 0.7em;
+      font-weight: 300;
+    }
+    
+    span#links {
+      font-family: sans-serif;
+      float: right;
+      margin-right: 10px;
+      margin-top: 17px;
+    }
+    
+    span#links > a {
+      color: #5E35B1;
+      text-decoration: none;
     }
 
-    div.links {
-      margin-top: 2em;
-      color: #999;
-    }
+    @media only screen and (max-device-width: 480px) {
+      canvas {
+        display: none;
+      }
 
-    div.links a {
-      color: #666;
-      font-weight: 200;
-      font-size: 14px;
-      margin: 0 10px;
+      h1::after {
+        content: ' ...there is nothing here if you are on a mobile device';
+      }
     }
   </style>
 </head>
 <body>
-  <div class="dialog">
-    <div>
-      <h1>The change you wanted was rejected.</h1>
-      <p>Maybe you tried to change something you didn't have access to.</p>
-    </div>
-    <p>If you think you found a bug, please <a href="https://github.com/justask/justask-bugs/issues">please let us know</a>.</p>
-  </div>
-  <div class="links">
-    <a href="https://github.com/retrospring/bugs/issues">Bug tracker</a> &middot;
-    <a href="https://twitter.com/retro_spring">Twitter</a>
-  </div>
+  <canvas id="canvas"></canvas>
+  <h1>422. The change you wanted was rejected.<small>But play some Pong while you're at it.</small></h1><span id="links"><a href="http://github.com/Retrospring/bugs">Is it a bug?</a> · <a href="http://retrospring.net">Back to Retrospring</a></span>
+  <script type="text/javascript">
+    function paintCanvas(){ctx.fillStyle="#5E35B1",ctx.fillRect(0,0,W,H)}function Paddle(a){this.h=5,this.w=150,this.x=W/2-this.w/2,this.y="top"==a?0:H-this.h}function createParticles(a,b,c){this.x=a||0,this.y=b||0,this.radius=1.2,this.vx=-1.5+3*Math.random(),this.vy=c*Math.random()*1.5}function draw(){paintCanvas();for(var a=0;a<paddles.length;a++)p=paddles[a],ctx.fillStyle="white",ctx.fillRect(p.x,p.y,p.w,p.h);ball.draw(),update()}function increaseSpd(){points%4==0&&Math.abs(ball.vx)<15&&(ball.vx+=ball.vx<0?-1:1,ball.vy+=ball.vy<0?-2:2)}function trackPosition(a){mouse.x=a.pageX,mouse.y=a.pageY}function update(){if(updateScore(),mouse.x&&mouse.y)for(var a=1;a<paddles.length;a++)p=paddles[a],p.x=mouse.x-p.w/2;if(ball.x+=ball.vx,ball.y+=ball.vy,p1=paddles[1],p2=paddles[2],collides(ball,p1)?collideAction(ball,p1):collides(ball,p2)?collideAction(ball,p2):(ball.y+ball.r>H?(ball.y=H-ball.r,gameOver()):ball.y<0&&(ball.y=ball.r,gameOver()),ball.x+ball.r>W?(ball.vx=-ball.vx,ball.x=W-ball.r):ball.x-ball.r<0&&(ball.vx=-ball.vx,ball.x=ball.r)),1==flag)for(var b=0;b<particlesCount;b++)particles.push(new createParticles(particlePos.x,particlePos.y,multiplier));emitParticles(),flag=0}function collides(a,b){return a.x+ball.r>=b.x&&a.x-ball.r<=b.x+b.w?a.y>=b.y-b.h&&b.y>0?(paddleHit=1,!0):a.y<=b.h&&0==b.y?(paddleHit=2,!0):!1:void 0}function collideAction(a,b){a.vy=-a.vy,1==paddleHit?(a.y=b.y-b.h,particlePos.y=a.y+a.r,multiplier=-1):2==paddleHit&&(a.y=b.h+a.r,particlePos.y=a.y-a.r,multiplier=1),points++,increaseSpd(),collision&&(points>0&&collision.pause(),collision.currentTime=0,collision.play()),particlePos.x=a.x,flag=1}function emitParticles(){for(var a=0;a<particles.length;a++)par=particles[a],ctx.beginPath(),ctx.fillStyle="white",par.radius>0&&ctx.arc(par.x,par.y,par.radius,0,2*Math.PI,!1),ctx.fill(),par.x+=par.vx,par.y+=par.vy,par.radius=Math.max(par.radius-.05,0)}function updateScore(){ctx.fillStlye="white",ctx.font="16px Arial, sans-serif",ctx.textAlign="left",ctx.textBaseline="top",ctx.fillText("Score: "+points,20,20)}function gameOver(){ctx.fillStlye="white",ctx.font="20px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillText("Game Over - You scored "+points+" points!",W/2,H/2+25),cancelRequestAnimFrame(init),over=1,restartBtn.draw()}function animloop(){init=requestAnimFrame(animloop),draw()}function startScreen(){draw(),startBtn.draw()}function btnClick(a){{var b=a.pageX;a.pageY}b>=startBtn.x&&b<=startBtn.x+startBtn.w&&(animloop(),startBtn={}),1==over&&b>=restartBtn.x&&b<=restartBtn.x+restartBtn.w&&(ball.x=20,ball.y=20,points=0,ball.vx=4,ball.vy=8,animloop(),over=0)}window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){return window.setTimeout(a,1e3/60)}}(),window.cancelRequestAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelRequestAnimationFrame||window.mozCancelRequestAnimationFrame||window.oCancelRequestAnimationFrame||window.msCancelRequestAnimationFrame||clearTimeout}();var canvas=document.getElementById("canvas"),ctx=canvas.getContext("2d"),W=window.innerWidth,H=window.innerHeight/1.09,particles=[],ball={},paddles=[2],mouse={},points=0,fps=60,particlesCount=20,flag=0,particlePos={},multipler=1,startBtn={},restartBtn={},over=0,init,paddleHit;canvas.addEventListener("mousemove",trackPosition,!0),canvas.addEventListener("mousedown",btnClick,!0),collision=document.getElementById("collide"),canvas.width=W,canvas.height=H,paddles.push(new Paddle("bottom")),paddles.push(new Paddle("top")),ball={x:50,y:50,r:5,c:"white",vx:4,vy:8,draw:function(){ctx.beginPath(),ctx.fillStyle=this.c,ctx.arc(this.x,this.y,this.r,0,2*Math.PI,!1),ctx.fill()}},startBtn={w:100,h:50,x:W/2-50,y:H/2-25,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Start",W/2,H/2)}},restartBtn={w:100,h:50,x:W/2-50,y:H/2-50,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Restart",W/2,H/2-25)}},startScreen();
+  </script>
 </body>
 </html>
+
+
diff --git a/public/500.html b/public/500.html
index b6d8e9ea..71488004 100644
--- a/public/500.html
+++ b/public/500.html
@@ -1,85 +1,56 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>We're sorry, but something went wrong (500)</title>
+  <title>Page not found!!1! (404)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
-    body {
-      background-color: #EFEFEF;
-      color: #2E2F30;
-      text-align: center;
-      font-family: arial, sans-serif;
+    body { 
+      padding: 0;
       margin: 0;
-    }
-
-    a { color: #4183c4; text-decoration: none; }
-    a:hover { text-decoration: underline; }
-
-    div.dialog {
-      width: 95%;
-      max-width: 33em;
-      margin: 4em auto 0;
-    }
-
-    div.dialog > div {
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #BBB;
-      border-top: #00A0F0 solid 4px;
-      border-top-left-radius: 9px;
-      border-top-right-radius: 9px;
-      background-color: white;
-      padding: 7px 12% 0;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+      overflow: hidden;
     }
 
     h1 {
-      font-size: 100%;
-      color: #0b79C5;
-      line-height: 1.5em;
+      font-family: sans-serif;
+      font-size: 1.5em;
+      display: inline-block;
+      margin-left: 10px;
+      margin-top: 10px;
     }
 
-    div.dialog img { margin-bottom: 0.5em; }
-
-    div.dialog > p {
-      margin: 0 0 1em;
-      padding: 1em;
-      background-color: #F7F7F7;
-      border: 1px solid #CCC;
-      border-right-color: #999;
-      border-left-color: #999;
-      border-bottom-color: #999;
-      border-bottom-left-radius: 4px;
-      border-bottom-right-radius: 4px;
-      border-top-color: #DADADA;
-      color: #666;
-      box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+    h1 > small {
+      font-size: 0.7em;
+      font-weight: 300;
+    }
+    
+    span#links {
+      font-family: sans-serif;
+      float: right;
+      margin-right: 10px;
+      margin-top: 17px;
+    }
+    
+    span#links > a {
+      color: #5E35B1;
+      text-decoration: none;
     }
 
-    div.links {
-      margin-top: 2em;
-      color: #999;
-    }
+    @media only screen and (max-device-width: 480px) {
+      canvas {
+        display: none;
+      }
 
-    div.links a {
-      color: #666;
-      font-weight: 200;
-      font-size: 14px;
-      margin: 0 10px;
+      h1::after {
+        content: ' ...there is nothing here if you are on a mobile device';
+      }
     }
   </style>
 </head>
 <body>
-  <div class="dialog">
-    <div>
-      <h1>Looks like something went wrong!</h1>
-    </div>
-    <p>This usually happens due to an error in our code.  If you think you found a bug, <a href="https://github.com/justask/justask-bugs/issues">please let us know</a>.</p>
-  </div>
-  <div class="links">
-    <a href="https://github.com/retrospring/bugs/issues">Bug tracker</a> &middot;
-    <a href="https://twitter.com/retro_spring">Twitter</a>
-  </div>
+  <canvas id="canvas"></canvas>
+  <h1>500. Something went wrong :(<small>But play some Pong while you're at it.</small></h1><span id="links"><a href="http://github.com/Retrospring/bugs">Is it a bug?</a> · <a href="http://retrospring.net">Back to Retrospring</a></span>
+  <script type="text/javascript">
+    function paintCanvas(){ctx.fillStyle="#5E35B1",ctx.fillRect(0,0,W,H)}function Paddle(a){this.h=5,this.w=150,this.x=W/2-this.w/2,this.y="top"==a?0:H-this.h}function createParticles(a,b,c){this.x=a||0,this.y=b||0,this.radius=1.2,this.vx=-1.5+3*Math.random(),this.vy=c*Math.random()*1.5}function draw(){paintCanvas();for(var a=0;a<paddles.length;a++)p=paddles[a],ctx.fillStyle="white",ctx.fillRect(p.x,p.y,p.w,p.h);ball.draw(),update()}function increaseSpd(){points%4==0&&Math.abs(ball.vx)<15&&(ball.vx+=ball.vx<0?-1:1,ball.vy+=ball.vy<0?-2:2)}function trackPosition(a){mouse.x=a.pageX,mouse.y=a.pageY}function update(){if(updateScore(),mouse.x&&mouse.y)for(var a=1;a<paddles.length;a++)p=paddles[a],p.x=mouse.x-p.w/2;if(ball.x+=ball.vx,ball.y+=ball.vy,p1=paddles[1],p2=paddles[2],collides(ball,p1)?collideAction(ball,p1):collides(ball,p2)?collideAction(ball,p2):(ball.y+ball.r>H?(ball.y=H-ball.r,gameOver()):ball.y<0&&(ball.y=ball.r,gameOver()),ball.x+ball.r>W?(ball.vx=-ball.vx,ball.x=W-ball.r):ball.x-ball.r<0&&(ball.vx=-ball.vx,ball.x=ball.r)),1==flag)for(var b=0;b<particlesCount;b++)particles.push(new createParticles(particlePos.x,particlePos.y,multiplier));emitParticles(),flag=0}function collides(a,b){return a.x+ball.r>=b.x&&a.x-ball.r<=b.x+b.w?a.y>=b.y-b.h&&b.y>0?(paddleHit=1,!0):a.y<=b.h&&0==b.y?(paddleHit=2,!0):!1:void 0}function collideAction(a,b){a.vy=-a.vy,1==paddleHit?(a.y=b.y-b.h,particlePos.y=a.y+a.r,multiplier=-1):2==paddleHit&&(a.y=b.h+a.r,particlePos.y=a.y-a.r,multiplier=1),points++,increaseSpd(),collision&&(points>0&&collision.pause(),collision.currentTime=0,collision.play()),particlePos.x=a.x,flag=1}function emitParticles(){for(var a=0;a<particles.length;a++)par=particles[a],ctx.beginPath(),ctx.fillStyle="white",par.radius>0&&ctx.arc(par.x,par.y,par.radius,0,2*Math.PI,!1),ctx.fill(),par.x+=par.vx,par.y+=par.vy,par.radius=Math.max(par.radius-.05,0)}function updateScore(){ctx.fillStlye="white",ctx.font="16px Arial, sans-serif",ctx.textAlign="left",ctx.textBaseline="top",ctx.fillText("Score: "+points,20,20)}function gameOver(){ctx.fillStlye="white",ctx.font="20px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillText("Game Over - You scored "+points+" points!",W/2,H/2+25),cancelRequestAnimFrame(init),over=1,restartBtn.draw()}function animloop(){init=requestAnimFrame(animloop),draw()}function startScreen(){draw(),startBtn.draw()}function btnClick(a){{var b=a.pageX;a.pageY}b>=startBtn.x&&b<=startBtn.x+startBtn.w&&(animloop(),startBtn={}),1==over&&b>=restartBtn.x&&b<=restartBtn.x+restartBtn.w&&(ball.x=20,ball.y=20,points=0,ball.vx=4,ball.vy=8,animloop(),over=0)}window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){return window.setTimeout(a,1e3/60)}}(),window.cancelRequestAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelRequestAnimationFrame||window.mozCancelRequestAnimationFrame||window.oCancelRequestAnimationFrame||window.msCancelRequestAnimationFrame||clearTimeout}();var canvas=document.getElementById("canvas"),ctx=canvas.getContext("2d"),W=window.innerWidth,H=window.innerHeight/1.09,particles=[],ball={},paddles=[2],mouse={},points=0,fps=60,particlesCount=20,flag=0,particlePos={},multipler=1,startBtn={},restartBtn={},over=0,init,paddleHit;canvas.addEventListener("mousemove",trackPosition,!0),canvas.addEventListener("mousedown",btnClick,!0),collision=document.getElementById("collide"),canvas.width=W,canvas.height=H,paddles.push(new Paddle("bottom")),paddles.push(new Paddle("top")),ball={x:50,y:50,r:5,c:"white",vx:4,vy:8,draw:function(){ctx.beginPath(),ctx.fillStyle=this.c,ctx.arc(this.x,this.y,this.r,0,2*Math.PI,!1),ctx.fill()}},startBtn={w:100,h:50,x:W/2-50,y:H/2-25,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Start",W/2,H/2)}},restartBtn={w:100,h:50,x:W/2-50,y:H/2-50,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Restart",W/2,H/2-25)}},startScreen();
+  </script>
 </body>
-</html>
+</html>
\ No newline at end of file

From 653b8ade41432a33f262c3d964192318faf61b6c Mon Sep 17 00:00:00 2001
From: schisma <jona@schisma.co>
Date: Sun, 19 Apr 2015 23:38:10 +0200
Subject: [PATCH 166/231] changed title for 500 and 422

---
 public/422.html | 2 +-
 public/500.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/422.html b/public/422.html
index d32a1daa..a9029292 100644
--- a/public/422.html
+++ b/public/422.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Page not found!!1! (404)</title>
+  <title>REJECTED WOAH (422)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
     body { 
diff --git a/public/500.html b/public/500.html
index 71488004..ae6ed7f1 100644
--- a/public/500.html
+++ b/public/500.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Page not found!!1! (404)</title>
+  <title>what is going on (500)</title>
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <style>
     body { 

From c0becf7aff6b04997da6728583ead52b91333700 Mon Sep 17 00:00:00 2001
From: schisma <jona@schisma.co>
Date: Sun, 19 Apr 2015 23:40:02 +0200
Subject: [PATCH 167/231] spaaaace

---
 public/422.html | 2 +-
 public/500.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/422.html b/public/422.html
index a9029292..79f198d4 100644
--- a/public/422.html
+++ b/public/422.html
@@ -48,7 +48,7 @@
 </head>
 <body>
   <canvas id="canvas"></canvas>
-  <h1>422. The change you wanted was rejected.<small>But play some Pong while you're at it.</small></h1><span id="links"><a href="http://github.com/Retrospring/bugs">Is it a bug?</a> · <a href="http://retrospring.net">Back to Retrospring</a></span>
+  <h1>422. The change you wanted was rejected. <small>But play some Pong while you're at it.</small></h1><span id="links"><a href="http://github.com/Retrospring/bugs">Is it a bug?</a> · <a href="http://retrospring.net">Back to Retrospring</a></span>
   <script type="text/javascript">
     function paintCanvas(){ctx.fillStyle="#5E35B1",ctx.fillRect(0,0,W,H)}function Paddle(a){this.h=5,this.w=150,this.x=W/2-this.w/2,this.y="top"==a?0:H-this.h}function createParticles(a,b,c){this.x=a||0,this.y=b||0,this.radius=1.2,this.vx=-1.5+3*Math.random(),this.vy=c*Math.random()*1.5}function draw(){paintCanvas();for(var a=0;a<paddles.length;a++)p=paddles[a],ctx.fillStyle="white",ctx.fillRect(p.x,p.y,p.w,p.h);ball.draw(),update()}function increaseSpd(){points%4==0&&Math.abs(ball.vx)<15&&(ball.vx+=ball.vx<0?-1:1,ball.vy+=ball.vy<0?-2:2)}function trackPosition(a){mouse.x=a.pageX,mouse.y=a.pageY}function update(){if(updateScore(),mouse.x&&mouse.y)for(var a=1;a<paddles.length;a++)p=paddles[a],p.x=mouse.x-p.w/2;if(ball.x+=ball.vx,ball.y+=ball.vy,p1=paddles[1],p2=paddles[2],collides(ball,p1)?collideAction(ball,p1):collides(ball,p2)?collideAction(ball,p2):(ball.y+ball.r>H?(ball.y=H-ball.r,gameOver()):ball.y<0&&(ball.y=ball.r,gameOver()),ball.x+ball.r>W?(ball.vx=-ball.vx,ball.x=W-ball.r):ball.x-ball.r<0&&(ball.vx=-ball.vx,ball.x=ball.r)),1==flag)for(var b=0;b<particlesCount;b++)particles.push(new createParticles(particlePos.x,particlePos.y,multiplier));emitParticles(),flag=0}function collides(a,b){return a.x+ball.r>=b.x&&a.x-ball.r<=b.x+b.w?a.y>=b.y-b.h&&b.y>0?(paddleHit=1,!0):a.y<=b.h&&0==b.y?(paddleHit=2,!0):!1:void 0}function collideAction(a,b){a.vy=-a.vy,1==paddleHit?(a.y=b.y-b.h,particlePos.y=a.y+a.r,multiplier=-1):2==paddleHit&&(a.y=b.h+a.r,particlePos.y=a.y-a.r,multiplier=1),points++,increaseSpd(),collision&&(points>0&&collision.pause(),collision.currentTime=0,collision.play()),particlePos.x=a.x,flag=1}function emitParticles(){for(var a=0;a<particles.length;a++)par=particles[a],ctx.beginPath(),ctx.fillStyle="white",par.radius>0&&ctx.arc(par.x,par.y,par.radius,0,2*Math.PI,!1),ctx.fill(),par.x+=par.vx,par.y+=par.vy,par.radius=Math.max(par.radius-.05,0)}function updateScore(){ctx.fillStlye="white",ctx.font="16px Arial, sans-serif",ctx.textAlign="left",ctx.textBaseline="top",ctx.fillText("Score: "+points,20,20)}function gameOver(){ctx.fillStlye="white",ctx.font="20px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillText("Game Over - You scored "+points+" points!",W/2,H/2+25),cancelRequestAnimFrame(init),over=1,restartBtn.draw()}function animloop(){init=requestAnimFrame(animloop),draw()}function startScreen(){draw(),startBtn.draw()}function btnClick(a){{var b=a.pageX;a.pageY}b>=startBtn.x&&b<=startBtn.x+startBtn.w&&(animloop(),startBtn={}),1==over&&b>=restartBtn.x&&b<=restartBtn.x+restartBtn.w&&(ball.x=20,ball.y=20,points=0,ball.vx=4,ball.vy=8,animloop(),over=0)}window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){return window.setTimeout(a,1e3/60)}}(),window.cancelRequestAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelRequestAnimationFrame||window.mozCancelRequestAnimationFrame||window.oCancelRequestAnimationFrame||window.msCancelRequestAnimationFrame||clearTimeout}();var canvas=document.getElementById("canvas"),ctx=canvas.getContext("2d"),W=window.innerWidth,H=window.innerHeight/1.09,particles=[],ball={},paddles=[2],mouse={},points=0,fps=60,particlesCount=20,flag=0,particlePos={},multipler=1,startBtn={},restartBtn={},over=0,init,paddleHit;canvas.addEventListener("mousemove",trackPosition,!0),canvas.addEventListener("mousedown",btnClick,!0),collision=document.getElementById("collide"),canvas.width=W,canvas.height=H,paddles.push(new Paddle("bottom")),paddles.push(new Paddle("top")),ball={x:50,y:50,r:5,c:"white",vx:4,vy:8,draw:function(){ctx.beginPath(),ctx.fillStyle=this.c,ctx.arc(this.x,this.y,this.r,0,2*Math.PI,!1),ctx.fill()}},startBtn={w:100,h:50,x:W/2-50,y:H/2-25,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Start",W/2,H/2)}},restartBtn={w:100,h:50,x:W/2-50,y:H/2-50,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Restart",W/2,H/2-25)}},startScreen();
   </script>
diff --git a/public/500.html b/public/500.html
index ae6ed7f1..757312d9 100644
--- a/public/500.html
+++ b/public/500.html
@@ -48,7 +48,7 @@
 </head>
 <body>
   <canvas id="canvas"></canvas>
-  <h1>500. Something went wrong :(<small>But play some Pong while you're at it.</small></h1><span id="links"><a href="http://github.com/Retrospring/bugs">Is it a bug?</a> · <a href="http://retrospring.net">Back to Retrospring</a></span>
+  <h1>500. Something went wrong :( <small>But play some Pong while you're at it.</small></h1><span id="links"><a href="http://github.com/Retrospring/bugs">Is it a bug?</a> · <a href="http://retrospring.net">Back to Retrospring</a></span>
   <script type="text/javascript">
     function paintCanvas(){ctx.fillStyle="#5E35B1",ctx.fillRect(0,0,W,H)}function Paddle(a){this.h=5,this.w=150,this.x=W/2-this.w/2,this.y="top"==a?0:H-this.h}function createParticles(a,b,c){this.x=a||0,this.y=b||0,this.radius=1.2,this.vx=-1.5+3*Math.random(),this.vy=c*Math.random()*1.5}function draw(){paintCanvas();for(var a=0;a<paddles.length;a++)p=paddles[a],ctx.fillStyle="white",ctx.fillRect(p.x,p.y,p.w,p.h);ball.draw(),update()}function increaseSpd(){points%4==0&&Math.abs(ball.vx)<15&&(ball.vx+=ball.vx<0?-1:1,ball.vy+=ball.vy<0?-2:2)}function trackPosition(a){mouse.x=a.pageX,mouse.y=a.pageY}function update(){if(updateScore(),mouse.x&&mouse.y)for(var a=1;a<paddles.length;a++)p=paddles[a],p.x=mouse.x-p.w/2;if(ball.x+=ball.vx,ball.y+=ball.vy,p1=paddles[1],p2=paddles[2],collides(ball,p1)?collideAction(ball,p1):collides(ball,p2)?collideAction(ball,p2):(ball.y+ball.r>H?(ball.y=H-ball.r,gameOver()):ball.y<0&&(ball.y=ball.r,gameOver()),ball.x+ball.r>W?(ball.vx=-ball.vx,ball.x=W-ball.r):ball.x-ball.r<0&&(ball.vx=-ball.vx,ball.x=ball.r)),1==flag)for(var b=0;b<particlesCount;b++)particles.push(new createParticles(particlePos.x,particlePos.y,multiplier));emitParticles(),flag=0}function collides(a,b){return a.x+ball.r>=b.x&&a.x-ball.r<=b.x+b.w?a.y>=b.y-b.h&&b.y>0?(paddleHit=1,!0):a.y<=b.h&&0==b.y?(paddleHit=2,!0):!1:void 0}function collideAction(a,b){a.vy=-a.vy,1==paddleHit?(a.y=b.y-b.h,particlePos.y=a.y+a.r,multiplier=-1):2==paddleHit&&(a.y=b.h+a.r,particlePos.y=a.y-a.r,multiplier=1),points++,increaseSpd(),collision&&(points>0&&collision.pause(),collision.currentTime=0,collision.play()),particlePos.x=a.x,flag=1}function emitParticles(){for(var a=0;a<particles.length;a++)par=particles[a],ctx.beginPath(),ctx.fillStyle="white",par.radius>0&&ctx.arc(par.x,par.y,par.radius,0,2*Math.PI,!1),ctx.fill(),par.x+=par.vx,par.y+=par.vy,par.radius=Math.max(par.radius-.05,0)}function updateScore(){ctx.fillStlye="white",ctx.font="16px Arial, sans-serif",ctx.textAlign="left",ctx.textBaseline="top",ctx.fillText("Score: "+points,20,20)}function gameOver(){ctx.fillStlye="white",ctx.font="20px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillText("Game Over - You scored "+points+" points!",W/2,H/2+25),cancelRequestAnimFrame(init),over=1,restartBtn.draw()}function animloop(){init=requestAnimFrame(animloop),draw()}function startScreen(){draw(),startBtn.draw()}function btnClick(a){{var b=a.pageX;a.pageY}b>=startBtn.x&&b<=startBtn.x+startBtn.w&&(animloop(),startBtn={}),1==over&&b>=restartBtn.x&&b<=restartBtn.x+restartBtn.w&&(ball.x=20,ball.y=20,points=0,ball.vx=4,ball.vy=8,animloop(),over=0)}window.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){return window.setTimeout(a,1e3/60)}}(),window.cancelRequestAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelRequestAnimationFrame||window.mozCancelRequestAnimationFrame||window.oCancelRequestAnimationFrame||window.msCancelRequestAnimationFrame||clearTimeout}();var canvas=document.getElementById("canvas"),ctx=canvas.getContext("2d"),W=window.innerWidth,H=window.innerHeight/1.09,particles=[],ball={},paddles=[2],mouse={},points=0,fps=60,particlesCount=20,flag=0,particlePos={},multipler=1,startBtn={},restartBtn={},over=0,init,paddleHit;canvas.addEventListener("mousemove",trackPosition,!0),canvas.addEventListener("mousedown",btnClick,!0),collision=document.getElementById("collide"),canvas.width=W,canvas.height=H,paddles.push(new Paddle("bottom")),paddles.push(new Paddle("top")),ball={x:50,y:50,r:5,c:"white",vx:4,vy:8,draw:function(){ctx.beginPath(),ctx.fillStyle=this.c,ctx.arc(this.x,this.y,this.r,0,2*Math.PI,!1),ctx.fill()}},startBtn={w:100,h:50,x:W/2-50,y:H/2-25,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Start",W/2,H/2)}},restartBtn={w:100,h:50,x:W/2-50,y:H/2-50,draw:function(){ctx.strokeStyle="white",ctx.lineWidth="2",ctx.strokeRect(this.x,this.y,this.w,this.h),ctx.font="18px Arial, sans-serif",ctx.textAlign="center",ctx.textBaseline="middle",ctx.fillStlye="white",ctx.fillText("Restart",W/2,H/2-25)}},startScreen();
   </script>

From eca207dfcf1e585537ffc62b6be32c10fd2bbbd9 Mon Sep 17 00:00:00 2001
From: schisma <jona@schisma.co>
Date: Sun, 19 Apr 2015 23:46:28 +0200
Subject: [PATCH 168/231] the REPRISE

---
 public/500.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/500.html b/public/500.html
index 757312d9..9ac1c1d0 100644
--- a/public/500.html
+++ b/public/500.html
@@ -43,6 +43,10 @@
       h1::after {
         content: ' ...there is nothing here if you are on a mobile device';
       }
+
+      h1 > small {
+        display: none;
+      }
     }
   </style>
 </head>

From aec96e5e4f5ecb31b083dcef8dd16c1f08ea7d8c Mon Sep 17 00:00:00 2001
From: Howl <github@thehowl.it>
Date: Mon, 20 Apr 2015 19:02:19 +0200
Subject: [PATCH 169/231] Add link to bugs tracker and change a bit some stuff

---
 app/views/static/about.html.haml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 9b1ac4b7..db67c935 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -45,9 +45,11 @@
           %p
             Want to contribute? If you are a Ruby developer, CoffeeScript coder or frontend designer, you can now help
             = APP_CONFIG['site_name']
-            to get the features everyone wanted.  If that's not the case, you can still report bugs at our
+            to get the features everyone wanted by forking the  
+            = link_to "Retrospring GitHub repository", 'https://github.com/retrospring/retrospring'
+            .  If that's not the case, you can still report bugs and requests features at our
             = succeed '.' do
-              = link_to "Github repository", 'https://github.com/retrospring/retrospring'
+              = link_to "bugs tracker", 'https://github.com/retrospring/bugs'
 
           %p
             Still have some questions? Check our

From aef20ee485578fb2559439865a2ce877bf5a4265 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Mon, 20 Apr 2015 21:14:05 +0200
Subject: [PATCH 170/231] formatting

---
 app/views/static/about.html.haml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index db67c935..aa43be51 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -45,11 +45,12 @@
           %p
             Want to contribute? If you are a Ruby developer, CoffeeScript coder or frontend designer, you can now help
             = APP_CONFIG['site_name']
-            to get the features everyone wanted by forking the  
-            = link_to "Retrospring GitHub repository", 'https://github.com/retrospring/retrospring'
-            .  If that's not the case, you can still report bugs and requests features at our
+            to get the features everyone wanted by forking our
             = succeed '.' do
-              = link_to "bugs tracker", 'https://github.com/retrospring/bugs'
+              = link_to "GitHub repository", 'https://github.com/retrospring/retrospring'
+            If that's not the case, you can still report bugs and requests features at our
+            = succeed '.' do
+              = link_to "bug tracker", 'https://github.com/retrospring/bugs'
 
           %p
             Still have some questions? Check our

From aed2597de0e676ef07fcfa05387061ac41ce0aa7 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Mon, 20 Apr 2015 21:14:59 +0200
Subject: [PATCH 171/231] fixed grammar

---
 app/views/static/about.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index aa43be51..89bf0f34 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -48,7 +48,7 @@
             to get the features everyone wanted by forking our
             = succeed '.' do
               = link_to "GitHub repository", 'https://github.com/retrospring/retrospring'
-            If that's not the case, you can still report bugs and requests features at our
+            If that's not the case, you can still report bugs and request features at our
             = succeed '.' do
               = link_to "bug tracker", 'https://github.com/retrospring/bugs'
 

From ecffd073443bd2f6468a89c7c294ab8ae337fc58 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 21 Apr 2015 06:42:11 +0530
Subject: [PATCH 172/231] Support for post subscriptions

---
 Rakefile                                      | 56 ++++++++++++++++++-
 .../javascripts/answerbox/comment.coffee      |  3 +
 .../javascripts/answerbox/subscribe.coffee    | 27 +++++++++
 .../ajax/subscription_controller.rb           | 19 +++++++
 app/helpers/subscribe_helper.rb               |  2 +
 app/models/answer.rb                          |  5 +-
 app/models/comment.rb                         |  7 ++-
 app/models/subscription.rb                    | 48 ++++++++++++++++
 app/models/user.rb                            |  2 +
 .../ajax/subscription/subscribe.json.jbuilder |  1 +
 .../subscription/unsubscribe.json.jbuilder    |  1 +
 .../notifications/_notification.html.haml     | 10 +++-
 app/views/shared/_answerbox_buttons.html.haml | 13 ++++-
 config/routes.rb                              |  2 +
 .../20150420232305_create_subscriptions.rb    | 10 ++++
 spec/controllers/subscribe_controller_spec.rb |  5 ++
 spec/helpers/subscribe_helper_spec.rb         | 15 +++++
 spec/models/subscription_spec.rb              |  5 ++
 18 files changed, 223 insertions(+), 8 deletions(-)
 create mode 100644 app/assets/javascripts/answerbox/subscribe.coffee
 create mode 100644 app/controllers/ajax/subscription_controller.rb
 create mode 100644 app/helpers/subscribe_helper.rb
 create mode 100644 app/models/subscription.rb
 create mode 100644 app/views/ajax/subscription/subscribe.json.jbuilder
 create mode 100644 app/views/ajax/subscription/unsubscribe.json.jbuilder
 create mode 100644 db/migrate/20150420232305_create_subscriptions.rb
 create mode 100644 spec/controllers/subscribe_controller_spec.rb
 create mode 100644 spec/helpers/subscribe_helper_spec.rb
 create mode 100644 spec/models/subscription_spec.rb

diff --git a/Rakefile b/Rakefile
index 9f233c58..5ee06a1a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -198,6 +198,45 @@ namespace :justask do
     puts "Purged #{destroyed_count} dead notifications."
   end
 
+  desc "Subscribes everyone to their answers"
+  task fix_submarines: :enviornment do
+    format = '%t (%c/%C) [%b>%i] %e'
+
+    total = Answer.count
+    progress = ProgressBar.create title: 'Processing answers', format: format, starting_at: 0, total: total
+    subscribed = 0
+
+    Answer.all.each do |a|
+      if not s.user.nil? and not s.answer.nil?
+        Subscription.subscribe a.user, a
+        subscribed += 1
+      end
+
+      progress.increment
+    end
+
+    puts "Subscribed to #{subscribed} posts."
+  end
+
+  desc "Destroy lost subscriptions"
+  task fix_torpedoes: :enviornment do
+    format = '%t (%c/%C) [%b>%i] %e'
+
+    total = Subscription.count
+    progress = ProgressBar.create title: 'Processing subscriptions', format: format, starting_at: 0, total: total
+    destroyed = 0
+    Subscription.all.each do |s|
+      if s.user.nil? or s.answer.nil?
+        s.destroy
+        destroyed += 1
+      end
+
+      progress.increment
+    end
+
+    puts "Put #{destroyed} subscriptions up for adoption."
+  end
+
   desc "Fixes everything else"
   task fix_db: :environment do
     format = '%t (%c/%C) [%b>%i] %e'
@@ -206,7 +245,8 @@ namespace :justask do
         question: 0,
         answer: 0,
         smile: 0,
-        comment: 0
+        comment: 0,
+        subscription: 0
     }
 
     total = Inbox.count
@@ -250,10 +290,24 @@ namespace :justask do
       progress.increment
     end
 
+    total = Subscription.count
+    progress = ProgressBar.create title: 'Processing subscriptions', format: format, starting_at: 0, total: total
+    Subscription.all.each do |s|
+      if s.user.nil? or s.answer.nil?
+        s.destroy
+        destroyed_count[:subscription] += 1
+      end
+
+      progress.increment
+    end
+
+    puts "Put #{destroyed} subscriptions up for adoption."
+
     puts "Purged #{destroyed_count[:inbox]} dead inbox entries."
     puts "Marked #{destroyed_count[:question]} questions as anonymous."
     puts "Purged #{destroyed_count[:answer]} dead answers."
     puts "Purged #{destroyed_count[:answer]} dead comments."
+    puts "Purged #{destroyed_count[:subscription]} dead subscriptions."
   end
 
   desc "Prints lonely people."
diff --git a/app/assets/javascripts/answerbox/comment.coffee b/app/assets/javascripts/answerbox/comment.coffee
index 996d5ff3..f81de95a 100644
--- a/app/assets/javascripts/answerbox/comment.coffee
+++ b/app/assets/javascripts/answerbox/comment.coffee
@@ -39,6 +39,9 @@ $(document).on "keyup", "input[name=ab-comment-new]", (evt) ->
           input.val ''
           ctr.html 160
           $("span#ab-comment-count-#{aid}").html data.count
+          subs = $("a[data-action=ab-submarine][data-a-id=#{aid}]")[0]
+          subs.dataset.torpedo = "no"
+          subs.children[0].nextSibling.textContent = "Unsubscribe"
         showNotification data.message, data.success
       error: (jqxhr, status, error) ->
         console.log jqxhr, status, error
diff --git a/app/assets/javascripts/answerbox/subscribe.coffee b/app/assets/javascripts/answerbox/subscribe.coffee
new file mode 100644
index 00000000..4c937dd4
--- /dev/null
+++ b/app/assets/javascripts/answerbox/subscribe.coffee
@@ -0,0 +1,27 @@
+# the laziest coding known to man
+$(document).on "click", "a[data-action=ab-submarine]", (ev) ->
+  ev.preventDefault()
+  btn = $(this)
+  aid = btn[0].dataset.aId
+  torpedo = 0
+  if btn[0].dataset.torpedo == "yes"
+    torpedo = 1
+  endpoint = "subscribe"
+  if torpedo == 0
+    endpoint = "un" + endpoint
+  $.ajax
+    url: '/ajax/' + endpoint # TODO: find a way to use rake routes instead of hardcoding them here
+    type: 'POST'
+    data:
+      answer: aid
+    success: (data, status, jqxhr) ->
+      if data.success
+        btn[0].dataset.torpedo = ["yes", "no"][torpedo]
+        btn[0].children[0].nextSibling.textContent = ["Subscribe", "Unsubscribe"][torpedo]
+        showNotification "Successfully " + endpoint + "d.", true
+      else
+        showNotification "Couldn't unsubscribe from the answer.", false
+    error: (jqxhr, status, error) ->
+      console.log jqxhr, status, error
+      showNotification "An error occurred, a developer should check the console for details", false
+    complete: (jqxhr, status) ->
diff --git a/app/controllers/ajax/subscription_controller.rb b/app/controllers/ajax/subscription_controller.rb
new file mode 100644
index 00000000..9b07b0c5
--- /dev/null
+++ b/app/controllers/ajax/subscription_controller.rb
@@ -0,0 +1,19 @@
+class Ajax::SubscriptionController < ApplicationController
+  before_filter :authenticate_user!
+
+  def subscribe
+    params.require :answer
+    @status = 418
+    @message = "418 I'm a torpedo"
+    state = Subscription.subscribe(current_user, Answer.find(params[:answer])).nil?
+    @success = state == false
+  end
+
+  def unsubscribe
+    params.require :answer
+    @status = 418
+    @message = "418 I'm a torpedo"
+    state = Subscription.unsubscribe(current_user, Answer.find(params[:answer])).nil?
+    @success = state == false
+  end
+end
diff --git a/app/helpers/subscribe_helper.rb b/app/helpers/subscribe_helper.rb
new file mode 100644
index 00000000..e30187f5
--- /dev/null
+++ b/app/helpers/subscribe_helper.rb
@@ -0,0 +1,2 @@
+module SubscribeHelper
+end
diff --git a/app/models/answer.rb b/app/models/answer.rb
index e346853b..b8af083c 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -3,11 +3,13 @@ class Answer < ActiveRecord::Base
   belongs_to :question
   has_many :comments, dependent: :destroy
   has_many :smiles, dependent: :destroy
+  has_many :subscriptions, dependent: :destroy
 
   after_create do
     Inbox.where(user: self.user, question: self.question).destroy_all
 
     Notification.notify self.question.user, self unless self.question.author_is_anonymous
+    Subscription.subscribe self.user, self
     self.user.increment! :answered_count
     self.question.increment! :answer_count
   end
@@ -27,9 +29,10 @@ class Answer < ActiveRecord::Base
     end
     self.comments.each do |comment|
       comment.user.decrement! :commented_count
-      Notification.denotify self.user, comment
+      Subscription.denotify comment, self
     end
     Notification.denotify self.question.user, self
+    Subscription.destruct self
   end
 
   def notification_type(*_args)
diff --git a/app/models/comment.rb b/app/models/comment.rb
index cf5001a7..6cced397 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -7,14 +7,15 @@ class Comment < ActiveRecord::Base
   validates :content, length: { maximum: 160 }
 
   after_create do
-    Notification.notify answer.user, self unless answer.user == self.user
+    Subscription.subscribe self.user, answer
+    Subscription.notify self, answer
     user.increment! :commented_count
     answer.increment! :comment_count
   end
 
   before_destroy do
-    Notification.denotify answer.user, self unless answer.user == self.user
-    user.decrement! :commented_count
+    Subscription.denotify self, answer
+    user.decrement!  :commented_count
     answer.decrement! :comment_count
   end
 
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
new file mode 100644
index 00000000..8a39ccad
--- /dev/null
+++ b/app/models/subscription.rb
@@ -0,0 +1,48 @@
+class Subscription < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :answer
+
+  class << self
+    def subscribe(recipient, target)
+      if Subscription.find_by(user: recipient, answer: target).nil?
+        Subscription.new(user: recipient, answer: target).save!
+      end
+    end
+
+    def unsubscribe(recipient, target)
+      if recipient.nil? or target.nil?
+        return nil
+      end
+
+      subs = Subscription.find_by(user: recipient, answer: target)
+      subs.destroy unless subs.nil?
+    end
+
+    def destruct(target)
+      if target.nil?
+        return nil
+      end
+      Subscription.where(answer: target).destroy_all
+    end
+
+    def notify(source, target)
+      if source.nil? or target.nil?
+        return nil
+      end
+
+      Subscription.where(answer: target).each do |subs|
+        next unless not subs.user == source.user
+        Notification.notify subs.user, source
+      end
+    end
+
+    def denotify(source, target)
+      if source.nil? or target.nil?
+        return nil
+      end
+      Subscription.where(answer: target).each do |subs|
+        Notification.denotify subs.user, source
+      end
+    end
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 0bd4e492..01a1e6e2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -28,6 +28,8 @@ class User < ActiveRecord::Base
   has_many :groups, dependent: :destroy
   has_many :group_memberships, class_name: "GroupMember", foreign_key: 'user_id', dependent: :destroy
 
+  has_many :subscriptions, dependent: :destroy
+
   SCREEN_NAME_REGEX = /\A[a-zA-Z0-9_]{1,16}\z/
   WEBSITE_REGEX = /https?:\/\/([A-Za-z.\-]+)\/?(?:.*)/i
 
diff --git a/app/views/ajax/subscription/subscribe.json.jbuilder b/app/views/ajax/subscription/subscribe.json.jbuilder
new file mode 100644
index 00000000..f98b3c38
--- /dev/null
+++ b/app/views/ajax/subscription/subscribe.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'ajax/shared/status'
diff --git a/app/views/ajax/subscription/unsubscribe.json.jbuilder b/app/views/ajax/subscription/unsubscribe.json.jbuilder
new file mode 100644
index 00000000..f98b3c38
--- /dev/null
+++ b/app/views/ajax/subscription/unsubscribe.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'ajax/shared/status'
diff --git a/app/views/notifications/_notification.html.haml b/app/views/notifications/_notification.html.haml
index efc508f6..eed4e08e 100644
--- a/app/views/notifications/_notification.html.haml
+++ b/app/views/notifications/_notification.html.haml
@@ -53,9 +53,15 @@
           %p.notification--text
             commented on
             %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id), title: "#{notification.target.answer.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
-              your answer
+              - if notification.target.answer.user == current_user
+                your
+              - elsif notification.target.user == notification.target.answer.user
+                their
+              - else
+                = user_screen_name(notification.target.answer.user, false, false) + "'s"
+              answer
             %span{title: notification.target.created_at, data: { toggle: :tooltip, placement: :bottom }}
               = time_ago_in_words notification.target.created_at
             ago
           .notification--icon
-            %i.fa.fa-comments
\ No newline at end of file
+            %i.fa.fa-comments
diff --git a/app/views/shared/_answerbox_buttons.html.haml b/app/views/shared/_answerbox_buttons.html.haml
index bfde2a68..28b15ead 100644
--- a/app/views/shared/_answerbox_buttons.html.haml
+++ b/app/views/shared/_answerbox_buttons.html.haml
@@ -21,6 +21,17 @@
     %button.btn.btn-default.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
       %span.caret
     %ul.dropdown-menu.dropdown-menu-right{role: :menu}
+      - if a.subscriptions.find_by(user: current_user)
+        %li
+          -#                                            fun joke    should subscribe?
+          %a{href: '#', data: { a_id: a.id, action: 'ab-submarine', torpedo: "no" }}
+            %i.fa.fa-anchor
+            Unubscribe
+      - else
+        %li
+          %a{href: '#', data: { a_id: a.id, action: 'ab-submarine', torpedo: "yes" }}
+            %i.fa.fa-anchor
+            Subscribe
       - if privileged? a.user
         %li.text-danger
           %a{href: '#', data: { a_id: a.id, action: 'ab-destroy' }}
@@ -30,4 +41,4 @@
         %li
           %a{href: '#', data: { a_id: a.id, action: 'ab-report' }}
             %i.fa.fa-exclamation-triangle
-            Report
\ No newline at end of file
+            Report
diff --git a/config/routes.rb b/config/routes.rb
index d4af3769..475b516a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -82,6 +82,8 @@ Rails.application.routes.draw do
     match '/destroy_group', to: 'group#destroy', via: :post, as: :destroy_group
     match '/group_membership', to: 'group#membership', via: :post, as: :group_membership
     match '/preview', to: "question#preview", via: :post, as: :preview
+    match '/subscribe', to: 'subscription#subscribe', via: :post, as: :subscribe_answer
+    match '/unsubscribe', to: 'subscription#unsubscribe', via: :post, as: :unsubscribe_answer
   end
 
   match '/public', to: 'public#index', via: :get, as: :public_timeline
diff --git a/db/migrate/20150420232305_create_subscriptions.rb b/db/migrate/20150420232305_create_subscriptions.rb
new file mode 100644
index 00000000..0fc970cb
--- /dev/null
+++ b/db/migrate/20150420232305_create_subscriptions.rb
@@ -0,0 +1,10 @@
+class CreateSubscriptions < ActiveRecord::Migration
+  def change
+    create_table :subscriptions do |t|
+      t.integer :user_id, null: false
+      t.integer :answer_id, null: false
+
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/spec/controllers/subscribe_controller_spec.rb b/spec/controllers/subscribe_controller_spec.rb
new file mode 100644
index 00000000..0afc3489
--- /dev/null
+++ b/spec/controllers/subscribe_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubscribeController, :type => :controller do
+
+end
diff --git a/spec/helpers/subscribe_helper_spec.rb b/spec/helpers/subscribe_helper_spec.rb
new file mode 100644
index 00000000..cb8dc23c
--- /dev/null
+++ b/spec/helpers/subscribe_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the SubscribeHelper. For example:
+#
+# describe SubscribeHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe SubscribeHelper, :type => :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
new file mode 100644
index 00000000..2c8d59e9
--- /dev/null
+++ b/spec/models/subscription_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Subscription, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 1c485b20e9998e04f6657e8843082bacd57013e1 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 21 Apr 2015 06:58:35 +0530
Subject: [PATCH 173/231] Subscribe asker to the answer

---
 app/models/answer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index b8af083c..83b82918 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -10,6 +10,7 @@ class Answer < ActiveRecord::Base
 
     Notification.notify self.question.user, self unless self.question.author_is_anonymous
     Subscription.subscribe self.user, self
+    Subscription.subscribe self.question.user, self
     self.user.increment! :answered_count
     self.question.increment! :answer_count
   end

From 8eeae22c437bf774731ea59716c525841375e8f3 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 21 Apr 2015 17:52:32 +0530
Subject: [PATCH 174/231] Don't resubscribe if a user unsubscribes and comments
 again

---
 app/models/comment.rb                         |  2 +-
 app/models/subscription.rb                    | 29 +++++++--
 app/views/shared/_answerbox_buttons.html.haml |  2 +-
 ...21120557_add_is_active_to_subscriptions.rb |  5 ++
 db/schema.rb                                  | 64 ++++++++++++++++++-
 5 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20150421120557_add_is_active_to_subscriptions.rb

diff --git a/app/models/comment.rb b/app/models/comment.rb
index 6cced397..ca8f4087 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -7,7 +7,7 @@ class Comment < ActiveRecord::Base
   validates :content, length: { maximum: 160 }
 
   after_create do
-    Subscription.subscribe self.user, answer
+    Subscription.subscribe self.user, answer, false
     Subscription.notify self, answer
     user.increment! :commented_count
     answer.increment! :comment_count
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 8a39ccad..bd250772 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -3,9 +3,21 @@ class Subscription < ActiveRecord::Base
   belongs_to :answer
 
   class << self
-    def subscribe(recipient, target)
-      if Subscription.find_by(user: recipient, answer: target).nil?
+    def for(target)
+      Subscription.where(answer: target)
+    end
+
+    def is_subscribed(recipient, target)
+      existing = Subscription.find_by(user: recipient, answer: target)
+      existing.nil? or existing.is_active
+    end
+
+    def subscribe(recipient, target, force = true)
+      existing = Subscription.find_by(user: recipient, answer: target)
+      if existing.nil?
         Subscription.new(user: recipient, answer: target).save!
+      elsif force
+        existing.update(is_active: true)
       end
     end
 
@@ -15,7 +27,7 @@ class Subscription < ActiveRecord::Base
       end
 
       subs = Subscription.find_by(user: recipient, answer: target)
-      subs.destroy unless subs.nil?
+      subs.update(is_active: false) unless subs.nil?
     end
 
     def destruct(target)
@@ -25,12 +37,21 @@ class Subscription < ActiveRecord::Base
       Subscription.where(answer: target).destroy_all
     end
 
+    def destruct_by(recipient, target)
+      if recipient.nil? or target.nil?
+        return nil
+      end
+
+      subs = Subscription.find_by(user: recipient, answer: target)
+      subs.destroy unless subs.nil?
+    end
+
     def notify(source, target)
       if source.nil? or target.nil?
         return nil
       end
 
-      Subscription.where(answer: target).each do |subs|
+      Subscription.where(answer: target, is_active: true).each do |subs|
         next unless not subs.user == source.user
         Notification.notify subs.user, source
       end
diff --git a/app/views/shared/_answerbox_buttons.html.haml b/app/views/shared/_answerbox_buttons.html.haml
index 28b15ead..1daa1f2a 100644
--- a/app/views/shared/_answerbox_buttons.html.haml
+++ b/app/views/shared/_answerbox_buttons.html.haml
@@ -21,7 +21,7 @@
     %button.btn.btn-default.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
       %span.caret
     %ul.dropdown-menu.dropdown-menu-right{role: :menu}
-      - if a.subscriptions.find_by(user: current_user)
+      - if Subscription.is_subscribed(current_user, a)
         %li
           -#                                            fun joke    should subscribe?
           %a{href: '#', data: { a_id: a.id, action: 'ab-submarine', torpedo: "no" }}
diff --git a/db/migrate/20150421120557_add_is_active_to_subscriptions.rb b/db/migrate/20150421120557_add_is_active_to_subscriptions.rb
new file mode 100644
index 00000000..afdfc81e
--- /dev/null
+++ b/db/migrate/20150421120557_add_is_active_to_subscriptions.rb
@@ -0,0 +1,5 @@
+class AddIsActiveToSubscriptions < ActiveRecord::Migration
+  def change
+    add_column :subscriptions, :is_active, :boolean, default: :true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4e3d67ca..a60c6040 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150419201122) do
+ActiveRecord::Schema.define(version: 20150421120557) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -101,6 +101,49 @@ ActiveRecord::Schema.define(version: 20150419201122) do
     t.datetime "updated_at"
   end
 
+  create_table "oauth_access_grants", force: :cascade do |t|
+    t.integer  "resource_owner_id", null: false
+    t.integer  "application_id",    null: false
+    t.string   "token",             null: false
+    t.integer  "expires_in",        null: false
+    t.text     "redirect_uri",      null: false
+    t.datetime "created_at",        null: false
+    t.datetime "revoked_at"
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
+
+  create_table "oauth_access_tokens", force: :cascade do |t|
+    t.integer  "resource_owner_id"
+    t.integer  "application_id"
+    t.string   "token",             null: false
+    t.string   "refresh_token"
+    t.integer  "expires_in"
+    t.datetime "revoked_at"
+    t.datetime "created_at",        null: false
+    t.string   "scopes"
+  end
+
+  add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
+  add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
+  add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
+
+  create_table "oauth_applications", force: :cascade do |t|
+    t.string   "name",                      null: false
+    t.string   "uid",                       null: false
+    t.string   "secret",                    null: false
+    t.text     "redirect_uri",              null: false
+    t.string   "scopes",       default: "", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+  end
+
+  add_index "oauth_applications", ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
+  add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
+
   create_table "questions", force: :cascade do |t|
     t.string   "content"
     t.boolean  "author_is_anonymous"
@@ -156,6 +199,25 @@ ActiveRecord::Schema.define(version: 20150419201122) do
   add_index "smiles", ["user_id", "answer_id"], name: "index_smiles_on_user_id_and_answer_id", unique: true, using: :btree
   add_index "smiles", ["user_id"], name: "index_smiles_on_user_id", using: :btree
 
+  create_table "subscriptions", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "answer_id"
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+    t.boolean  "is_active",  default: true
+  end
+
+  create_table "user_themes", force: :cascade do |t|
+    t.integer  "user_id"
+    t.string   "bg",         default: "#fafafa"
+    t.string   "color",      default: "#5e35b1"
+    t.string   "color_a",    default: "#5e35b1"
+    t.string   "color_alt",  default: "#eeeeee"
+    t.string   "bg_primary", default: "#5e35b1"
+    t.datetime "created_at",                     null: false
+    t.datetime "updated_at",                     null: false
+  end
+
   create_table "users", force: :cascade do |t|
     t.string   "email",                             default: "",    null: false
     t.string   "encrypted_password",                default: "",    null: false

From f6b6bb9c546f65bc52a568eb65196cbf0cb6daa4 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 21 Apr 2015 17:54:25 +0530
Subject: [PATCH 175/231] revert schema

---
 db/schema.rb | 64 +---------------------------------------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index a60c6040..4e3d67ca 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150421120557) do
+ActiveRecord::Schema.define(version: 20150419201122) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -101,49 +101,6 @@ ActiveRecord::Schema.define(version: 20150421120557) do
     t.datetime "updated_at"
   end
 
-  create_table "oauth_access_grants", force: :cascade do |t|
-    t.integer  "resource_owner_id", null: false
-    t.integer  "application_id",    null: false
-    t.string   "token",             null: false
-    t.integer  "expires_in",        null: false
-    t.text     "redirect_uri",      null: false
-    t.datetime "created_at",        null: false
-    t.datetime "revoked_at"
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
-
-  create_table "oauth_access_tokens", force: :cascade do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             null: false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at",        null: false
-    t.string   "scopes"
-  end
-
-  add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
-  add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
-  add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
-
-  create_table "oauth_applications", force: :cascade do |t|
-    t.string   "name",                      null: false
-    t.string   "uid",                       null: false
-    t.string   "secret",                    null: false
-    t.text     "redirect_uri",              null: false
-    t.string   "scopes",       default: "", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "owner_id"
-    t.string   "owner_type"
-  end
-
-  add_index "oauth_applications", ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
-  add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
-
   create_table "questions", force: :cascade do |t|
     t.string   "content"
     t.boolean  "author_is_anonymous"
@@ -199,25 +156,6 @@ ActiveRecord::Schema.define(version: 20150421120557) do
   add_index "smiles", ["user_id", "answer_id"], name: "index_smiles_on_user_id_and_answer_id", unique: true, using: :btree
   add_index "smiles", ["user_id"], name: "index_smiles_on_user_id", using: :btree
 
-  create_table "subscriptions", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "answer_id"
-    t.datetime "created_at",                null: false
-    t.datetime "updated_at",                null: false
-    t.boolean  "is_active",  default: true
-  end
-
-  create_table "user_themes", force: :cascade do |t|
-    t.integer  "user_id"
-    t.string   "bg",         default: "#fafafa"
-    t.string   "color",      default: "#5e35b1"
-    t.string   "color_a",    default: "#5e35b1"
-    t.string   "color_alt",  default: "#eeeeee"
-    t.string   "bg_primary", default: "#5e35b1"
-    t.datetime "created_at",                     null: false
-    t.datetime "updated_at",                     null: false
-  end
-
   create_table "users", force: :cascade do |t|
     t.string   "email",                             default: "",    null: false
     t.string   "encrypted_password",                default: "",    null: false

From 1495f67cb1da040c2a2d27f678acff42806d921e Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Tue, 21 Apr 2015 14:30:05 +0200
Subject: [PATCH 176/231] fixed typos

---
 Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 5ee06a1a..e5da0c93 100644
--- a/Rakefile
+++ b/Rakefile
@@ -199,7 +199,7 @@ namespace :justask do
   end
 
   desc "Subscribes everyone to their answers"
-  task fix_submarines: :enviornment do
+  task fix_submarines: :environment do
     format = '%t (%c/%C) [%b>%i] %e'
 
     total = Answer.count
@@ -219,7 +219,7 @@ namespace :justask do
   end
 
   desc "Destroy lost subscriptions"
-  task fix_torpedoes: :enviornment do
+  task fix_torpedoes: :environment do
     format = '%t (%c/%C) [%b>%i] %e'
 
     total = Subscription.count

From 066b3607f9c9912a8055693a814fb31113af86f0 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Tue, 21 Apr 2015 14:32:53 +0200
Subject: [PATCH 177/231] fixed NameError

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index e5da0c93..fba3b892 100644
--- a/Rakefile
+++ b/Rakefile
@@ -207,7 +207,7 @@ namespace :justask do
     subscribed = 0
 
     Answer.all.each do |a|
-      if not s.user.nil? and not s.answer.nil?
+      if not a.user.nil?
         Subscription.subscribe a.user, a
         subscribed += 1
       end

From 33800c9d2a2c98dafa5d09139f7a569e4a4713f7 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 21 Apr 2015 18:32:27 +0530
Subject: [PATCH 178/231] BUGFIX Fixes inability to manually subscribe to new
 questions because there is no subscription record BUGFIX

---
 app/models/subscription.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index bd250772..c5065765 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -9,7 +9,11 @@ class Subscription < ActiveRecord::Base
 
     def is_subscribed(recipient, target)
       existing = Subscription.find_by(user: recipient, answer: target)
-      existing.nil? or existing.is_active
+      if existing.nil?
+        false
+      else
+        existing.is_active
+      end
     end
 
     def subscribe(recipient, target, force = true)

From 1db856c0fe14966ab1bcb89214a887cff9346520 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Tue, 21 Apr 2015 15:46:43 +0200
Subject: [PATCH 179/231] fixed dropdown text for comments

---
 app/views/layouts/_notifications.html.haml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml
index 7c272aa4..6eb6db5f 100644
--- a/app/views/layouts/_notifications.html.haml
+++ b/app/views/layouts/_notifications.html.haml
@@ -59,7 +59,13 @@
                   .notification--dropdown-text
                     commented on
                     %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id), title: "#{notification.target.answer.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
-                      your answer
+                      - if notification.target.answer.user == current_user
+                        your
+                      - elsif notification.target.user == notification.target.answer.user
+                        their
+                      - else
+                        = user_screen_name(notification.target.answer.user, false, false) + "'s"
+                      answer
                     = time_ago_in_words notification.target.created_at
                     ago
     %li= link_to "Show all notifications#{" and mark them as read" if notifications.pluck(:new).any?}", notifications_path
\ No newline at end of file

From 6be70374c865235faa4e1b730ec781b999a92db2 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Tue, 21 Apr 2015 16:53:59 +0200
Subject: [PATCH 180/231] fixes Retrospring/bugs#5

---
 app/models/answer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 83b82918..d05e16a4 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -10,7 +10,7 @@ class Answer < ActiveRecord::Base
 
     Notification.notify self.question.user, self unless self.question.author_is_anonymous
     Subscription.subscribe self.user, self
-    Subscription.subscribe self.question.user, self
+    Subscription.subscribe self.question.user, self unless self.question.user.nil?
     self.user.increment! :answered_count
     self.question.increment! :answer_count
   end

From 305de8bf7bfa00ec4c2163ef52b12b1bddebe85b Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Tue, 21 Apr 2015 17:41:45 +0200
Subject: [PATCH 181/231] fix typo

---
 app/views/shared/_answerbox_buttons.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_answerbox_buttons.html.haml b/app/views/shared/_answerbox_buttons.html.haml
index 1daa1f2a..cd7d4523 100644
--- a/app/views/shared/_answerbox_buttons.html.haml
+++ b/app/views/shared/_answerbox_buttons.html.haml
@@ -26,7 +26,7 @@
           -#                                            fun joke    should subscribe?
           %a{href: '#', data: { a_id: a.id, action: 'ab-submarine', torpedo: "no" }}
             %i.fa.fa-anchor
-            Unubscribe
+            Unsubscribe
       - else
         %li
           %a{href: '#', data: { a_id: a.id, action: 'ab-submarine', torpedo: "yes" }}

From 1600cdf2954fce8626039be9d5b257a3af07dbcb Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Wed, 22 Apr 2015 03:52:18 +0530
Subject: [PATCH 182/231] Implements additions of and fixes retrospring/bugs#16

---
 app/assets/stylesheets/application.css.scss |  6 +--
 app/assets/stylesheets/scss/navbar.scss     | 45 ++++++++++++++++++++-
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index bbe044c2..f21b9c34 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -28,10 +28,10 @@ $font-size-h6:            ceil(($font-size-base * 0.85)); // ~12px
 $brand-primary: #5e35b1;
 $navbar-inverse-bg: #5e35b1;
 $navbar-inverse-link-color: #ffffff;
-$navbar-inverse-link-hover-color: #bfbfbf;
+$navbar-inverse-link-hover-color: #ffffff;
 $navbar-inverse-link-hover-bg: transparent;
-$navbar-inverse-link-active-color: #bfbfbf;
-$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 6.5%);
+$navbar-inverse-link-active-color: #ffffff;
+$navbar-inverse-link-active-bg: transparent;
 $navbar-inverse-link-disabled-color: darken(#fff, 12.5%);
 $navbar-inverse-link-disabled-bg: transparent;
 $navbar-inverse-brand-color: $navbar-inverse-link-color;
diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 388d08de..249e28c9 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -126,9 +126,50 @@
   min-height: 50px;
   min-width: 50px;
   height: 50px;
-  width: 50px;  
+  width: 50px;
 }
 
 .navbar-inverse {
   border: none;
-}
\ No newline at end of file
+}
+
+nav.navbar .nav > li:not(.profile--image-dropdown) {
+  & > *:first-child {
+    -moz-osx-font-smoothing: grayscale;
+    position: relative;
+
+    &:before {
+        content: "";
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: $navbar-inverse-link-color;
+        height: 0px;
+        -webkit-transition-property: height;
+        transition-property: height;
+        -webkit-transition-duration: 0.3s;
+        transition-duration: 0.3s;
+        -webkit-transition-timing-function: ease-out;
+        transition-timing-function: ease-out;
+    }
+
+    &:hover, &:focus, &:active {
+      &:before {
+        height: 4px
+      }
+    }
+  }
+
+  &.active *:first-child:before {
+    height: 4px;
+  }
+
+  & > .btn {
+    line-height: 50px;
+    width: 44px;
+    margin: 0;
+    border: 0;
+    padding: 0;
+  }
+}

From 1625ad623681ec82cb00ac0d9900409b9b89aa20 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Wed, 22 Apr 2015 03:55:11 +0530
Subject: [PATCH 183/231] No need to work on the first-child, work on the li
 directly

---
 app/assets/stylesheets/scss/navbar.scss | 52 ++++++++++---------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index 249e28c9..aa851a3a 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -134,42 +134,32 @@
 }
 
 nav.navbar .nav > li:not(.profile--image-dropdown) {
-  & > *:first-child {
-    -moz-osx-font-smoothing: grayscale;
-    position: relative;
+  -moz-osx-font-smoothing: grayscale;
+  position: relative;
 
+  &:before {
+      content: "";
+      position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background: $navbar-inverse-link-color;
+      height: 0px;
+      -webkit-transition-property: height;
+      transition-property: height;
+      -webkit-transition-duration: 0.3s;
+      transition-duration: 0.3s;
+      -webkit-transition-timing-function: ease-out;
+      transition-timing-function: ease-out;
+  }
+
+  &:hover, &:focus, &:active {
     &:before {
-        content: "";
-        position: absolute;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        background: $navbar-inverse-link-color;
-        height: 0px;
-        -webkit-transition-property: height;
-        transition-property: height;
-        -webkit-transition-duration: 0.3s;
-        transition-duration: 0.3s;
-        -webkit-transition-timing-function: ease-out;
-        transition-timing-function: ease-out;
-    }
-
-    &:hover, &:focus, &:active {
-      &:before {
-        height: 4px
-      }
+      height: 4px
     }
   }
 
-  &.active *:first-child:before {
+  &.active:before {
     height: 4px;
   }
-
-  & > .btn {
-    line-height: 50px;
-    width: 44px;
-    margin: 0;
-    border: 0;
-    padding: 0;
-  }
 }

From 20101e42135cae4685b0d6178c84f9cbe8f9e9cd Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Wed, 22 Apr 2015 00:31:51 +0200
Subject: [PATCH 184/231] update schema

---
 db/schema.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 4e3d67ca..58e85bbd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150419201122) do
+ActiveRecord::Schema.define(version: 20150421120557) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -156,6 +156,14 @@ ActiveRecord::Schema.define(version: 20150419201122) do
   add_index "smiles", ["user_id", "answer_id"], name: "index_smiles_on_user_id_and_answer_id", unique: true, using: :btree
   add_index "smiles", ["user_id"], name: "index_smiles_on_user_id", using: :btree
 
+  create_table "subscriptions", force: :cascade do |t|
+    t.integer  "user_id",                   null: false
+    t.integer  "answer_id",                 null: false
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+    t.boolean  "is_active",  default: true
+  end
+
   create_table "users", force: :cascade do |t|
     t.string   "email",                             default: "",    null: false
     t.string   "encrypted_password",                default: "",    null: false

From ef4fd30cd9dfff9a349aa1ee3124d1ef90bb93ee Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Wed, 22 Apr 2015 00:33:55 +0200
Subject: [PATCH 185/231] closes Retrospring/bugs#17

---
 app/models/user.rb                       | 2 +-
 app/views/devise/passwords/new.html.haml | 2 +-
 config/initializers/devise.rb            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 01a1e6e2..c92dabe4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,7 +68,7 @@ class User < ActiveRecord::Base
   end
 
   def self.find_first_by_auth_conditions(warden_conditions)
-    conditions = warden_conditions.dup.to_h
+    conditions = warden_conditions.dup
     if login = conditions.delete(:login)
       where(conditions).where(["lower(screen_name) = :value OR lower(email) = :value", { :value => login.downcase }]).first
     else
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index aa400f65..59aabb17 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -3,7 +3,7 @@
   = bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
     = devise_error_messages!
 
-    = f.text_field :screen_name, autofocus: true, label: "User name"
+    = f.text_field :login, autofocus: true, label: "User name"
     = f.submit "Send me password reset instructions"
 
   = render "devise/shared/links"
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 3aa9864d..fc6c699c 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -181,7 +181,7 @@ Devise.setup do |config|
   # ==> Configuration for :recoverable
   #
   # Defines which key will be used when recovering the password for an account
-  config.reset_password_keys = [ :screen_name ]
+  config.reset_password_keys = [ :login ]
 
   # Time interval you can reset your password with a reset password key.
   # Don't put a too small interval or your users won't have the time to

From ef0330eae9b75fa79170b9f816235e793521449b Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Wed, 22 Apr 2015 07:12:12 +0530
Subject: [PATCH 186/231] navbar mobile consistency

---
 app/assets/stylesheets/application.css.scss |  1 +
 app/assets/stylesheets/scss/navbar.scss     | 67 ++++++++++++++-------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index f21b9c34..1f1549fd 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -32,6 +32,7 @@ $navbar-inverse-link-hover-color: #ffffff;
 $navbar-inverse-link-hover-bg: transparent;
 $navbar-inverse-link-active-color: #ffffff;
 $navbar-inverse-link-active-bg: transparent;
+$navbar-inverse-link-active-bg-mobile: darken(#5e35b1, 7%);
 $navbar-inverse-link-disabled-color: darken(#fff, 12.5%);
 $navbar-inverse-link-disabled-bg: transparent;
 $navbar-inverse-brand-color: $navbar-inverse-link-color;
diff --git a/app/assets/stylesheets/scss/navbar.scss b/app/assets/stylesheets/scss/navbar.scss
index aa851a3a..3efc537f 100644
--- a/app/assets/stylesheets/scss/navbar.scss
+++ b/app/assets/stylesheets/scss/navbar.scss
@@ -133,33 +133,54 @@
   border: none;
 }
 
-nav.navbar .nav > li:not(.profile--image-dropdown) {
-  -moz-osx-font-smoothing: grayscale;
-  position: relative;
+@media (min-width: 768px) {
+  nav.navbar .nav > li:not(.profile--image-dropdown) {
+    -moz-osx-font-smoothing: grayscale;
+    position: relative;
 
-  &:before {
-      content: "";
-      position: absolute;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      background: $navbar-inverse-link-color;
-      height: 0px;
-      -webkit-transition-property: height;
-      transition-property: height;
-      -webkit-transition-duration: 0.3s;
-      transition-duration: 0.3s;
-      -webkit-transition-timing-function: ease-out;
-      transition-timing-function: ease-out;
-  }
-
-  &:hover, &:focus, &:active {
     &:before {
-      height: 4px
+        content: "";
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: $navbar-inverse-link-color;
+        height: 0px;
+        -webkit-transition-property: height;
+        transition-property: height;
+        -webkit-transition-duration: 0.3s;
+        transition-duration: 0.3s;
+        -webkit-transition-timing-function: ease-out;
+        transition-timing-function: ease-out;
+    }
+
+    &:hover, &:focus, &:active {
+      &:before {
+        height: 4px
+      }
+    }
+
+    &.active:before {
+      height: 4px;
     }
   }
+}
 
-  &.active:before {
-    height: 4px;
+@media (max-width: 768px) {
+  nav.navbar .nav {
+    margin-bottom: 0;
+    margin-top: 0;
+
+    & > li {
+      &.active a {
+        background-color: $navbar-inverse-link-active-bg-mobile !important;
+      }
+
+      &.dropdown.profile--image-dropdown a .visible-xs {
+        padding-left: 15px;
+        line-height: 40px;
+        margin: 0;
+      }
+    }
   }
 }

From b9bf0b04b67e15acffdeb07a85c5c36c660e245f Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Wed, 22 Apr 2015 08:29:10 +0530
Subject: [PATCH 187/231] Add support for report reasons

---
 .../answerbox/comment/report.coffee           | 23 +--------------
 .../javascripts/answerbox/report.coffee       | 23 +--------------
 .../javascripts/application.js.erb.coffee     |  1 +
 app/assets/javascripts/report.coffee          | 28 +++++++++++++++++++
 app/assets/javascripts/user.coffee            | 24 +---------------
 app/controllers/ajax/report_controller.rb     |  3 +-
 app/models/user.rb                            | 15 ++++++++--
 app/views/moderation/_moderationbox.html.haml | 10 ++++++-
 app/views/moderation/index.html.haml          |  2 +-
 .../20150422024104_add_reason_to_report.rb    |  5 ++++
 10 files changed, 61 insertions(+), 73 deletions(-)
 create mode 100644 app/assets/javascripts/report.coffee
 create mode 100644 db/migrate/20150422024104_add_reason_to_report.rb

diff --git a/app/assets/javascripts/answerbox/comment/report.coffee b/app/assets/javascripts/answerbox/comment/report.coffee
index 559552fa..672f3d98 100644
--- a/app/assets/javascripts/answerbox/comment/report.coffee
+++ b/app/assets/javascripts/answerbox/comment/report.coffee
@@ -2,25 +2,4 @@ $(document).on "click", "a[data-action=ab-comment-report]", (ev) ->
   ev.preventDefault()
   btn = $(this)
   cid = btn[0].dataset.cId
-  swal
-    title: "Really report?"
-    text: "A moderator will review this comment and decide what happens."
-    type: "warning"
-    showCancelButton: true
-    confirmButtonColor: "#DD6B55"
-    confirmButtonText: "Report"
-    closeOnConfirm: true
-  , ->
-    $.ajax
-      url: '/ajax/report'
-      type: 'POST'
-      data:
-        id: cid
-        type: 'comment'
-      success: (data, status, jqxhr) ->
-        showNotification data.message, data.success
-      error: (jqxhr, status, error) ->
-        console.log jqxhr, status, error
-        showNotification "An error occurred, a developer should check the console for details", false
-      complete: (jqxhr, status) ->
-        btn.button "reset"
\ No newline at end of file
+  reportDialog "comment", cid, -> btn.button "reset"
diff --git a/app/assets/javascripts/answerbox/report.coffee b/app/assets/javascripts/answerbox/report.coffee
index 266755b5..f9f64e65 100644
--- a/app/assets/javascripts/answerbox/report.coffee
+++ b/app/assets/javascripts/answerbox/report.coffee
@@ -2,25 +2,4 @@ $(document).on "click", "a[data-action=ab-report]", (ev) ->
   ev.preventDefault()
   btn = $(this)
   aid = btn[0].dataset.aId
-  swal
-    title: "Really report?"
-    text: "A moderator will review this answer and decide what happens."
-    type: "warning"
-    showCancelButton: true
-    confirmButtonColor: "#DD6B55"
-    confirmButtonText: "Report"
-    closeOnConfirm: true
-  , ->
-    $.ajax
-      url: '/ajax/report' # TODO: find a way to use rake routes instead of hardcoding them here
-      type: 'POST'
-      data:
-        id: aid
-        type: 'answer'
-      success: (data, status, jqxhr) ->
-        showNotification data.message, data.success
-      error: (jqxhr, status, error) ->
-        console.log jqxhr, status, error
-        showNotification "An error occurred, a developer should check the console for details", false
-      complete: (jqxhr, status) ->
-        btn.button "reset"
\ No newline at end of file
+  reportDialog "answer", aid, -> btn.button "reset"
diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee
index f34b63c9..9d0839b2 100644
--- a/app/assets/javascripts/application.js.erb.coffee
+++ b/app/assets/javascripts/application.js.erb.coffee
@@ -21,6 +21,7 @@
 #= require question
 #= require settings
 #= require user
+#= require report
 # not required:
 # _tree ./moderation
 
diff --git a/app/assets/javascripts/report.coffee b/app/assets/javascripts/report.coffee
new file mode 100644
index 00000000..a2603e1c
--- /dev/null
+++ b/app/assets/javascripts/report.coffee
@@ -0,0 +1,28 @@
+window.reportDialog = (type, target, callback) ->
+  swal
+    title: "Really report #{target}?"
+    text: "A moderator will review this #{type} and decide what happens.\nIf you'd like, you can also specify a reason."
+    type: "input"
+    showCancelButton: true
+    confirmButtonColor: "#DD6B55"
+    confirmButtonText: "Report"
+    closeOnConfirm: true
+    inputPlaceholder: "Specify a reason..."
+  , (value) ->
+    if typeof value == "boolean" && value == false
+      return false
+
+    $.ajax
+      url: '/ajax/report'
+      type: 'POST'
+      data:
+        id: target
+        type: type
+        reason: value
+      success: (data, status, jqxhr) ->
+        showNotification data.message, data.success
+      error: (jqxhr, status, error) ->
+        console.log jqxhr, status, error
+        showNotification "An error occurred, a developer should check the console for details", false
+      complete: (jqxhr, status) ->
+        callback type, target, jqxhr, status
diff --git a/app/assets/javascripts/user.coffee b/app/assets/javascripts/user.coffee
index 7ab8fd4d..e12e0407 100644
--- a/app/assets/javascripts/user.coffee
+++ b/app/assets/javascripts/user.coffee
@@ -50,26 +50,4 @@ $(document).on "click", "a[data-action=report-user]", (ev) ->
   ev.preventDefault()
   btn = $(this)
   target = btn[0].dataset.target
-
-  swal
-    title: "Really report #{target}?"
-    text: "A moderator will review this user and decide what happens."
-    type: "warning"
-    showCancelButton: true
-    confirmButtonColor: "#DD6B55"
-    confirmButtonText: "Report"
-    closeOnConfirm: true
-  , ->
-    $.ajax
-      url: '/ajax/report'
-      type: 'POST'
-      data:
-        id: target
-        type: 'user'
-      success: (data, status, jqxhr) ->
-        showNotification data.message, data.success
-      error: (jqxhr, status, error) ->
-        console.log jqxhr, status, error
-        showNotification "An error occurred, a developer should check the console for details", false
-      complete: (jqxhr, status) ->
-        btn.button "reset"
\ No newline at end of file
+  reportDialog "user", target, -> btn.button "reset"
diff --git a/app/controllers/ajax/report_controller.rb b/app/controllers/ajax/report_controller.rb
index bea0dcc5..42ab82da 100644
--- a/app/controllers/ajax/report_controller.rb
+++ b/app/controllers/ajax/report_controller.rb
@@ -22,13 +22,12 @@ class Ajax::ReportController < ApplicationController
                params[:type].strip.capitalize.constantize.find params[:id]
              end
 
-
     if object.nil?
       @message = "Could not find #{params[:type]}"
       return
     end
 
-    current_user.report object
+    current_user.report object, params[:reason]
 
     @status = :okay
     @message = "#{params[:type].capitalize} reported.  A moderator will decide what happens with the #{params[:type]}."
diff --git a/app/models/user.rb b/app/models/user.rb
index c92dabe4..d5b0cff1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -149,8 +149,19 @@ class User < ActiveRecord::Base
   end
 
   # region stuff used for reporting/moderation
-  def report(object)
-    Report.create(type: "Reports::#{object.class}", target_id: object.id, user_id: self.id)
+  def report(object, reason = nil)
+    existing = Report.find_by(target_id: object.id, user_id: self.id, deleted: false)
+    if existing.nil?
+      Report.create(type: "Reports::#{object.class}", target_id: object.id, user_id: self.id, reason: reason)
+    elsif not reason.nil? and reason.length > 0
+      if existing.reason.nil?
+        existing.update(reason: reason)
+      else
+        existing.update(reason: [existing.reason || "", reason].join("\n"))
+      end
+    else
+      existing
+    end
   end
 
   # @param upvote [Boolean]
diff --git a/app/views/moderation/_moderationbox.html.haml b/app/views/moderation/_moderationbox.html.haml
index a671a220..439b4eed 100644
--- a/app/views/moderation/_moderationbox.html.haml
+++ b/app/views/moderation/_moderationbox.html.haml
@@ -13,6 +13,14 @@
         = user_screen_name report.target
       - else
         = report.target.content
+    %p
+      %b
+        Reason:
+      %br
+      - (report.reason || "No reason provided.").lines.each do |reason|
+        - next unless reason.strip.length > 0
+        = reason.strip
+        %br
     .row
       .col-md-6.col-sm-4.col-xs-6.text-left
         %a.btn.btn-primary{href: content_url(report)}
@@ -32,4 +40,4 @@
         %button.btn.btn-default.btn-sm{type: :button, name: "mod-delete-report", data: { id: report.id }}
           %i.fa.fa-trash-o
   .panel-footer{id: "mod-comments-section-#{report.id}", style: 'display: none'}
-    %div{id: "mod-comments-#{report.id}"}= render 'moderation/discussion', report: report
\ No newline at end of file
+    %div{id: "mod-comments-#{report.id}"}= render 'moderation/discussion', report: report
diff --git a/app/views/moderation/index.html.haml b/app/views/moderation/index.html.haml
index 5fb59763..8a5c3e34 100644
--- a/app/views/moderation/index.html.haml
+++ b/app/views/moderation/index.html.haml
@@ -4,4 +4,4 @@
     = render 'moderation/moderation_tabs'
     .col-md-9.col-sm-9.col-xs-12
       - @reports.each do |r|
-        = render 'moderation/moderationbox', report: r
\ No newline at end of file
+        = render 'moderation/moderationbox', report: r
diff --git a/db/migrate/20150422024104_add_reason_to_report.rb b/db/migrate/20150422024104_add_reason_to_report.rb
new file mode 100644
index 00000000..c3f31615
--- /dev/null
+++ b/db/migrate/20150422024104_add_reason_to_report.rb
@@ -0,0 +1,5 @@
+class AddReasonToReport < ActiveRecord::Migration
+  def change
+    add_column :reports, :reason, :string, default: nil
+  end
+end

From 667bb155c92bd32c29d931f6e385f0f0098f888c Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Wed, 22 Apr 2015 18:19:14 +0200
Subject: [PATCH 188/231] fixes Retrospring/bugs#23

---
 app/views/moderation/_discussion.html.haml | 4 ++--
 app/views/shared/_comments.html.haml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/moderation/_discussion.html.haml b/app/views/moderation/_discussion.html.haml
index 0a027595..39e66a0c 100644
--- a/app/views/moderation/_discussion.html.haml
+++ b/app/views/moderation/_discussion.html.haml
@@ -2,7 +2,7 @@
   There are no comments yet.
 - else
   %ul.comments
-    - report.moderation_comments.all.each do |comment|
+    - report.moderation_comments.order(:created_at).each do |comment|
       %li{data: { comment_id: comment.id }}
         .media.comments--media
           .pull-left
@@ -22,4 +22,4 @@
             %p.comments--content= comment.content
 .form-group.has-feedback{name: 'mod-comment-new-group', data: { id: report.id }}
   %input.form-control.comments--box{type: :text, placeholder: 'Comment...', name: 'mod-comment-new', data: { id: report.id }}
-  %span.text-muted.form-control-feedback.comments--count{id: "mod-comment-charcount-#{report.id}"} 160
\ No newline at end of file
+  %span.text-muted.form-control-feedback.comments--count{id: "mod-comment-charcount-#{report.id}"} 160
diff --git a/app/views/shared/_comments.html.haml b/app/views/shared/_comments.html.haml
index e8ee64d2..20c52a0c 100644
--- a/app/views/shared/_comments.html.haml
+++ b/app/views/shared/_comments.html.haml
@@ -2,7 +2,7 @@
   There are no comments yet.
 - else
   %ul.comments
-    - a.comments.all.each do |comment|
+    - a.comments.order(:created_at).each do |comment|
       %li{data: { comment_id: comment.id }}
         .media.comments--media
           .pull-left
@@ -30,4 +30,4 @@
 - if user_signed_in?
   .form-group.has-feedback{name: 'ab-comment-new-group', data: { a_id: a.id }}
     %input.form-control.comments--box{type: :text, placeholder: 'Comment...', name: 'ab-comment-new', data: {a_id: a.id }}
-    %span.text-muted.form-control-feedback.comments--count{id: "ab-comment-charcount-#{a.id}"} 160
\ No newline at end of file
+    %span.text-muted.form-control-feedback.comments--count{id: "ab-comment-charcount-#{a.id}"} 160

From c8747fea446f97a347ea4081f0ec9f8f9d24b797 Mon Sep 17 00:00:00 2001
From: Georg G <nilsding@nilsding.org>
Date: Wed, 22 Apr 2015 18:29:12 +0200
Subject: [PATCH 189/231] replaced the id with the actual type

---
 app/assets/javascripts/report.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/report.coffee b/app/assets/javascripts/report.coffee
index a2603e1c..cd77eb1e 100644
--- a/app/assets/javascripts/report.coffee
+++ b/app/assets/javascripts/report.coffee
@@ -1,7 +1,7 @@
 window.reportDialog = (type, target, callback) ->
   swal
-    title: "Really report #{target}?"
-    text: "A moderator will review this #{type} and decide what happens.\nIf you'd like, you can also specify a reason."
+    title: "Really report this #{type}?"
+    text: "A moderator will review your report and decide what happens.\nIf you'd like, you can also specify a reason."
     type: "input"
     showCancelButton: true
     confirmButtonColor: "#DD6B55"

From cc16afe49bb220388068723136ba6e5bb1cf864d Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 23 Apr 2015 02:07:50 +0530
Subject: [PATCH 190/231] Users get notified by anonymous questions they asked.
 Fixes Retrospring/bugs#21

---
 app/models/answer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index d05e16a4..05f81c6c 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -8,9 +8,9 @@ class Answer < ActiveRecord::Base
   after_create do
     Inbox.where(user: self.user, question: self.question).destroy_all
 
-    Notification.notify self.question.user, self unless self.question.author_is_anonymous
+    Notification.notify self.question.user, self unless self.question.user == self.user or self.question.user.nil?
     Subscription.subscribe self.user, self
-    Subscription.subscribe self.question.user, self unless self.question.user.nil?
+    Subscription.subscribe self.question.user, self unless self.question.author_is_anonymous
     self.user.increment! :answered_count
     self.question.increment! :answer_count
   end

From be04d3528c765207c89e0c2d86f2733a05b284de Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 23 Apr 2015 06:26:29 +0530
Subject: [PATCH 191/231] Support for ban reasons and ban times. Fixes
 Retrospring/bugs#26 and Retrospring/bugs#25

---
 Rakefile                                      | 63 ++++++++++++++++++-
 .../javascripts/application.js.erb.coffee     |  3 +-
 .../javascripts/moderation.js.erb.coffee      |  2 +-
 app/assets/javascripts/moderation/ban.coffee  | 44 +++++++++++++
 .../javascripts/moderation/privileges.coffee  |  2 +-
 app/controllers/ajax/moderation_controller.rb | 44 ++++++++++++-
 app/controllers/application_controller.rb     |  7 +++
 app/models/user.rb                            | 17 +++++
 app/views/ajax/moderation/ban.json.jbuilder   |  1 +
 app/views/user/_actions.html.haml             | 10 ++-
 app/views/user/_modal_ban.html.haml           | 21 +++++++
 app/views/user/_modal_privileges.html.haml    |  2 -
 app/views/user/show.html.haml                 |  3 +-
 config/routes.rb                              |  1 +
 ...e_banned_to_permanently_banned_in_users.rb |  9 +++
 ...dd_ban_reason_and_banned_until_to_users.rb |  6 ++
 16 files changed, 222 insertions(+), 13 deletions(-)
 create mode 100644 app/assets/javascripts/moderation/ban.coffee
 create mode 100644 app/views/ajax/moderation/ban.json.jbuilder
 create mode 100644 app/views/user/_modal_ban.html.haml
 create mode 100644 db/migrate/20150422224203_rename_banned_to_permanently_banned_in_users.rb
 create mode 100644 db/migrate/20150422224225_add_ban_reason_and_banned_until_to_users.rb

diff --git a/Rakefile b/Rakefile
index fba3b892..113524c5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -94,11 +94,67 @@ namespace :justask do
   end
 
   desc "Hits an user with the banhammer."
-  task :ban, [:screen_name] => :environment do |t, args|
+  task :permanently_ban, [:screen_name, :reason] => :environment do |t, args|
     fail "screen name required" if args[:screen_name].nil?
     user = User.find_by_screen_name(args[:screen_name])
     fail "user #{args[:screen_name]} not found" if user.nil?
-    user.banned = true
+    user.permanently_banned = true
+    user.ban_reason = args[:reason]
+    user.save!
+    puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
+  end
+
+  desc "Hits an user with the banhammer for one day."
+  task :ban, [:screen_name, :reason] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    user.permanently_banned = false
+    user.banned_until = DateTime.now + 1
+    user.ban_reason = args[:reason]
+    user.save!
+    puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
+  end
+
+  desc "Hits an user with the banhammer for one week."
+  task :week_ban, [:screen_name, :reason] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    user.permanently_banned = false
+    user.banned_until = DateTime.now + 7
+    user.ban_reason = args[:reason]
+    user.save!
+    puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
+  end
+
+  desc "Hits an user with the banhammer for one month."
+  task :month_ban, [:screen_name, :reason] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    user.permanently_banned = false
+    user.banned_until = DateTime.now + 30
+    user.ban_reason = args[:reason]
+    user.save!
+    puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
+  end
+
+  desc "Hits an user with the banhammer for one year."
+  task :year_ban, [:screen_name, :reason] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    user.permanently_banned = false
+    user.banned_until = DateTime.now + 365
+    user.ban_reason = args[:reason]
+    user.save!
+    puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
+  end
+
+  desc "Hits an user with the banhammer for one aeon."
+  task :aeon_ban, [:screen_name, :reason] => :environment do |t, args|
+    fail "screen name required" if args[:screen_name].nil?
+    user = User.find_by_screen_name(args[:screen_name])
+    user.permanently_banned = false
+    user.banned_until = DateTime.now + 365_000_000_000
+    user.ban_reason = args[:reason]
     user.save!
     puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
   end
@@ -108,7 +164,8 @@ namespace :justask do
     fail "screen name required" if args[:screen_name].nil?
     user = User.find_by_screen_name(args[:screen_name])
     fail "user #{args[:screen_name]} not found" if user.nil?
-    user.banned = false
+    user.permanently_banned = false
+    user.banned_until = DateTime.now - 0.00001
     user.save!
     puts "#{user.screen_name} is no longer banned."
   end
diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee
index 9d0839b2..5fe872f9 100644
--- a/app/assets/javascripts/application.js.erb.coffee
+++ b/app/assets/javascripts/application.js.erb.coffee
@@ -41,7 +41,8 @@ $(document).on "click", "button#create-account", ->
   Turbolinks.visit "/sign_up"
 
 _ready = ->
-  sweetAlertInitialize()
+  if typeof sweetAlertInitialize != "undefined"
+    sweetAlertInitialize()
 
 $(document).ready _ready
 $(document).on 'page:load', _ready
diff --git a/app/assets/javascripts/moderation.js.erb.coffee b/app/assets/javascripts/moderation.js.erb.coffee
index 5a8a1551..dd1af163 100644
--- a/app/assets/javascripts/moderation.js.erb.coffee
+++ b/app/assets/javascripts/moderation.js.erb.coffee
@@ -1 +1 @@
-#= require_tree ./moderation
\ No newline at end of file
+#= require_tree ./moderation
diff --git a/app/assets/javascripts/moderation/ban.coffee b/app/assets/javascripts/moderation/ban.coffee
new file mode 100644
index 00000000..30e0cd61
--- /dev/null
+++ b/app/assets/javascripts/moderation/ban.coffee
@@ -0,0 +1,44 @@
+$(document).on "DOMContentLoaded", ->
+  parent = $ "#ban-control-super"
+  parent.find('#_ban').on "change", (event) ->
+    $t = $ this
+    if $t.is(":checked")
+      $("#ban-controls").show()
+    else
+      $("#ban-controls").hide()
+  parent.find('#_permaban').on "change", (event) ->
+    $t = $ this
+    if $t.is(":checked")
+      $("#ban-controls-time").hide()
+    else
+      $("#ban-controls-time").show()
+
+  parent.parent()[0].addEventListener "submit", (event) ->
+    event.preventDefault();
+
+    $("#modal-ban").modal "hide"
+
+    checktostr = (selector) ->
+      if $(selector)[0].checked
+        "1"
+      else
+        "0"
+
+    data = {
+      ban: checktostr "#_ban"
+      permaban: checktostr "#_permaban"
+      until: $("#until")[0].value
+      reason: $("#reason")[0].value
+      user: $("#_user")[0].value
+    }
+
+    $.ajax
+      url: '/ajax/mod/ban'
+      type: 'POST'
+      data: data
+      success: (data, status, jqxhr) ->
+        showNotification data.message, data.success
+      error: (jqxhr, status, error) ->
+        console.log jqxhr, status, error
+        showNotification "An error occurred, a developer should check the console for details", false
+      complete: (jqxhr, status) ->
diff --git a/app/assets/javascripts/moderation/privileges.coffee b/app/assets/javascripts/moderation/privileges.coffee
index 6f676851..c64c4c38 100644
--- a/app/assets/javascripts/moderation/privileges.coffee
+++ b/app/assets/javascripts/moderation/privileges.coffee
@@ -21,4 +21,4 @@
       console.log jqxhr, status, error
       showNotification "An error occurred, a developer should check the console for details", false
     complete: (jqxhr, status) ->
-      box.removeAttr "disabled"
\ No newline at end of file
+      box.removeAttr "disabled"
diff --git a/app/controllers/ajax/moderation_controller.rb b/app/controllers/ajax/moderation_controller.rb
index 12580420..b6b5cb01 100644
--- a/app/controllers/ajax/moderation_controller.rb
+++ b/app/controllers/ajax/moderation_controller.rb
@@ -105,6 +105,45 @@ class Ajax::ModerationController < ApplicationController
     @success = true
   end
 
+  def ban
+    @status = :err
+    @message = "Weird..."
+    @success = false
+
+    params.require :user
+    params.require :ban
+    params.require :permaban
+
+    reason = params[:reason]
+    target = User.find_by_screen_name(params[:user])
+    unban  = params[:ban] == "0"
+    perma  = params[:permaban] == "1"
+
+    buntil = DateTime.strptime params[:until], "%Y-%m-%dT%H:%M" unless unban or perma
+
+    if not unban and target.admin?
+      @status = :nopriv
+      @message = "You cannot ban an administrator!"
+      @success = false
+    end
+
+    if unban
+      target.unban
+      @message = "Unbanned user."
+      @success = true
+    elsif perma
+      target.ban nil, reason
+      @message = "Permanently banned user."
+    else
+      target.ban buntil, reason
+      @message = "Banned user until #{buntil.to_s}"
+    end
+    target.save!
+
+    @status = :okay
+    @success = target.banned? == !unban
+  end
+
   def privilege
     @status = :err
     @success = false
@@ -118,10 +157,9 @@ class Ajax::ModerationController < ApplicationController
     target_user = User.find_by_screen_name(params[:user])
 
     @message = "nope!"
-    return unless %w(banned blogger supporter moderator admin contributor).include? params[:type].downcase
+    return unless %w(blogger supporter moderator admin contributor).include? params[:type].downcase
 
-    if (%w(supporter moderator admin).include?(params[:type].downcase) and !current_user.admin?) or
-      (params[:type].downcase == 'banned' and target_user.admin?)
+    if %w(supporter moderator admin).include?(params[:type].downcase) and !current_user.admin?
       @status = :nopriv
       @message = "You'd better check YOUR privileges first!"
       @success = false
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 42840939..e178da33 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,6 +12,13 @@ class ApplicationController < ActionController::Base
       name = current_user.screen_name
       # obligatory '2001: A Space Odyssey' reference
       flash[:notice] = "I'm sorry, #{name}, I'm afraid I can't do that."
+      if current_user.ban_reason.nil?
+        flash[:notice] += "\nBan reason: #{current_user.ban_reason}"
+      end
+      if not current_user.permanently_banned?
+        # TODO format banned_until
+        flash[:notice] += "\nBanned until: #{current_user.banned_until}"
+      end
       sign_out current_user
       redirect_to new_user_session_path
     end
diff --git a/app/models/user.rb b/app/models/user.rb
index d5b0cff1..9d4eaa2b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -196,4 +196,21 @@ class User < ActiveRecord::Base
   def cropping?
     !crop_x.blank? && !crop_y.blank? && !crop_w.blank? && !crop_h.blank?
   end
+
+  # forwards fill
+  def banned?
+    self.permanently_banned? or ((not self.banned_until.nil?) and self.banned_until > DateTime.now)
+  end
+
+  def unban
+    self.update(permanently_banned: false, ban_reason: nil, banned_until: nil)
+  end
+
+  def ban(buntil=nil, reason=nil)
+    if buntil == nil
+      self.update(permanently_banned: true, ban_reason: reason)
+    else
+      self.update(permanently_banned: false, banned_until: buntil, ban_reason: reason)
+    end
+  end
 end
diff --git a/app/views/ajax/moderation/ban.json.jbuilder b/app/views/ajax/moderation/ban.json.jbuilder
new file mode 100644
index 00000000..f98b3c38
--- /dev/null
+++ b/app/views/ajax/moderation/ban.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'ajax/shared/status'
diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml
index 6ed47740..d8678d62 100644
--- a/app/views/user/_actions.html.haml
+++ b/app/views/user/_actions.html.haml
@@ -35,4 +35,12 @@
               Check
               = succeed "'s" do
                 = user.screen_name
-              privileges
\ No newline at end of file
+              privileges
+          %li
+            %a{href: '#', data: { target: "#modal-ban", toggle: :modal }}
+              %i.fa.fa-wrench
+              - if user.banned?
+                Unban or extend ban duration
+              - else
+                Ban
+                = user.screen_name
diff --git a/app/views/user/_modal_ban.html.haml b/app/views/user/_modal_ban.html.haml
new file mode 100644
index 00000000..50917c33
--- /dev/null
+++ b/app/views/user/_modal_ban.html.haml
@@ -0,0 +1,21 @@
+#modal-ban.modal.fade{"aria-hidden" => "true", "aria-labelledby" => "modal-ban-label", :role => "dialog", :tabindex => "-1"}
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{"data-dismiss" => "modal", :type => "button"}
+          %span{"aria-hidden" => "true"} ×
+          %span.sr-only Close
+        %h4#modal-ban-label.modal-title
+          Ban Control Center
+      = bootstrap_form_tag(url: '/mod/ban', html: { method: :post, novalidate: "novalidate" }) do |f|
+        = f.hidden_field :user, value: @user.screen_name
+        #ban-control-super.modal-body
+          = f.check_box :ban, label: "Ban?", checked: @user.banned?
+          #ban-controls{style: "#{"display: none" unless @user.banned?}"}
+            = f.check_box :permaban, label: "Permanently?", checked: @user.permanently_banned?
+            #ban-controls-time{style: "#{"display: none" unless not @user.permanently_banned?}"}
+              = f.datetime_local_field :until, label: "", required: true, value: (@user.banned_until || DateTime.now).strftime("%Y-%m-%dT%H:%M")
+            = f.text_field :reason, placeholder: "Reason", value: @user.ban_reason
+        .modal-footer
+          %button.btn.btn-default{name: 'stop-time', type: :button, data: { dismiss: :modal }} Close
+          = f.submit "Hammer Time", class: "btn btn-primary", name: 'hammer-time'
diff --git a/app/views/user/_modal_privileges.html.haml b/app/views/user/_modal_privileges.html.haml
index 3edbb981..265a3330 100644
--- a/app/views/user/_modal_privileges.html.haml
+++ b/app/views/user/_modal_privileges.html.haml
@@ -11,8 +11,6 @@
             = @user.screen_name
           privileges
       %ul.list-group.groups--list
-        - unless @user.admin?
-          = render 'user/modal_privileges_item', privilege: 'banned', description: 'Hit the user with ye olde banhammer', user: @user
         = render 'user/modal_privileges_item', privilege: 'blogger', description: 'The user gets that privilege if they blogged something (nice) about Retrospring.', user: @user
         = render 'user/modal_privileges_item', privilege: 'contributor', description: "This user has contributed to justask#{" (the software behind #{APP_CONFIG['site_name']})" unless APP_CONFIG['site_name'] == 'justask'}.", user: @user
         - if current_user.admin?
diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index 53401652..252fde35 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -18,4 +18,5 @@
 - if user_signed_in?
   = render 'user/modal_group_memberships'
   - if current_user.mod? and @user != current_user
-    = render 'user/modal_privileges'
\ No newline at end of file
+    = render 'user/modal_privileges'
+    = render 'user/modal_ban'
diff --git a/config/routes.rb b/config/routes.rb
index 475b516a..f267bd9f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,6 +21,7 @@ Rails.application.routes.draw do
       match '/mod/create_vote', to: 'moderation#vote', via: :post, as: :mod_create_vote
       match '/mod/destroy_vote', to: 'moderation#destroy_vote', via: :post, as: :mod_destroy_vote
       match '/mod/privilege', to: 'moderation#privilege', via: :post, as: :mod_privilege
+      match '/mod/ban', to: 'moderation#ban', via: :post, as: :mod_ban
     end
   end
 
diff --git a/db/migrate/20150422224203_rename_banned_to_permanently_banned_in_users.rb b/db/migrate/20150422224203_rename_banned_to_permanently_banned_in_users.rb
new file mode 100644
index 00000000..26d50c78
--- /dev/null
+++ b/db/migrate/20150422224203_rename_banned_to_permanently_banned_in_users.rb
@@ -0,0 +1,9 @@
+class RenameBannedToPermanentlyBannedInUsers < ActiveRecord::Migration
+  def up
+    rename_column :users, :banned, :permanently_banned
+  end
+
+  def down
+    rename_column :users, :permanently_banned, :banned
+  end
+end
diff --git a/db/migrate/20150422224225_add_ban_reason_and_banned_until_to_users.rb b/db/migrate/20150422224225_add_ban_reason_and_banned_until_to_users.rb
new file mode 100644
index 00000000..9e2ac7a4
--- /dev/null
+++ b/db/migrate/20150422224225_add_ban_reason_and_banned_until_to_users.rb
@@ -0,0 +1,6 @@
+class AddBanReasonAndBannedUntilToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :ban_reason, :string, default: nil
+    add_column :users, :banned_until, :datetime, default: nil
+  end
+end

From 99965adb7bf7f0126fe63366b4de0a88376b78a9 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 23 Apr 2015 06:29:20 +0530
Subject: [PATCH 192/231] Let's not be silly.

---
 Rakefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 113524c5..8312e199 100644
--- a/Rakefile
+++ b/Rakefile
@@ -165,7 +165,8 @@ namespace :justask do
     user = User.find_by_screen_name(args[:screen_name])
     fail "user #{args[:screen_name]} not found" if user.nil?
     user.permanently_banned = false
-    user.banned_until = DateTime.now - 0.00001
+    user.banned_until = nil
+    user.ban_reason = nil
     user.save!
     puts "#{user.screen_name} is no longer banned."
   end

From 407595c12bf9a2d73acee09ef29db034f28ae20b Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 23 Apr 2015 06:31:48 +0530
Subject: [PATCH 193/231] Missing return statement

---
 app/controllers/ajax/moderation_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/ajax/moderation_controller.rb b/app/controllers/ajax/moderation_controller.rb
index b6b5cb01..9d149ead 100644
--- a/app/controllers/ajax/moderation_controller.rb
+++ b/app/controllers/ajax/moderation_controller.rb
@@ -125,6 +125,7 @@ class Ajax::ModerationController < ApplicationController
       @status = :nopriv
       @message = "You cannot ban an administrator!"
       @success = false
+      return
     end
 
     if unban

From 118441027526567bfc7263149c26c4818960d796 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 23 Apr 2015 06:39:23 +0530
Subject: [PATCH 194/231] Forbid admins getting banned

---
 app/views/user/_actions.html.haml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/views/user/_actions.html.haml b/app/views/user/_actions.html.haml
index d8678d62..1c70e9ab 100644
--- a/app/views/user/_actions.html.haml
+++ b/app/views/user/_actions.html.haml
@@ -36,11 +36,8 @@
               = succeed "'s" do
                 = user.screen_name
               privileges
-          %li
-            %a{href: '#', data: { target: "#modal-ban", toggle: :modal }}
-              %i.fa.fa-wrench
-              - if user.banned?
-                Unban or extend ban duration
-              - else
-                Ban
-                = user.screen_name
+          - unless user.admin?
+            %li
+              %a{href: '#', data: { target: "#modal-ban", toggle: :modal }}
+                %i.fa.fa-ban
+                Ban Control

From 5764c36b32062682eec445970ffecc3f838b773c Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 23 Apr 2015 06:48:17 +0530
Subject: [PATCH 195/231] DateTime.now -> DateTime.current

---
 Rakefile                            | 10 +++++-----
 app/models/user.rb                  |  2 +-
 app/views/user/_modal_ban.html.haml |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index 8312e199..32b1647b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -109,7 +109,7 @@ namespace :justask do
     fail "screen name required" if args[:screen_name].nil?
     user = User.find_by_screen_name(args[:screen_name])
     user.permanently_banned = false
-    user.banned_until = DateTime.now + 1
+    user.banned_until = DateTime.current + 1
     user.ban_reason = args[:reason]
     user.save!
     puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
@@ -120,7 +120,7 @@ namespace :justask do
     fail "screen name required" if args[:screen_name].nil?
     user = User.find_by_screen_name(args[:screen_name])
     user.permanently_banned = false
-    user.banned_until = DateTime.now + 7
+    user.banned_until = DateTime.current + 7
     user.ban_reason = args[:reason]
     user.save!
     puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
@@ -131,7 +131,7 @@ namespace :justask do
     fail "screen name required" if args[:screen_name].nil?
     user = User.find_by_screen_name(args[:screen_name])
     user.permanently_banned = false
-    user.banned_until = DateTime.now + 30
+    user.banned_until = DateTime.current + 30
     user.ban_reason = args[:reason]
     user.save!
     puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
@@ -142,7 +142,7 @@ namespace :justask do
     fail "screen name required" if args[:screen_name].nil?
     user = User.find_by_screen_name(args[:screen_name])
     user.permanently_banned = false
-    user.banned_until = DateTime.now + 365
+    user.banned_until = DateTime.current + 365
     user.ban_reason = args[:reason]
     user.save!
     puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
@@ -153,7 +153,7 @@ namespace :justask do
     fail "screen name required" if args[:screen_name].nil?
     user = User.find_by_screen_name(args[:screen_name])
     user.permanently_banned = false
-    user.banned_until = DateTime.now + 365_000_000_000
+    user.banned_until = DateTime.current + 365_000_000_000
     user.ban_reason = args[:reason]
     user.save!
     puts "#{user.screen_name} got hit by\033[5m YE OLDE BANHAMMER\033[0m!!1!"
diff --git a/app/models/user.rb b/app/models/user.rb
index 9d4eaa2b..0ddc388c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -199,7 +199,7 @@ class User < ActiveRecord::Base
 
   # forwards fill
   def banned?
-    self.permanently_banned? or ((not self.banned_until.nil?) and self.banned_until > DateTime.now)
+    self.permanently_banned? or ((not self.banned_until.nil?) and self.banned_until >= DateTime.current)
   end
 
   def unban
diff --git a/app/views/user/_modal_ban.html.haml b/app/views/user/_modal_ban.html.haml
index 50917c33..2794baf9 100644
--- a/app/views/user/_modal_ban.html.haml
+++ b/app/views/user/_modal_ban.html.haml
@@ -14,7 +14,7 @@
           #ban-controls{style: "#{"display: none" unless @user.banned?}"}
             = f.check_box :permaban, label: "Permanently?", checked: @user.permanently_banned?
             #ban-controls-time{style: "#{"display: none" unless not @user.permanently_banned?}"}
-              = f.datetime_local_field :until, label: "", required: true, value: (@user.banned_until || DateTime.now).strftime("%Y-%m-%dT%H:%M")
+              = f.datetime_local_field :until, label: "", required: true, value: (@user.banned_until || DateTime.current).strftime("%Y-%m-%dT%H:%M")
             = f.text_field :reason, placeholder: "Reason", value: @user.ban_reason
         .modal-footer
           %button.btn.btn-default{name: 'stop-time', type: :button, data: { dismiss: :modal }} Close

From f4b5289d3afe84b67402e77d76eec1e77ef477f2 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 23 Apr 2015 07:03:21 +0530
Subject: [PATCH 196/231] Actually fixes Retrospring/bugs#25

---
 app/views/user/show.html.haml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index 252fde35..568706b9 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -5,15 +5,16 @@
     .hidden-xs= render 'shared/links'
   .col-md-9.col-xs-12.col-sm-8.j2-col-reset
     = render 'shared/questionbox'
-    #answers
-      - @answers.each do |a|
-        = render 'shared/answerbox', a: a
+    = unless @user.banned?
+      #answers
+        - @answers.each do |a|
+          = render 'shared/answerbox', a: a
 
-    #pagination= will_paginate @answers, renderer: BootstrapPagination::Rails, page_links: false
+      #pagination= will_paginate @answers, renderer: BootstrapPagination::Rails, page_links: false
 
-    - if @answers.next_page
-      %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @answers.current_page }}
-        Load more
+      - if @answers.next_page
+        %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @answers.current_page }}
+          Load more
   .visible-xs= render 'shared/links'
 - if user_signed_in?
   = render 'user/modal_group_memberships'

From 4d5d7fdcc101a7c67191dd13d52a5af395536e57 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Fri, 24 Apr 2015 00:37:39 +0530
Subject: [PATCH 197/231] Bootstrap-datetimepicker

---
 Gemfile                                         |  3 ++-
 Gemfile.lock                                    |  6 ++++++
 app/assets/javascripts/moderation.js.erb.coffee |  2 ++
 app/assets/javascripts/moderation/ban.coffee    | 12 ++++++++++++
 app/assets/stylesheets/application.css.scss     |  7 +++++++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 9c48ce5a..f966887f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,6 +33,8 @@ gem 'font-awesome-rails', '~> 4.3.0.0'
 gem 'rails-assets-growl'
 gem "paperclip", "~> 4.2"
 gem 'delayed_paperclip'
+gem 'momentjs-rails', '>= 2.9.0'
+gem 'bootstrap3-datetimepicker-rails', '~> 4.7.14'
 
 gem 'ruby-progressbar'
 
@@ -78,4 +80,3 @@ group :development, :test do
   gem 'simplecov-rcov', require: false
   gem 'database_cleaner'
 end
-
diff --git a/Gemfile.lock b/Gemfile.lock
index e5e5c83a..b94af2ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,6 +48,8 @@ GEM
     bcrypt (3.1.10)
     bootstrap-sass (3.2.0.2)
       sass (~> 3.2)
+    bootstrap3-datetimepicker-rails (4.7.14)
+      momentjs-rails (>= 2.8.1)
     bootstrap_form (2.3.0)
     bootswatch-rails (3.2.4)
       railties (>= 3.1)
@@ -149,6 +151,8 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.6.0)
+    momentjs-rails (2.9.0)
+      railties (>= 3.1)
     multi_json (1.11.0)
     multipart-post (2.0.0)
     mysql2 (0.3.18)
@@ -362,6 +366,7 @@ PLATFORMS
 DEPENDENCIES
   bcrypt (~> 3.1.7)
   bootstrap-sass (~> 3.2.0.1)
+  bootstrap3-datetimepicker-rails (~> 4.7.14)
   bootstrap_form
   bootswatch-rails
   capybara
@@ -380,6 +385,7 @@ DEPENDENCIES
   jbuilder (~> 2.2.4)
   jquery-rails
   jquery-turbolinks
+  momentjs-rails (>= 2.9.0)
   mysql2
   nprogress-rails
   omniauth
diff --git a/app/assets/javascripts/moderation.js.erb.coffee b/app/assets/javascripts/moderation.js.erb.coffee
index dd1af163..60eefeaf 100644
--- a/app/assets/javascripts/moderation.js.erb.coffee
+++ b/app/assets/javascripts/moderation.js.erb.coffee
@@ -1 +1,3 @@
+#= require moment
+#= require bootstrap-datetimepicker
 #= require_tree ./moderation
diff --git a/app/assets/javascripts/moderation/ban.coffee b/app/assets/javascripts/moderation/ban.coffee
index 30e0cd61..4e90d5b8 100644
--- a/app/assets/javascripts/moderation/ban.coffee
+++ b/app/assets/javascripts/moderation/ban.coffee
@@ -13,6 +13,18 @@ $(document).on "DOMContentLoaded", ->
     else
       $("#ban-controls-time").show()
 
+  $("#until").addClass("remove-native-picker").datetimepicker
+    icons:
+      time: "fa fa-clock-o"
+      date: "fa fa-calendar"
+      up: "fa fa-chevron-up"
+      down: "fa fa-chevron-down"
+      previous: "fa fa-chevron-left"
+      next: "fa fa-chevron-right"
+      today: "fa fa-home"
+      clear: "fa fa-trash-o"
+      close: "fa fa-times"
+
   parent.parent()[0].addEventListener "submit", (event) ->
     event.preventDefault();
 
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 1f1549fd..dff05d54 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -45,7 +45,14 @@ $navbar-inverse-toggle-border-color: #512da8;
 @import "bootswatch/cosmo/variables";
 
 @import "bootstrap";
+
 body { padding-top: $navbar-height; }
+
+@import 'bootstrap-datetimepicker';
+.remove-native-picker::-webkit-calendar-picker-indicator{
+  display: none
+}
+
 @import "bootswatch/cosmo/bootswatch";
 
 @import "base";

From 0bb3895ce8151c93c81f5f7f5b1d26ce1f90bfda Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Fri, 24 Apr 2015 00:51:58 +0530
Subject: [PATCH 198/231] Small fixes

---
 app/assets/javascripts/moderation/ban.coffee  | 8 +++++---
 app/controllers/ajax/moderation_controller.rb | 2 +-
 app/views/user/_modal_ban.html.haml           | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/moderation/ban.coffee b/app/assets/javascripts/moderation/ban.coffee
index 4e90d5b8..87ec6555 100644
--- a/app/assets/javascripts/moderation/ban.coffee
+++ b/app/assets/javascripts/moderation/ban.coffee
@@ -13,7 +13,9 @@ $(document).on "DOMContentLoaded", ->
     else
       $("#ban-controls-time").show()
 
-  $("#until").addClass("remove-native-picker").datetimepicker
+  parent.find("#until").datetimepicker
+    defaultDate: parent.find("#until").val()
+    sideBySide: true
     icons:
       time: "fa fa-clock-o"
       date: "fa fa-calendar"
@@ -39,8 +41,8 @@ $(document).on "DOMContentLoaded", ->
     data = {
       ban: checktostr "#_ban"
       permaban: checktostr "#_permaban"
-      until: $("#until")[0].value
-      reason: $("#reason")[0].value
+      until: $("#until")[0].value.trim()
+      reason: $("#reason")[0].value.trim()
       user: $("#_user")[0].value
     }
 
diff --git a/app/controllers/ajax/moderation_controller.rb b/app/controllers/ajax/moderation_controller.rb
index 9d149ead..82b438af 100644
--- a/app/controllers/ajax/moderation_controller.rb
+++ b/app/controllers/ajax/moderation_controller.rb
@@ -119,7 +119,7 @@ class Ajax::ModerationController < ApplicationController
     unban  = params[:ban] == "0"
     perma  = params[:permaban] == "1"
 
-    buntil = DateTime.strptime params[:until], "%Y-%m-%dT%H:%M" unless unban or perma
+    buntil = DateTime.strptime params[:until], "%m/%d/%Y %I:%M %p" unless unban or perma
 
     if not unban and target.admin?
       @status = :nopriv
diff --git a/app/views/user/_modal_ban.html.haml b/app/views/user/_modal_ban.html.haml
index 2794baf9..cdfb1fb8 100644
--- a/app/views/user/_modal_ban.html.haml
+++ b/app/views/user/_modal_ban.html.haml
@@ -14,7 +14,7 @@
           #ban-controls{style: "#{"display: none" unless @user.banned?}"}
             = f.check_box :permaban, label: "Permanently?", checked: @user.permanently_banned?
             #ban-controls-time{style: "#{"display: none" unless not @user.permanently_banned?}"}
-              = f.datetime_local_field :until, label: "", required: true, value: (@user.banned_until || DateTime.current).strftime("%Y-%m-%dT%H:%M")
+              = f.text_field :until, label: "", required: true, value: (@user.banned_until || DateTime.current).strftime("%m/%d/%Y %I:%M %p")
             = f.text_field :reason, placeholder: "Reason", value: @user.ban_reason
         .modal-footer
           %button.btn.btn-default{name: 'stop-time', type: :button, data: { dismiss: :modal }} Close

From 4ad9916c7e00b4b13f222fc3a0c7a990daf0c856 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Fri, 24 Apr 2015 04:22:52 +0530
Subject: [PATCH 199/231] Rename 'delete answer' to 'return to inbox' for
 clarity

---
 app/assets/javascripts/answerbox/destroy.coffee | 9 +++++----
 app/views/shared/_answerbox_buttons.html.haml   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/answerbox/destroy.coffee b/app/assets/javascripts/answerbox/destroy.coffee
index 2a343bb6..b164012a 100644
--- a/app/assets/javascripts/answerbox/destroy.coffee
+++ b/app/assets/javascripts/answerbox/destroy.coffee
@@ -3,12 +3,13 @@ $(document).on "click", "a[data-action=ab-destroy]", (ev) ->
   btn = $(this)
   aid = btn[0].dataset.aId
   swal
-    title: "Really delete?"
-    text: "The question will be moved back to your inbox."
+    title: "Are you sure?"
+    text: "The question will be moved back to your inbox, but it won't delete any posts to social media."
     type: "warning"
     showCancelButton: true
     confirmButtonColor: "#DD6B55"
-    confirmButtonText: "Delete"
+    confirmButtonText: "Yes"
+    cancelButtonText: "No"
     closeOnConfirm: true
   , ->
     $.ajax
@@ -23,4 +24,4 @@ $(document).on "click", "a[data-action=ab-destroy]", (ev) ->
       error: (jqxhr, status, error) ->
         console.log jqxhr, status, error
         showNotification "An error occurred, a developer should check the console for details", false
-      complete: (jqxhr, status) ->
\ No newline at end of file
+      complete: (jqxhr, status) ->
diff --git a/app/views/shared/_answerbox_buttons.html.haml b/app/views/shared/_answerbox_buttons.html.haml
index cd7d4523..da2262fe 100644
--- a/app/views/shared/_answerbox_buttons.html.haml
+++ b/app/views/shared/_answerbox_buttons.html.haml
@@ -36,7 +36,7 @@
         %li.text-danger
           %a{href: '#', data: { a_id: a.id, action: 'ab-destroy' }}
             %i.fa.fa-trash-o
-            Delete
+            Return to Inbox
       - unless a.user == current_user
         %li
           %a{href: '#', data: { a_id: a.id, action: 'ab-report' }}

From ba9262145d00378ae14aa69b312ff436518875ff Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Sun, 26 Apr 2015 03:23:22 +0530
Subject: [PATCH 200/231] Show 'View reported User' in addition to the other
 buttons if reason.target.user is present

---
 app/views/moderation/_moderationbox.html.haml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/moderation/_moderationbox.html.haml b/app/views/moderation/_moderationbox.html.haml
index 439b4eed..605a075a 100644
--- a/app/views/moderation/_moderationbox.html.haml
+++ b/app/views/moderation/_moderationbox.html.haml
@@ -26,6 +26,9 @@
         %a.btn.btn-primary{href: content_url(report)}
           View reported
           = report.type.sub('Reports::', '')
+        - if report.target.respond_to? :user and not report.target.user.nil?
+          %a.btn.btn-primary{href: show_user_profile_path(report.target.user.screen_name)}
+            View reported User
       .col-md-6.col-sm-8.col-xs-6.text-right
         %span.mod-count{id: "mod-count-#{report.id}"}
           = report.votes

From c8ba89dd1e68f440255e1d367b54cb9bc3f80024 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sun, 26 Apr 2015 02:18:57 +0200
Subject: [PATCH 201/231] change question display and add report placeholder

---
 app/assets/stylesheets/base.css.scss       | 12 +++++-
 app/assets/stylesheets/scss/answerbox.scss | 20 ++++++++-
 app/assets/stylesheets/scss/variable.scss  |  2 +
 app/views/question/show.html.haml          | 48 ++++++++++++++--------
 app/views/shared/_answerbox.html.haml      | 22 ++++++++--
 db/schema.rb                               | 14 +++++--
 6 files changed, 93 insertions(+), 25 deletions(-)
 create mode 100644 app/assets/stylesheets/scss/variable.scss

diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index 64492254..c580bf84 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -19,6 +19,16 @@ body {
   padding-top: 30px;
 }
 
+.question-page {
+  padding-top: 100px;
+}
+
+@media(max-width: $screen-xs-max) {
+  .question-page {
+    padding-top: 130px;
+  }
+}
+
 .centre {
   text-align: center;
 }
@@ -135,4 +145,4 @@ body {
 
 .panel-default {
   border-color: transparent;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/scss/answerbox.scss b/app/assets/stylesheets/scss/answerbox.scss
index 2cfb92b1..c2d909e2 100644
--- a/app/assets/stylesheets/scss/answerbox.scss
+++ b/app/assets/stylesheets/scss/answerbox.scss
@@ -34,9 +34,27 @@
 
 .answerbox--question-text {
   line-height: 1.3em;
+  overflow: hidden;
 }
 
 .answerbox--answer-date {
   font-size: 12px;
   line-height: 1.3em;
-}
\ No newline at end of file
+}
+
+.panel-question {
+  position: fixed;
+  border-top: 1px solid #fff;
+  width: 100%;
+  z-index: 999;
+}
+
+.answerbox--question-media, .question-media, .question-body {
+  overflow: visible !important;
+}
+
+.question-actions {
+  position: absolute;
+  top: 10px;
+  right: 20px;
+}
diff --git a/app/assets/stylesheets/scss/variable.scss b/app/assets/stylesheets/scss/variable.scss
new file mode 100644
index 00000000..56c04a46
--- /dev/null
+++ b/app/assets/stylesheets/scss/variable.scss
@@ -0,0 +1,2 @@
+$main-color: #5e35b1;
+$black: #000;
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index b02aeaf5..2785f759 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -1,19 +1,35 @@
-.container.j2-page
+.panel.panel-default.panel-question
+  .panel-body
+    .media.question-media
+      - unless @question.author_is_anonymous
+        %a.pull-left{href: show_user_profile_path(@question.user.screen_name)}
+          %img.img-rounded.answerbox--img{src: gravatar_url(@question.user)}
+      .media-body.question-body
+        %h6.text-muted.media-heading.answerbox--question-user
+          = user_screen_name @question.user, @question.author_is_anonymous
+          asked
+          %span{title: @question.created_at, data: { toggle: :tooltip, placement: :bottom }}
+            = time_ago_in_words(@question.created_at)
+          ago
+        - if user_signed_in?
+          .pull-right
+            .btn-group.question-actions
+              %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
+                %span.caret
+              %ul.dropdown-menu.dropdown-menu-right{role: :menu}
+                - if current_user.mod?
+                  %li.text-danger
+                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id }}
+                      %i.fa.fa-trash-o
+                      Delete
+                - unless @question.user == current_user
+                  %li
+                    %a{href: '#', data: { action: 'ab-question-report', q_id: @question.id }}
+                      %i.fa.fa-exclamation-triangle
+                      Report
+        %p.answerbox--question-text= @question.content
+.container.question-page
   / TODO: make this pretty (it's currently C-c'd straight from shared/_answerbox)
-  .panel.panel-default
-    .panel-body
-      .media
-        - unless @question.author_is_anonymous
-          %a.pull-left{href: show_user_profile_path(@question.user.screen_name)}
-            %img.img-rounded.answerbox--img{src: gravatar_url(@question.user)}
-        .media-body
-          %h6.text-muted.media-heading.answerbox--question-user
-            = user_screen_name @question.user, @question.author_is_anonymous
-            asked
-            %span{title: @question.created_at, data: { toggle: :tooltip, placement: :bottom }}
-              = time_ago_in_words(@question.created_at)
-            ago
-          %p.answerbox--question-text= @question.content
 
   #answers
     - @answers.each do |a|
@@ -38,4 +54,4 @@
           %label
             %input{type: 'checkbox', name: 'share', checked: :checked, data: { q_id: @question.id, service: service.provider }}
             Post to
-            = service.provider.capitalize
\ No newline at end of file
+            = service.provider.capitalize
diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index 114a5699..65d9e040 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -1,11 +1,11 @@
 .panel.panel-default.answerbox{data: { id: a.id }}
   - if @question.nil?
     .panel-heading
-      .media
+      .media.question-media
         - unless a.question.author_is_anonymous
           %a.pull-left{href: show_user_profile_path(a.question.user.screen_name)}
             %img.img-rounded.answerbox--img{src: gravatar_url(a.question.user)}
-        .media-body
+        .media-body.question-body
           %h6.text-muted.media-heading.answerbox--question-user
             = user_screen_name a.question.user, a.question.author_is_anonymous
             asked
@@ -22,6 +22,22 @@
                 ·
                 %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)}
                   #{a.question.answer_count} answers
+          - if user_signed_in?
+            .pull-right
+              .btn-group.question-actions
+                %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
+                  %span.caret
+                %ul.dropdown-menu.dropdown-menu-right{role: :menu}
+                  - if current_user.mod?
+                    %li.text-danger
+                      %a{href: '#', data: { action: 'ab-question-destroy', q_id: a.question.id }}
+                        %i.fa.fa-trash-o
+                        Delete
+                  - unless a.question.user == current_user
+                    %li
+                      %a{href: '#', data: { action: 'ab-question-report', q_id: a.question.id }}
+                        %i.fa.fa-exclamation-triangle
+                        Report
           .answerbox--question-text
             = a.question.content
   .panel-body
@@ -67,4 +83,4 @@
           = render 'shared/answerbox_buttons', a: a
   .panel-footer{id: "ab-comments-section-#{a.id}", style: @display_all.nil? ? 'display: none' : nil }
     %div{id: "ab-smiles-#{a.id}"}= render 'shared/smiles', a: a
-    %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a
\ No newline at end of file
+    %div{id: "ab-comments-#{a.id}"}= render 'shared/comments', a: a
diff --git a/db/schema.rb b/db/schema.rb
index 58e85bbd..2f3bb0bc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150421120557) do
+ActiveRecord::Schema.define(version: 20150422024104) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -19,11 +19,12 @@ ActiveRecord::Schema.define(version: 20150421120557) do
   create_table "answers", force: :cascade do |t|
     t.text     "content"
     t.integer  "question_id"
-    t.integer  "comment_count", default: 0, null: false
+    t.integer  "comment_count", default: 0,     null: false
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "smile_count",   default: 0, null: false
+    t.integer  "smile_count",   default: 0,     null: false
+    t.boolean  "nsfw",          default: false
   end
 
   add_index "answers", ["user_id", "created_at"], name: "index_answers_on_user_id_and_created_at", using: :btree
@@ -109,7 +110,8 @@ ActiveRecord::Schema.define(version: 20150421120557) do
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "answer_count",        default: 0, null: false
+    t.integer  "answer_count",        default: 0,     null: false
+    t.boolean  "nsfw",                default: false
   end
 
   add_index "questions", ["user_id", "created_at"], name: "index_questions_on_user_id_and_created_at", using: :btree
@@ -132,6 +134,7 @@ ActiveRecord::Schema.define(version: 20150421120557) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "deleted",    default: false
+    t.string   "reason"
   end
 
   create_table "services", force: :cascade do |t|
@@ -207,6 +210,9 @@ ActiveRecord::Schema.define(version: 20150421120557) do
     t.boolean  "privacy_show_in_search",            default: true
     t.boolean  "banned",                            default: false
     t.boolean  "blogger",                           default: false
+    t.boolean  "nsfw",                              default: false
+    t.boolean  "show_nsfw",                         default: false
+    t.boolean  "privacy_allow_nsfw_questions",      default: true
     t.boolean  "contributor",                       default: false
   end
 

From e2f06167dca00d74ef6745ccf5dc551725dba570 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sun, 26 Apr 2015 02:46:37 +0200
Subject: [PATCH 202/231] fix styling and schema

---
 app/assets/stylesheets/scss/answerbox.scss |  6 ----
 app/views/question/show.html.haml          | 14 +++++-----
 app/views/shared/_answerbox.html.haml      | 32 +++++++++++-----------
 db/schema.rb                               |  5 ----
 4 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/app/assets/stylesheets/scss/answerbox.scss b/app/assets/stylesheets/scss/answerbox.scss
index c2d909e2..1481c7cb 100644
--- a/app/assets/stylesheets/scss/answerbox.scss
+++ b/app/assets/stylesheets/scss/answerbox.scss
@@ -52,9 +52,3 @@
 .answerbox--question-media, .question-media, .question-body {
   overflow: visible !important;
 }
-
-.question-actions {
-  position: absolute;
-  top: 10px;
-  right: 20px;
-}
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index 2785f759..cf8564a1 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -5,15 +5,9 @@
         %a.pull-left{href: show_user_profile_path(@question.user.screen_name)}
           %img.img-rounded.answerbox--img{src: gravatar_url(@question.user)}
       .media-body.question-body
-        %h6.text-muted.media-heading.answerbox--question-user
-          = user_screen_name @question.user, @question.author_is_anonymous
-          asked
-          %span{title: @question.created_at, data: { toggle: :tooltip, placement: :bottom }}
-            = time_ago_in_words(@question.created_at)
-          ago
         - if user_signed_in?
           .pull-right
-            .btn-group.question-actions
+            .btn-group
               %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
                 %span.caret
               %ul.dropdown-menu.dropdown-menu-right{role: :menu}
@@ -27,6 +21,12 @@
                     %a{href: '#', data: { action: 'ab-question-report', q_id: @question.id }}
                       %i.fa.fa-exclamation-triangle
                       Report
+        %h6.text-muted.media-heading.answerbox--question-user
+          = user_screen_name @question.user, @question.author_is_anonymous
+          asked
+          %span{title: @question.created_at, data: { toggle: :tooltip, placement: :bottom }}
+            = time_ago_in_words(@question.created_at)
+          ago
         %p.answerbox--question-text= @question.content
 .container.question-page
   / TODO: make this pretty (it's currently C-c'd straight from shared/_answerbox)
diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index 65d9e040..bb391f2f 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -6,6 +6,22 @@
           %a.pull-left{href: show_user_profile_path(a.question.user.screen_name)}
             %img.img-rounded.answerbox--img{src: gravatar_url(a.question.user)}
         .media-body.question-body
+          - if user_signed_in?
+            .pull-right
+              .btn-group
+                %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
+                  %span.caret
+                %ul.dropdown-menu.dropdown-menu-right{role: :menu}
+                  - if current_user.mod?
+                    %li.text-danger
+                      %a{href: '#', data: { action: 'ab-question-destroy', q_id: a.question.id }}
+                        %i.fa.fa-trash-o
+                        Delete
+                  - unless a.question.user == current_user
+                    %li
+                      %a{href: '#', data: { action: 'ab-question-report', q_id: a.question.id }}
+                        %i.fa.fa-exclamation-triangle
+                        Report
           %h6.text-muted.media-heading.answerbox--question-user
             = user_screen_name a.question.user, a.question.author_is_anonymous
             asked
@@ -22,22 +38,6 @@
                 ·
                 %a{href: show_user_question_path(a.question.user.screen_name, a.question.id)}
                   #{a.question.answer_count} answers
-          - if user_signed_in?
-            .pull-right
-              .btn-group.question-actions
-                %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
-                  %span.caret
-                %ul.dropdown-menu.dropdown-menu-right{role: :menu}
-                  - if current_user.mod?
-                    %li.text-danger
-                      %a{href: '#', data: { action: 'ab-question-destroy', q_id: a.question.id }}
-                        %i.fa.fa-trash-o
-                        Delete
-                  - unless a.question.user == current_user
-                    %li
-                      %a{href: '#', data: { action: 'ab-question-report', q_id: a.question.id }}
-                        %i.fa.fa-exclamation-triangle
-                        Report
           .answerbox--question-text
             = a.question.content
   .panel-body
diff --git a/db/schema.rb b/db/schema.rb
index 2f3bb0bc..847182ea 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -24,7 +24,6 @@ ActiveRecord::Schema.define(version: 20150422024104) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "smile_count",   default: 0,     null: false
-    t.boolean  "nsfw",          default: false
   end
 
   add_index "answers", ["user_id", "created_at"], name: "index_answers_on_user_id_and_created_at", using: :btree
@@ -111,7 +110,6 @@ ActiveRecord::Schema.define(version: 20150422024104) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "answer_count",        default: 0,     null: false
-    t.boolean  "nsfw",                default: false
   end
 
   add_index "questions", ["user_id", "created_at"], name: "index_questions_on_user_id_and_created_at", using: :btree
@@ -210,9 +208,6 @@ ActiveRecord::Schema.define(version: 20150422024104) do
     t.boolean  "privacy_show_in_search",            default: true
     t.boolean  "banned",                            default: false
     t.boolean  "blogger",                           default: false
-    t.boolean  "nsfw",                              default: false
-    t.boolean  "show_nsfw",                         default: false
-    t.boolean  "privacy_allow_nsfw_questions",      default: true
     t.boolean  "contributor",                       default: false
   end
 

From 3ef2c841c5aec45c05929174109f5119e41ae8df Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Sun, 26 Apr 2015 06:29:30 +0530
Subject: [PATCH 203/231] Report logic

---
 db/schema.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 847182ea..a18869e4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -19,11 +19,11 @@ ActiveRecord::Schema.define(version: 20150422024104) do
   create_table "answers", force: :cascade do |t|
     t.text     "content"
     t.integer  "question_id"
-    t.integer  "comment_count", default: 0,     null: false
+    t.integer  "comment_count", default: 0, null: false
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "smile_count",   default: 0,     null: false
+    t.integer  "smile_count",   default: 0, null: false
   end
 
   add_index "answers", ["user_id", "created_at"], name: "index_answers_on_user_id_and_created_at", using: :btree
@@ -109,7 +109,7 @@ ActiveRecord::Schema.define(version: 20150422024104) do
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "answer_count",        default: 0,     null: false
+    t.integer  "answer_count",        default: 0, null: false
   end
 
   add_index "questions", ["user_id", "created_at"], name: "index_questions_on_user_id_and_created_at", using: :btree

From ee29e1f28f58545a325fe65416e9b30fc2d71c47 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Sun, 26 Apr 2015 07:06:25 +0530
Subject: [PATCH 204/231] Reporting and Deleting logic

---
 .../javascripts/questionbox/destroy.coffee    | 30 +++++++++++++++++++
 .../javascripts/questionbox/report.coffee     |  5 ++++
 app/assets/stylesheets/scss/panel.scss        |  8 ++++-
 app/controllers/ajax/question_controller.rb   | 18 +++++++++++
 app/views/ajax/question/destroy.json.jbuilder |  1 +
 app/views/question/show.html.haml             |  6 ++--
 app/views/shared/_answerbox.html.haml         |  6 ++--
 app/views/shared/_question.html.haml          | 20 +++++++++++--
 config/routes.rb                              |  1 +
 9 files changed, 86 insertions(+), 9 deletions(-)
 create mode 100644 app/assets/javascripts/questionbox/destroy.coffee
 create mode 100644 app/assets/javascripts/questionbox/report.coffee
 create mode 100644 app/views/ajax/question/destroy.json.jbuilder

diff --git a/app/assets/javascripts/questionbox/destroy.coffee b/app/assets/javascripts/questionbox/destroy.coffee
new file mode 100644
index 00000000..7fc1f005
--- /dev/null
+++ b/app/assets/javascripts/questionbox/destroy.coffee
@@ -0,0 +1,30 @@
+$(document).on "click", "a[data-action=ab-question-destroy]", (ev) ->
+  ev.preventDefault()
+  btn = $(this)
+  qid = btn[0].dataset.qId
+  swal
+    title: "Are you sure?"
+    text: "The question will be removed."
+    type: "warning"
+    showCancelButton: true
+    confirmButtonColor: "#DD6B55"
+    confirmButtonText: "Yes"
+    cancelButtonText: "No"
+    closeOnConfirm: true
+  , ->
+    $.ajax
+      url: '/ajax/destroy_question' # TODO: find a way to use rake routes instead of hardcoding them here
+      type: 'POST'
+      data:
+        question: qid
+      success: (data, status, jqxhr) ->
+        if data.success
+          if btn[0].dataset.redirect != undefined
+            window.location.href = btn[0].dataset.redirect
+          else
+            $("div.answerbox[data-qId=#{qid}], div.questionbox[data-id=#{qid}]").slideUp()
+        showNotification data.message, data.success
+      error: (jqxhr, status, error) ->
+        console.log jqxhr, status, error
+        showNotification "An error occurred, a developer should check the console for details", false
+      complete: (jqxhr, status) ->
diff --git a/app/assets/javascripts/questionbox/report.coffee b/app/assets/javascripts/questionbox/report.coffee
new file mode 100644
index 00000000..a1ab32de
--- /dev/null
+++ b/app/assets/javascripts/questionbox/report.coffee
@@ -0,0 +1,5 @@
+$(document).on "click", "a[data-action=ab-question-report]", (ev) ->
+  ev.preventDefault()
+  btn = $(this)
+  qId = btn[0].dataset.qId
+  reportDialog "question", qId, -> btn.button "reset"
diff --git a/app/assets/stylesheets/scss/panel.scss b/app/assets/stylesheets/scss/panel.scss
index e32ff837..544ca3a9 100644
--- a/app/assets/stylesheets/scss/panel.scss
+++ b/app/assets/stylesheets/scss/panel.scss
@@ -11,4 +11,10 @@
 
 .panel-primary .answerbox--question-text {
   color: #fff;
-}
\ No newline at end of file
+}
+
+#questions .panel-body .media {
+  &, .media-body {
+    overflow: visible;
+  }
+}
diff --git a/app/controllers/ajax/question_controller.rb b/app/controllers/ajax/question_controller.rb
index 9c62b620..9f3fc239 100644
--- a/app/controllers/ajax/question_controller.rb
+++ b/app/controllers/ajax/question_controller.rb
@@ -1,6 +1,24 @@
 class Ajax::QuestionController < ApplicationController
   include MarkdownHelper
 
+  def destroy
+    params.require :question
+
+    question = Question.find params[:question]
+    if question.nil?
+      @status = :not_found
+      @message = "Question does not exist"
+      @success = false
+      return
+    end
+
+    question.destroy!
+
+    @status = :okay
+    @message = "Successfully deleted question."
+    @success = true
+  end
+
   def create
     params.require :question
     params.require :anonymousQuestion
diff --git a/app/views/ajax/question/destroy.json.jbuilder b/app/views/ajax/question/destroy.json.jbuilder
new file mode 100644
index 00000000..f98b3c38
--- /dev/null
+++ b/app/views/ajax/question/destroy.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'ajax/shared/status'
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index cf8564a1..c55a3fdc 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -11,11 +11,11 @@
               %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
                 %span.caret
               %ul.dropdown-menu.dropdown-menu-right{role: :menu}
-                - if current_user.mod?
+                - if current_user.mod? or @question.user == current_user
                   %li.text-danger
-                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id }}
+                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id, redirect: show_user_questions_path(@question.user.screen_name) }}
                       %i.fa.fa-trash-o
-                      Delete
+                      Delete Question
                 - unless @question.user == current_user
                   %li
                     %a{href: '#', data: { action: 'ab-question-report', q_id: @question.id }}
diff --git a/app/views/shared/_answerbox.html.haml b/app/views/shared/_answerbox.html.haml
index bb391f2f..dbc38b29 100644
--- a/app/views/shared/_answerbox.html.haml
+++ b/app/views/shared/_answerbox.html.haml
@@ -1,4 +1,4 @@
-.panel.panel-default.answerbox{data: { id: a.id }}
+.panel.panel-default.answerbox{data: { id: a.id, q_id: a.question.id }}
   - if @question.nil?
     .panel-heading
       .media.question-media
@@ -12,11 +12,11 @@
                 %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
                   %span.caret
                 %ul.dropdown-menu.dropdown-menu-right{role: :menu}
-                  - if current_user.mod?
+                  - if current_user.mod? or a.question.user == current_user
                     %li.text-danger
                       %a{href: '#', data: { action: 'ab-question-destroy', q_id: a.question.id }}
                         %i.fa.fa-trash-o
-                        Delete
+                        Delete Question
                   - unless a.question.user == current_user
                     %li
                       %a{href: '#', data: { action: 'ab-question-report', q_id: a.question.id }}
diff --git a/app/views/shared/_question.html.haml b/app/views/shared/_question.html.haml
index f2f4da75..2a592f5b 100644
--- a/app/views/shared/_question.html.haml
+++ b/app/views/shared/_question.html.haml
@@ -1,7 +1,23 @@
-.panel.panel-default
+.panel.panel-default.questionbox{data: { id: q.id }}
   .panel-body
     .media
       .media-body
+        - if user_signed_in?
+          .pull-right
+            .btn-group
+              %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
+                %span.caret
+              %ul.dropdown-menu.dropdown-menu-right{role: :menu}
+                - if current_user.mod? or q.user == current_user
+                  %li.text-danger
+                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: q.id }}
+                      %i.fa.fa-trash-o
+                      Delete Question
+                - unless q.user == current_user
+                  %li
+                    %a{href: '#', data: { action: 'ab-question-report', q_id: q.id }}
+                      %i.fa.fa-exclamation-triangle
+                      Report
         %h6.media-heading.text-muted.answerbox--question-user
           = user_screen_name q.user
           asked
@@ -14,4 +30,4 @@
             %a{href: show_user_question_path(q.user.screen_name, q.id)}
               #{q.answer_count} answers
         %p.answerbox--question-text
-          = q.content
\ No newline at end of file
+          = q.content
diff --git a/config/routes.rb b/config/routes.rb
index 475b516a..712f511f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,6 +66,7 @@ Rails.application.routes.draw do
 
   namespace :ajax do
     match '/ask', to: 'question#create', via: :post, as: :ask
+    match '/destroy_question', to: 'question#destroy', via: :post, as: :destroy_question
     match '/generate_question', to: 'inbox#create', via: :post, as: :generate_question
     match '/delete_inbox', to: 'inbox#remove', via: :post, as: :delete_inbox
     match '/delete_all_inbox', to: 'inbox#remove_all', via: :post, as: :delete_all_inbox

From ac14fefb3c8b3b21da9ce1bacdbe442d2d4fd444 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Sun, 26 Apr 2015 07:09:51 +0530
Subject: [PATCH 205/231] Check privilege

---
 app/controllers/ajax/question_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/controllers/ajax/question_controller.rb b/app/controllers/ajax/question_controller.rb
index 9f3fc239..c3351b47 100644
--- a/app/controllers/ajax/question_controller.rb
+++ b/app/controllers/ajax/question_controller.rb
@@ -12,6 +12,13 @@ class Ajax::QuestionController < ApplicationController
       return
     end
 
+    if not (current_user.mod? or question.user == current_user)
+      @status = :not_authorized
+      @message = "You are not allowed to delete this question"
+      @success = false
+      return
+    end
+
     question.destroy!
 
     @status = :okay

From 5792b59fc7b0fc67ae58b725742a78f6e73cca3e Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Sun, 26 Apr 2015 15:51:47 +0530
Subject: [PATCH 206/231] fix issue described in
 https://twitter.com/mochizune/status/592271577871417344

---
 app/assets/javascripts/questionbox/destroy.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/questionbox/destroy.coffee b/app/assets/javascripts/questionbox/destroy.coffee
index 7fc1f005..edf69d68 100644
--- a/app/assets/javascripts/questionbox/destroy.coffee
+++ b/app/assets/javascripts/questionbox/destroy.coffee
@@ -22,7 +22,7 @@ $(document).on "click", "a[data-action=ab-question-destroy]", (ev) ->
           if btn[0].dataset.redirect != undefined
             window.location.href = btn[0].dataset.redirect
           else
-            $("div.answerbox[data-qId=#{qid}], div.questionbox[data-id=#{qid}]").slideUp()
+            $("div.answerbox[data-q-id=#{qid}], div.questionbox[data-id=#{qid}]").slideUp()
         showNotification data.message, data.success
       error: (jqxhr, status, error) ->
         console.log jqxhr, status, error

From f0ef69336193d8257715965bc244ae44bfb125d8 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sun, 26 Apr 2015 13:05:47 +0200
Subject: [PATCH 207/231] move panel styles in panel file + fix question panel

---
 app/assets/stylesheets/scss/answerbox.scss | 11 -----------
 app/assets/stylesheets/scss/panel.scss     | 12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/scss/answerbox.scss b/app/assets/stylesheets/scss/answerbox.scss
index 1481c7cb..a8553b8b 100644
--- a/app/assets/stylesheets/scss/answerbox.scss
+++ b/app/assets/stylesheets/scss/answerbox.scss
@@ -41,14 +41,3 @@
   font-size: 12px;
   line-height: 1.3em;
 }
-
-.panel-question {
-  position: fixed;
-  border-top: 1px solid #fff;
-  width: 100%;
-  z-index: 999;
-}
-
-.answerbox--question-media, .question-media, .question-body {
-  overflow: visible !important;
-}
diff --git a/app/assets/stylesheets/scss/panel.scss b/app/assets/stylesheets/scss/panel.scss
index 544ca3a9..b54f8e4e 100644
--- a/app/assets/stylesheets/scss/panel.scss
+++ b/app/assets/stylesheets/scss/panel.scss
@@ -18,3 +18,15 @@
     overflow: visible;
   }
 }
+
+.panel-question {
+  position: fixed;
+  border-top: 1px solid #fff;
+  width: 100%;
+  z-index: 999;
+  border-color: #fff;
+}
+
+.answerbox--question-media, .question-media, .question-body {
+  overflow: visible !important;
+}

From aac84c623fbc0dbf5acc08ae726dc0098818863c Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sun, 26 Apr 2015 13:15:03 +0200
Subject: [PATCH 208/231] fix invisible border on question panel

---
 app/views/question/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index c55a3fdc..14b91f10 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -1,4 +1,4 @@
-.panel.panel-default.panel-question
+.panel.panel-question
   .panel-body
     .media.question-media
       - unless @question.author_is_anonymous

From 13d67b51f0f4427a38874ee4a3afecb558408bd9 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sun, 26 Apr 2015 13:19:04 +0200
Subject: [PATCH 209/231] redirect to root instead of users question site

---
 app/views/question/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index 14b91f10..14e4bd6b 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -13,7 +13,7 @@
               %ul.dropdown-menu.dropdown-menu-right{role: :menu}
                 - if current_user.mod? or @question.user == current_user
                   %li.text-danger
-                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id, redirect: show_user_questions_path(@question.user.screen_name) }}
+                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id, redirect: '/' }}
                       %i.fa.fa-trash-o
                       Delete Question
                 - unless @question.user == current_user

From db474773bd2908ecadd4450324a3bd8340e2082d Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Sun, 26 Apr 2015 13:28:04 +0200
Subject: [PATCH 210/231] update moderation tab display

---
 app/views/moderation/_moderation_tabs.html.haml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/moderation/_moderation_tabs.html.haml b/app/views/moderation/_moderation_tabs.html.haml
index cb75096a..51363d73 100644
--- a/app/views/moderation/_moderation_tabs.html.haml
+++ b/app/views/moderation/_moderation_tabs.html.haml
@@ -1,9 +1,8 @@
 .col-md-3.col-sm-3.col-xs-12
   .panel.panel-default.hidden-xs
-    .panel-body
-      %ul.nav.nav-pills.nav-stacked
-        = nav_entry "All reports", moderation_path
-        = nav_entry "Answers",     moderation_path('answer')
-        = nav_entry "Comments",    moderation_path('comment')
-        = nav_entry "Users",       moderation_path('user')
-        = nav_entry "Questions",   moderation_path('question')
+    %ul.nav.nav-pills.nav-stacked
+      = list_group_item "All reports", moderation_path
+      = list_group_item "Answers",     moderation_path('answer')
+      = list_group_item "Comments",    moderation_path('comment')
+      = list_group_item "Users",       moderation_path('user')
+      = list_group_item "Questions",   moderation_path('question')

From 76ac8e1a9d0eb23a4c5b584febbf987192a68b1c Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Mon, 27 Apr 2015 06:51:29 +0530
Subject: [PATCH 211/231] Fix Retrospring/bugs#36

---
 app/assets/javascripts/questionbox/destroy.coffee | 2 +-
 app/views/question/show.html.haml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/questionbox/destroy.coffee b/app/assets/javascripts/questionbox/destroy.coffee
index edf69d68..63f590e5 100644
--- a/app/assets/javascripts/questionbox/destroy.coffee
+++ b/app/assets/javascripts/questionbox/destroy.coffee
@@ -20,7 +20,7 @@ $(document).on "click", "a[data-action=ab-question-destroy]", (ev) ->
       success: (data, status, jqxhr) ->
         if data.success
           if btn[0].dataset.redirect != undefined
-            window.location.href = btn[0].dataset.redirect
+            window.location.pathname = btn[0].dataset.redirect
           else
             $("div.answerbox[data-q-id=#{qid}], div.questionbox[data-id=#{qid}]").slideUp()
         showNotification data.message, data.success
diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index 14e4bd6b..45b572b0 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -13,7 +13,7 @@
               %ul.dropdown-menu.dropdown-menu-right{role: :menu}
                 - if current_user.mod? or @question.user == current_user
                   %li.text-danger
-                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id, redirect: '/' }}
+                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id, redirect: if @question.author_is_anonymous? then "/" else show_user_questions_path(@question.user.screen_name) end }}
                       %i.fa.fa-trash-o
                       Delete Question
                 - unless @question.user == current_user

From bd3564d6f3ef50eeb455e56a6f6892c16009a236 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Mon, 27 Apr 2015 19:36:02 +0200
Subject: [PATCH 212/231] center question on question page

---
 app/views/question/show.html.haml | 59 ++++++++++++++++---------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/app/views/question/show.html.haml b/app/views/question/show.html.haml
index 45b572b0..3f4eb9bb 100644
--- a/app/views/question/show.html.haml
+++ b/app/views/question/show.html.haml
@@ -1,33 +1,34 @@
 .panel.panel-question
-  .panel-body
-    .media.question-media
-      - unless @question.author_is_anonymous
-        %a.pull-left{href: show_user_profile_path(@question.user.screen_name)}
-          %img.img-rounded.answerbox--img{src: gravatar_url(@question.user)}
-      .media-body.question-body
-        - if user_signed_in?
-          .pull-right
-            .btn-group
-              %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
-                %span.caret
-              %ul.dropdown-menu.dropdown-menu-right{role: :menu}
-                - if current_user.mod? or @question.user == current_user
-                  %li.text-danger
-                    %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id, redirect: if @question.author_is_anonymous? then "/" else show_user_questions_path(@question.user.screen_name) end }}
-                      %i.fa.fa-trash-o
-                      Delete Question
-                - unless @question.user == current_user
-                  %li
-                    %a{href: '#', data: { action: 'ab-question-report', q_id: @question.id }}
-                      %i.fa.fa-exclamation-triangle
-                      Report
-        %h6.text-muted.media-heading.answerbox--question-user
-          = user_screen_name @question.user, @question.author_is_anonymous
-          asked
-          %span{title: @question.created_at, data: { toggle: :tooltip, placement: :bottom }}
-            = time_ago_in_words(@question.created_at)
-          ago
-        %p.answerbox--question-text= @question.content
+  .container
+    .panel-body
+      .media.question-media
+        - unless @question.author_is_anonymous
+          %a.pull-left{href: show_user_profile_path(@question.user.screen_name)}
+            %img.img-rounded.answerbox--img{src: gravatar_url(@question.user)}
+        .media-body.question-body
+          - if user_signed_in?
+            .pull-right
+              .btn-group
+                %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
+                  %span.caret
+                %ul.dropdown-menu.dropdown-menu-right{role: :menu}
+                  - if current_user.mod? or @question.user == current_user
+                    %li.text-danger
+                      %a{href: '#', data: { action: 'ab-question-destroy', q_id: @question.id, redirect: if @question.author_is_anonymous? then "/" else show_user_questions_path(@question.user.screen_name) end }}
+                        %i.fa.fa-trash-o
+                        Delete Question
+                  - unless @question.user == current_user
+                    %li
+                      %a{href: '#', data: { action: 'ab-question-report', q_id: @question.id }}
+                        %i.fa.fa-exclamation-triangle
+                        Report
+          %h6.text-muted.media-heading.answerbox--question-user
+            = user_screen_name @question.user, @question.author_is_anonymous
+            asked
+            %span{title: @question.created_at, data: { toggle: :tooltip, placement: :bottom }}
+              = time_ago_in_words(@question.created_at)
+            ago
+          %p.answerbox--question-text= @question.content
 .container.question-page
   / TODO: make this pretty (it's currently C-c'd straight from shared/_answerbox)
 

From d012423b29bd0616ea160611ea5655662de88830 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 28 Apr 2015 07:55:46 +0530
Subject: [PATCH 213/231] Fix for Retrospring/bugs#41

---
 app/views/moderation/_moderationbox.html.haml | 85 ++++++++++---------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/app/views/moderation/_moderationbox.html.haml b/app/views/moderation/_moderationbox.html.haml
index 439b4eed..1c41b391 100644
--- a/app/views/moderation/_moderationbox.html.haml
+++ b/app/views/moderation/_moderationbox.html.haml
@@ -1,43 +1,44 @@
-.panel.panel-default.moderationbox{data: { id: report.id }}
-  .panel-heading
-    %img.img-rounded.answerbox--img{src: gravatar_url(report.user)}
-    = user_screen_name report.user
-    reported a
-    = report.type.sub('Reports::', '')
-    %span{title: report.created_at, data: { toggle: :tooltip, placement: :bottom }}
-      = time_ago_in_words(report.created_at)
-    ago
-  .panel-body
-    %p
-      - if report.type == 'Reports::User'
-        = user_screen_name report.target
-      - else
-        = report.target.content
-    %p
-      %b
-        Reason:
-      %br
-      - (report.reason || "No reason provided.").lines.each do |reason|
-        - next unless reason.strip.length > 0
-        = reason.strip
+= unless report.target.nil?
+  .panel.panel-default.moderationbox{data: { id: report.id }}
+    .panel-heading
+      %img.img-rounded.answerbox--img{src: gravatar_url(report.user)}
+      = user_screen_name report.user
+      reported a
+      = report.type.sub('Reports::', '')
+      %span{title: report.created_at, data: { toggle: :tooltip, placement: :bottom }}
+        = time_ago_in_words(report.created_at)
+      ago
+    .panel-body
+      %p
+        - if report.type == 'Reports::User'
+          = user_screen_name report.target
+        - else
+          = report.target.content
+      %p
+        %b
+          Reason:
         %br
-    .row
-      .col-md-6.col-sm-4.col-xs-6.text-left
-        %a.btn.btn-primary{href: content_url(report)}
-          View reported
-          = report.type.sub('Reports::', '')
-      .col-md-6.col-sm-8.col-xs-6.text-right
-        %span.mod-count{id: "mod-count-#{report.id}"}
-          = report.votes
-        .btn-group
-          %button.btn.btn-success.btn-sm{type: :button, name: "mod-vote", disabled: current_user.report_x_voted?(report, true) ? 'disabled' : nil, data: { id: report.id, action: current_user.report_voted?(report) ? 'unvote' : 'vote', vote_type: 'upvote' }}
-            %i.fa.fa-thumbs-up
-          %button.btn.btn-danger.btn-sm{type: :button, name: "mod-vote", disabled: current_user.report_x_voted?(report, false) ? 'disabled' : nil, data: { id: report.id, action: current_user.report_voted?(report) ? 'unvote' : 'vote', vote_type: 'downvote' }}
-            %i.fa.fa-thumbs-down
-        %button.btn.btn-primary.btn-sm{type: :button, name: 'mod-comments', data: { id: report.id, state: :hidden }}
-          %i.fa.fa-comments
-          %span{id: "mod-comment-count-#{report.id}"}= report.moderation_comments.all.count
-        %button.btn.btn-default.btn-sm{type: :button, name: "mod-delete-report", data: { id: report.id }}
-          %i.fa.fa-trash-o
-  .panel-footer{id: "mod-comments-section-#{report.id}", style: 'display: none'}
-    %div{id: "mod-comments-#{report.id}"}= render 'moderation/discussion', report: report
+        - (report.reason || "No reason provided.").lines.each do |reason|
+          - next unless reason.strip.length > 0
+          = reason.strip
+          %br
+      .row
+        .col-md-6.col-sm-4.col-xs-6.text-left
+          %a.btn.btn-primary{href: content_url(report)}
+            View reported
+            = report.type.sub('Reports::', '')
+        .col-md-6.col-sm-8.col-xs-6.text-right
+          %span.mod-count{id: "mod-count-#{report.id}"}
+            = report.votes
+          .btn-group
+            %button.btn.btn-success.btn-sm{type: :button, name: "mod-vote", disabled: current_user.report_x_voted?(report, true) ? 'disabled' : nil, data: { id: report.id, action: current_user.report_voted?(report) ? 'unvote' : 'vote', vote_type: 'upvote' }}
+              %i.fa.fa-thumbs-up
+            %button.btn.btn-danger.btn-sm{type: :button, name: "mod-vote", disabled: current_user.report_x_voted?(report, false) ? 'disabled' : nil, data: { id: report.id, action: current_user.report_voted?(report) ? 'unvote' : 'vote', vote_type: 'downvote' }}
+              %i.fa.fa-thumbs-down
+          %button.btn.btn-primary.btn-sm{type: :button, name: 'mod-comments', data: { id: report.id, state: :hidden }}
+            %i.fa.fa-comments
+            %span{id: "mod-comment-count-#{report.id}"}= report.moderation_comments.all.count
+          %button.btn.btn-default.btn-sm{type: :button, name: "mod-delete-report", data: { id: report.id }}
+            %i.fa.fa-trash-o
+    .panel-footer{id: "mod-comments-section-#{report.id}", style: 'display: none'}
+      %div{id: "mod-comments-#{report.id}"}= render 'moderation/discussion', report: report

From 1233e108e49b74f8e844280ff313956663e5c499 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 28 Apr 2015 14:16:02 +0530
Subject: [PATCH 214/231] Further fix retrospring/bugs#41

---
 Rakefile               | 33 +++++++++++++++++++++++++++++++--
 app/models/question.rb |  6 ++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index fba3b892..174dded1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -237,6 +237,24 @@ namespace :justask do
     puts "Put #{destroyed} subscriptions up for adoption."
   end
 
+  desc "Fixes reports"
+  task fix_reports: :enviornment do
+    format = '%t (%c/%C) [%b>%i] %e'
+
+    total = Report.count
+    progress = ProgressBar.create title: 'Processing reports', format: format, starting_at: 0, total: total
+    destroyed = 0
+    Report.all.each do |r|
+      if r.target.nil?
+        r.deleted = true
+        r.save
+        destroyed += 1
+      progress.increment
+    end
+
+    puts "Marked #{destroyed} reports as deleted."
+  end
+
   desc "Fixes everything else"
   task fix_db: :environment do
     format = '%t (%c/%C) [%b>%i] %e'
@@ -246,7 +264,8 @@ namespace :justask do
         answer: 0,
         smile: 0,
         comment: 0,
-        subscription: 0
+        subscription: 0,
+        report: 0
     }
 
     total = Inbox.count
@@ -301,13 +320,23 @@ namespace :justask do
       progress.increment
     end
 
-    puts "Put #{destroyed} subscriptions up for adoption."
+    total = Report.count
+    progress = ProgressBar.create title: 'Processing reports', format: format, starting_at: 0, total: total
+    Report.all.each do |r|
+      if r.target.nil?
+        r.deleted = true
+        r.save
+        destroyed_count[:report] += 1
+      progress.increment
+    end
 
+    puts "Put #{destroyed_count[:subscription]} subscriptions up for adoption."
     puts "Purged #{destroyed_count[:inbox]} dead inbox entries."
     puts "Marked #{destroyed_count[:question]} questions as anonymous."
     puts "Purged #{destroyed_count[:answer]} dead answers."
     puts "Purged #{destroyed_count[:answer]} dead comments."
     puts "Purged #{destroyed_count[:subscription]} dead subscriptions."
+    puts "Marked #{destroyed_count[:report]} reports as deleted."
   end
 
   desc "Prints lonely people."
diff --git a/app/models/question.rb b/app/models/question.rb
index 5f8289e4..27e33b61 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -6,6 +6,12 @@ class Question < ActiveRecord::Base
   validates :content, length: { maximum: 255 }
 
   before_destroy do
+    rep = Report.where(target_id: self.id).first
+    unless rep.nil?
+      rep.deleted = true
+      rep.save
+    end
+    
     user.decrement! :asked_count unless self.author_is_anonymous
   end
 

From 19732378a20b6fd2028c523e69fc2cada50c37ea Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 28 Apr 2015 14:20:56 +0530
Subject: [PATCH 215/231] Holy shit I'm stupid

---
 Rakefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 174dded1..b3f3c902 100644
--- a/Rakefile
+++ b/Rakefile
@@ -238,7 +238,7 @@ namespace :justask do
   end
 
   desc "Fixes reports"
-  task fix_reports: :enviornment do
+  task fix_reports: :environment do
     format = '%t (%c/%C) [%b>%i] %e'
 
     total = Report.count
@@ -249,6 +249,7 @@ namespace :justask do
         r.deleted = true
         r.save
         destroyed += 1
+      end
       progress.increment
     end
 
@@ -327,6 +328,7 @@ namespace :justask do
         r.deleted = true
         r.save
         destroyed_count[:report] += 1
+      end
       progress.increment
     end
 

From 0574f8252baa185d51442db7d60d9b39259254b1 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 28 Apr 2015 14:23:06 +0530
Subject: [PATCH 216/231] Extra butter

---
 Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index b3f3c902..592111a6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -245,7 +245,7 @@ namespace :justask do
     progress = ProgressBar.create title: 'Processing reports', format: format, starting_at: 0, total: total
     destroyed = 0
     Report.all.each do |r|
-      if r.target.nil?
+      if r.target.nil? and not r.deleted?
         r.deleted = true
         r.save
         destroyed += 1
@@ -324,7 +324,7 @@ namespace :justask do
     total = Report.count
     progress = ProgressBar.create title: 'Processing reports', format: format, starting_at: 0, total: total
     Report.all.each do |r|
-      if r.target.nil?
+      if r.target.nil? and not r.deleted?
         r.deleted = true
         r.save
         destroyed_count[:report] += 1

From f09725a45f20ba9b33cd567b1347999920c8f3f2 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 28 Apr 2015 17:28:14 +0530
Subject: [PATCH 217/231] :answer -> :comment

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 592111a6..a58611e2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -336,7 +336,7 @@ namespace :justask do
     puts "Purged #{destroyed_count[:inbox]} dead inbox entries."
     puts "Marked #{destroyed_count[:question]} questions as anonymous."
     puts "Purged #{destroyed_count[:answer]} dead answers."
-    puts "Purged #{destroyed_count[:answer]} dead comments."
+    puts "Purged #{destroyed_count[:comment]} dead comments."
     puts "Purged #{destroyed_count[:subscription]} dead subscriptions."
     puts "Marked #{destroyed_count[:report]} reports as deleted."
   end

From 982531ab555ee9015c9b21eaa322a781ffd4fa73 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 28 Apr 2015 17:39:43 +0530
Subject: [PATCH 218/231] don't echo everything omg i need to take pills to
 make me less stupid or something

---
 app/views/moderation/_moderationbox.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/moderation/_moderationbox.html.haml b/app/views/moderation/_moderationbox.html.haml
index 1c41b391..cb2c9c52 100644
--- a/app/views/moderation/_moderationbox.html.haml
+++ b/app/views/moderation/_moderationbox.html.haml
@@ -1,4 +1,4 @@
-= unless report.target.nil?
+- unless report.target.nil?
   .panel.panel-default.moderationbox{data: { id: report.id }}
     .panel-heading
       %img.img-rounded.answerbox--img{src: gravatar_url(report.user)}

From 9d14321cd1176cac2775bacc4fdf24da8f693ed0 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 30 Apr 2015 05:17:55 +0530
Subject: [PATCH 219/231] Fix Retrospring/bugs#41

---
 app/views/moderation/_moderationbox.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/moderation/_moderationbox.html.haml b/app/views/moderation/_moderationbox.html.haml
index cb2c9c52..225f3e15 100644
--- a/app/views/moderation/_moderationbox.html.haml
+++ b/app/views/moderation/_moderationbox.html.haml
@@ -1,4 +1,4 @@
-- unless report.target.nil?
+- unless report.nil? or report.target.nil? or report.user.nil? or report.type.nil?
   .panel.panel-default.moderationbox{data: { id: report.id }}
     .panel-heading
       %img.img-rounded.answerbox--img{src: gravatar_url(report.user)}

From 5b3b3684c9db4da3c5d7eac1fc3e5045de321d85 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 30 Apr 2015 05:21:01 +0530
Subject: [PATCH 220/231] Update justask:fix_reports

---
 Rakefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Rakefile b/Rakefile
index a58611e2..dbc8e076 100644
--- a/Rakefile
+++ b/Rakefile
@@ -249,6 +249,9 @@ namespace :justask do
         r.deleted = true
         r.save
         destroyed += 1
+      elsif r.user.nil?
+        r.destroy
+        destroyed += 1
       end
       progress.increment
     end
@@ -328,6 +331,9 @@ namespace :justask do
         r.deleted = true
         r.save
         destroyed_count[:report] += 1
+      elsif r.user.nil?
+        r.destroy
+        destroyed_count[:report] += 1
       end
       progress.increment
     end

From 563293be447447b4ad994e7e89d3ec4223b0f826 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 30 Apr 2015 05:34:43 +0530
Subject: [PATCH 221/231] Derp (Caused Retrospring/bugs#41)

---
 app/models/answer.rb   | 10 ++++++----
 app/models/comment.rb  |  8 ++++++++
 app/models/question.rb | 12 +++++++-----
 app/models/user.rb     | 19 +++++++++++++++++++
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 05f81c6c..5678c566 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -17,10 +17,12 @@ class Answer < ActiveRecord::Base
 
   before_destroy do
     # mark a report as deleted if it exists
-    rep = Report.where(target_id: self.id).first
-    unless rep.nil?
-      rep.deleted = true
-      rep.save
+    rep = Report.where(target_id: self.id, type: Reports::Answer)
+    rep.each do |r|
+      unless r.nil?
+        r.deleted = true
+        r.save
+      end
     end
 
     self.user.decrement! :answered_count
diff --git a/app/models/comment.rb b/app/models/comment.rb
index ca8f4087..c23070ca 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -14,6 +14,14 @@ class Comment < ActiveRecord::Base
   end
 
   before_destroy do
+    rep = Report.where(target_id: self.id, type: Reports::Comment)
+    rep.each do |r|
+      unless r.nil?
+        r.deleted = true
+        r.save
+      end
+    end
+
     Subscription.denotify self, answer
     user.decrement!  :commented_count
     answer.decrement! :comment_count
diff --git a/app/models/question.rb b/app/models/question.rb
index 27e33b61..1771b6bc 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -6,12 +6,14 @@ class Question < ActiveRecord::Base
   validates :content, length: { maximum: 255 }
 
   before_destroy do
-    rep = Report.where(target_id: self.id).first
-    unless rep.nil?
-      rep.deleted = true
-      rep.save
+    rep = Report.where(target_id: self.id, type: Reports::Question)
+    rep.each do |r|
+      unless r.nil?
+        r.deleted = true
+        r.save
+      end
     end
-    
+
     user.decrement! :asked_count unless self.author_is_anonymous
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index d5b0cff1..e5da7c43 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -59,6 +59,25 @@ class User < ActiveRecord::Base
                    end unless website.blank?
   end
 
+  # when a user deleted himself, all reports relating to the user are invalid
+  before_destroy do
+    rep = Report.where(target_id: self.id, type: Reports::User)
+    rep.each do |r|
+      unless r.nil?
+        r.deleted = true
+        r.save
+      end
+    end
+
+    rep = Report.where(user_id: self.id)
+    rep.each do |r|
+      unless r.nil?
+        r.deleted = true
+        r.save
+      end
+    end
+  end
+
   def login=(login)
     @login = login
   end

From 832dc1c1e4103505f71624eb3df7af4ecef25022 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 30 Apr 2015 05:42:17 +0530
Subject: [PATCH 222/231] Report.user_id is dependent on :destroy-- no need to
 iterate over it again

---
 app/models/user.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index e5da7c43..832b4e20 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,14 +68,6 @@ class User < ActiveRecord::Base
         r.save
       end
     end
-
-    rep = Report.where(user_id: self.id)
-    rep.each do |r|
-      unless r.nil?
-        r.deleted = true
-        r.save
-      end
-    end
   end
 
   def login=(login)

From 1c80c70dd97c3268bfb4443369a14e2f7c7a0bcd Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Thu, 30 Apr 2015 05:52:24 +0530
Subject: [PATCH 223/231] Derp x2 (Retrospring/bugs#41)

---
 app/models/answer.rb   | 2 +-
 app/models/comment.rb  | 2 +-
 app/models/question.rb | 2 +-
 app/models/user.rb     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 5678c566..52568fa8 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -17,7 +17,7 @@ class Answer < ActiveRecord::Base
 
   before_destroy do
     # mark a report as deleted if it exists
-    rep = Report.where(target_id: self.id, type: Reports::Answer)
+    rep = Report.where(target_id: self.id, type: 'Reports::Answer')
     rep.each do |r|
       unless r.nil?
         r.deleted = true
diff --git a/app/models/comment.rb b/app/models/comment.rb
index c23070ca..abc04dbe 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -14,7 +14,7 @@ class Comment < ActiveRecord::Base
   end
 
   before_destroy do
-    rep = Report.where(target_id: self.id, type: Reports::Comment)
+    rep = Report.where(target_id: self.id, type: 'Reports::Comment')
     rep.each do |r|
       unless r.nil?
         r.deleted = true
diff --git a/app/models/question.rb b/app/models/question.rb
index 1771b6bc..adc95c59 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -6,7 +6,7 @@ class Question < ActiveRecord::Base
   validates :content, length: { maximum: 255 }
 
   before_destroy do
-    rep = Report.where(target_id: self.id, type: Reports::Question)
+    rep = Report.where(target_id: self.id, type: 'Reports::Question')
     rep.each do |r|
       unless r.nil?
         r.deleted = true
diff --git a/app/models/user.rb b/app/models/user.rb
index 832b4e20..c991e2a2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -61,7 +61,7 @@ class User < ActiveRecord::Base
 
   # when a user deleted himself, all reports relating to the user are invalid
   before_destroy do
-    rep = Report.where(target_id: self.id, type: Reports::User)
+    rep = Report.where(target_id: self.id, type: 'Reports::User')
     rep.each do |r|
       unless r.nil?
         r.deleted = true
@@ -161,7 +161,7 @@ class User < ActiveRecord::Base
 
   # region stuff used for reporting/moderation
   def report(object, reason = nil)
-    existing = Report.find_by(target_id: object.id, user_id: self.id, deleted: false)
+    existing = Report.find_by(type: "Reports::#{object.class}", target_id: object.id, user_id: self.id, deleted: false)
     if existing.nil?
       Report.create(type: "Reports::#{object.class}", target_id: object.id, user_id: self.id, reason: reason)
     elsif not reason.nil? and reason.length > 0

From 220422727329491dc2990759edc4f243065042b2 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Mon, 4 May 2015 07:09:41 +0530
Subject: [PATCH 224/231] Feature-comment-smiles complete (fix
 Retrospring/bugs#42)

---
 .../answerbox/comment/smile.coffee            |  41 ++++++++++++++++++
 app/assets/javascripts/answerbox/smile.coffee |   2 +-
 app/assets/stylesheets/base.css.scss          |   1 +
 app/assets/stylesheets/scss/answerbox.scss    |  16 +++++++
 app/assets/stylesheets/scss/generic.scss      |  19 ++++++++
 app/controllers/ajax/smile_controller.rb      |  38 ++++++++++++++++
 app/models/comment.rb                         |   1 +
 app/models/comment_smile.rb                   |  22 ++++++++++
 app/models/notifications/comment_smiled.rb    |   2 +
 app/models/user.rb                            |  17 ++++++++
 app/views/ajax/.DS_Store                      | Bin 0 -> 6148 bytes
 .../ajax/smile/create_comment.json.jbuilder   |   1 +
 .../ajax/smile/destroy_comment.json.jbuilder  |   1 +
 app/views/layouts/_notifications.html.haml    |  14 +++++-
 .../notifications/_notification.html.haml     |  15 +++++++
 app/views/shared/_answerbox_buttons.html.haml |   5 ++-
 app/views/shared/_comment_smiles.html.haml    |  18 ++++++++
 app/views/shared/_comments.html.haml          |  23 +++++++++-
 config/routes.rb                              |   2 +
 .../20150504004931_create_comment_smiles.rb   |  17 ++++++++
 spec/models/comment_smile_spec.rb             |   5 +++
 21 files changed, 254 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/javascripts/answerbox/comment/smile.coffee
 create mode 100644 app/assets/stylesheets/scss/generic.scss
 create mode 100644 app/models/comment_smile.rb
 create mode 100644 app/models/notifications/comment_smiled.rb
 create mode 100644 app/views/ajax/.DS_Store
 create mode 100644 app/views/ajax/smile/create_comment.json.jbuilder
 create mode 100644 app/views/ajax/smile/destroy_comment.json.jbuilder
 create mode 100644 app/views/shared/_comment_smiles.html.haml
 create mode 100644 db/migrate/20150504004931_create_comment_smiles.rb
 create mode 100644 spec/models/comment_smile_spec.rb

diff --git a/app/assets/javascripts/answerbox/comment/smile.coffee b/app/assets/javascripts/answerbox/comment/smile.coffee
new file mode 100644
index 00000000..d713de7a
--- /dev/null
+++ b/app/assets/javascripts/answerbox/comment/smile.coffee
@@ -0,0 +1,41 @@
+$(document).on "click", "button[name=ab-smile-comment]", ->
+  btn = $(this)
+  cid = btn[0].dataset.cId
+  action = btn[0].dataset.action
+  count = Number $("span#ab-comment-smile-count-#{cid}").html()
+  btn[0].dataset.loadingText = "<i class=\"fa fa-meh-o fa-spin\"></i> <span id=\"ab-smile-count-#{cid}\">#{count}</span>"
+  btn.button "loading"
+
+  target_url = switch action
+    when 'smile'
+      count++
+      '/ajax/create_comment_smile'
+    when 'unsmile'
+      count--
+      '/ajax/destroy_comment_smile'
+
+  success = false
+
+  $.ajax
+    url: target_url
+    type: 'POST'
+    data:
+      id: cid
+    success: (data, status, jqxhr) ->
+      success = data.success
+      if success
+        $("span#ab-comment-smile-count-#{cid}").html(count)
+      showNotification data.message, data.success
+    error: (jqxhr, status, error) ->
+      console.log jqxhr, status, error
+      showNotification "An error occurred, a developer should check the console for details", false
+    complete: (jqxhr, status) ->
+      btn.button "reset"
+      if success
+        switch action
+          when 'smile'
+            btn[0].dataset.action = 'unsmile'
+            btn.html "<i class=\"fa fa-frown-o\"></i> <span id=\"ab-comment-smile-count-#{cid}\">#{count}</span>"
+          when 'unsmile'
+            btn[0].dataset.action = 'smile'
+            btn.html "<i class=\"fa fa-smile-o\"></i> <span id=\"ab-comment-smile-count-#{cid}\">#{count}</span>"
diff --git a/app/assets/javascripts/answerbox/smile.coffee b/app/assets/javascripts/answerbox/smile.coffee
index 0595cdc1..ee029193 100644
--- a/app/assets/javascripts/answerbox/smile.coffee
+++ b/app/assets/javascripts/answerbox/smile.coffee
@@ -38,4 +38,4 @@ $(document).on "click", "button[name=ab-smile]", ->
             btn.html "<i class=\"fa fa-frown-o\"></i> <span id=\"ab-smile-count-#{aid}\">#{count}</span>"
           when 'unsmile'
             btn[0].dataset.action = 'smile'
-            btn.html "<i class=\"fa fa-smile-o\"></i> <span id=\"ab-smile-count-#{aid}\">#{count}</span>"
\ No newline at end of file
+            btn.html "<i class=\"fa fa-smile-o\"></i> <span id=\"ab-smile-count-#{aid}\">#{count}</span>"
diff --git a/app/assets/stylesheets/base.css.scss b/app/assets/stylesheets/base.css.scss
index c580bf84..a4086ec2 100644
--- a/app/assets/stylesheets/base.css.scss
+++ b/app/assets/stylesheets/base.css.scss
@@ -6,6 +6,7 @@ body {
   background-color: #fafafa;
 }
 
+@import "scss/generic";
 @import "scss/answerbox";
 @import "scss/comments";
 @import "scss/entry";
diff --git a/app/assets/stylesheets/scss/answerbox.scss b/app/assets/stylesheets/scss/answerbox.scss
index a8553b8b..362efe92 100644
--- a/app/assets/stylesheets/scss/answerbox.scss
+++ b/app/assets/stylesheets/scss/answerbox.scss
@@ -41,3 +41,19 @@
   font-size: 12px;
   line-height: 1.3em;
 }
+
+.answerbox [name="ab-smile"], .answerbox [name="ab-smile-comment"] {
+  padding: 6px 11px;
+  padding-left: 21px;
+  position: relative;
+  overflow: hidden;
+  border: none;
+
+  i.fa.fa-smile-o, i.fa.fa-frown-o, i.fa.fa-meh-o {
+    position: absolute;
+    font-size: 3em;
+    left: -13px;
+    top: -10px;
+    display: block;
+  }
+}
diff --git a/app/assets/stylesheets/scss/generic.scss b/app/assets/stylesheets/scss/generic.scss
new file mode 100644
index 00000000..ed58b618
--- /dev/null
+++ b/app/assets/stylesheets/scss/generic.scss
@@ -0,0 +1,19 @@
+.user-list {
+  margin: 0;
+  padding: 0;
+}
+
+.user-list-entry-smiles {
+  * {
+    display: inline-block;
+    vertical-align: middle;
+  }
+
+  img {
+    height: 64px
+  }
+
+  span {
+    margin-left: 5px;
+  }
+}
diff --git a/app/controllers/ajax/smile_controller.rb b/app/controllers/ajax/smile_controller.rb
index f6f8fa82..d834d483 100644
--- a/app/controllers/ajax/smile_controller.rb
+++ b/app/controllers/ajax/smile_controller.rb
@@ -36,4 +36,42 @@ class Ajax::SmileController < ApplicationController
     @message = "Successfully unsmiled answer."
     @success = true
   end
+
+  def create_comment
+    params.require :id
+
+    comment = Comment.find(params[:id])
+
+    begin
+      current_user.smile_comment comment
+    rescue
+      @status = :fail
+      @message = "You have already smiled that comment."
+      @success = false
+      return
+    end
+
+    @status = :okay
+    @message = "Successfully smiled comment."
+    @success = true
+  end
+
+  def destroy_comment
+    params.require :id
+
+    comment = Comment.find(params[:id])
+
+    begin
+      current_user.unsmile_comment comment
+    rescue
+      @status = :fail
+      @message = "You have not smiled that comment."
+      @success = false
+      return
+    end
+
+    @status = :okay
+    @message = "Successfully unsmiled comment."
+    @success = true
+  end
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index abc04dbe..94059387 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -3,6 +3,7 @@ class Comment < ActiveRecord::Base
   belongs_to :answer
   validates :user_id, presence: true
   validates :answer_id, presence: true
+  has_many :smiles, class_name: "CommentSmile", foreign_key: :comment_id, dependent: :destroy
 
   validates :content, length: { maximum: 160 }
 
diff --git a/app/models/comment_smile.rb b/app/models/comment_smile.rb
new file mode 100644
index 00000000..8c116723
--- /dev/null
+++ b/app/models/comment_smile.rb
@@ -0,0 +1,22 @@
+class CommentSmile < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :comment
+  validates :user_id, presence: true, uniqueness: { scope: :comment_id, message: "already smiled comment" }
+  validates :comment_id, presence: true
+
+  after_create do
+    Notification.notify comment.user, self unless comment.user == user
+    user.increment! :comment_smiled_count
+    comment.increment! :smile_count
+  end
+
+  before_destroy do
+    Notification.denotify comment.user, self unless comment.user == user
+    user.decrement! :comment_smiled_count
+    comment.decrement! :smile_count
+  end
+
+  def notification_type(*_args)
+    Notifications::CommentSmiled
+  end
+end
diff --git a/app/models/notifications/comment_smiled.rb b/app/models/notifications/comment_smiled.rb
new file mode 100644
index 00000000..7b013c46
--- /dev/null
+++ b/app/models/notifications/comment_smiled.rb
@@ -0,0 +1,2 @@
+class Notifications::CommentSmiled < Notification
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index c991e2a2..b2bdd111 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -20,6 +20,7 @@ class User < ActiveRecord::Base
   has_many :friends,   through: :active_relationships, source: :target
   has_many :followers, through: :passive_relationships, source: :source
   has_many :smiles, dependent: :destroy
+  has_many :comment_smiles, dependent: :destroy
   has_many :services, dependent: :destroy
   has_many :notifications, foreign_key: :recipient_id, dependent: :destroy
   has_many :reports, dependent: :destroy
@@ -140,10 +141,26 @@ class User < ActiveRecord::Base
     Smile.find_by(user: self, answer: answer).destroy
   end
 
+  # smiles a comment
+  # @param comment [Comment] the comment to smile
+  def smile_comment(comment)
+    CommentSmile.create!(user: self, comment: comment)
+  end
+
+  # unsmile an comment
+  # @param comment [Comment] the comment to unsmile
+  def unsmile_comment(comment)
+    CommentSmile.find_by(user: self, comment: comment).destroy
+  end
+
   def smiled?(answer)
     answer.smiles.pluck(:user_id).include? self.id
   end
 
+  def smiled_comment?(comment)
+    comment.smiles.pluck(:user_id).include? self.id
+  end
+
   def display_website
     website.match(/https?:\/\/([A-Za-z.\-0-9]+)\/?(?:.*)/i)[1]
   rescue NoMethodError
diff --git a/app/views/ajax/.DS_Store b/app/views/ajax/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..97ac1d1504f03026051520df7ffe76ba731e1ef9
GIT binary patch
literal 6148
zcmeHK%Sr?>5Ul753tsl<F@Lal_7axyCL)M;M;*k+KA4A(+kCp!-BEUQ&az53B-LH%
z&SVNEnE(ij?(P_v0hqE0260AA=+U9QoGci0j%w51oOMlGk4&?hl&t*#4VHMoGq%@%
zf-CYBYW8!yqr($(mRMuOHb=p+hFr^N!}x-kYdn&@B_}mC{Z`qA88xd{xF=sSl8P5H
z6<#&BWMzprvftNpp7q>X<!(ypt8xWg0aw5k_#+DN%odv-8hY;vxB{-gmjbdsL^i>c
zu{YGMgPmRhh!fIk^yMxgH8Eq#*c)<$7Oa$Lr6FH2f|ZkxIWJ}G4XqqOpUipklRqyn
zL7z@OYC1wP^xhS41%?XjTR4;R|CFE1=p}zx;*l%h3j8w#!lbw?7JR9Ew*GiMIcp=^
tHJg~^_2SUz4}Jm|$UbtUgEk(;XI{$K8_F!gYdO(>1XK|3T!CLu-~+n_GHw6>

literal 0
HcmV?d00001

diff --git a/app/views/ajax/smile/create_comment.json.jbuilder b/app/views/ajax/smile/create_comment.json.jbuilder
new file mode 100644
index 00000000..f98b3c38
--- /dev/null
+++ b/app/views/ajax/smile/create_comment.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'ajax/shared/status'
diff --git a/app/views/ajax/smile/destroy_comment.json.jbuilder b/app/views/ajax/smile/destroy_comment.json.jbuilder
new file mode 100644
index 00000000..f98b3c38
--- /dev/null
+++ b/app/views/ajax/smile/destroy_comment.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'ajax/shared/status'
diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml
index 6eb6db5f..2bed92ba 100644
--- a/app/views/layouts/_notifications.html.haml
+++ b/app/views/layouts/_notifications.html.haml
@@ -50,6 +50,18 @@
                       your answer
                     = time_ago_in_words notification.target.created_at
                     ago
+              - when "CommentSmile"
+                .pull-left
+                  %img.img-rounded.notification--dropdown-img{src: gravatar_url(notification.target.user)}
+                .media-body
+                  %h6.media-heading.notification--dropdown-user
+                    = user_screen_name notification.target.user
+                  .notification--dropdown-text
+                    smiled at
+                    %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.comment.answer.id), title: "#{notification.target.comment.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
+                      your comment
+                    = time_ago_in_words notification.target.created_at
+                    ago
               - when "Comment"
                 .pull-left
                   %img.img-rounded.notification--dropdown-img{src: gravatar_url(notification.target.user)}
@@ -68,4 +80,4 @@
                       answer
                     = time_ago_in_words notification.target.created_at
                     ago
-    %li= link_to "Show all notifications#{" and mark them as read" if notifications.pluck(:new).any?}", notifications_path
\ No newline at end of file
+    %li= link_to "Show all notifications#{" and mark them as read" if notifications.pluck(:new).any?}", notifications_path
diff --git a/app/views/notifications/_notification.html.haml b/app/views/notifications/_notification.html.haml
index eed4e08e..4f569859 100644
--- a/app/views/notifications/_notification.html.haml
+++ b/app/views/notifications/_notification.html.haml
@@ -44,6 +44,21 @@
             ago
           .notification--icon
             %i.fa.fa-smile-o
+      - when "CommentSmile"
+        .pull-left
+          %img.img-rounded.notification--img{src: gravatar_url(notification.target.user)}
+        .media-body
+          %h6.media-heading.notification--user
+            = user_screen_name notification.target.user
+          %p.notification--text
+            smiled at
+            %a{href: show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.comment.answer.id), title: "#{notification.target.comment.content[0..40]}...", data: { toggle: :tooltip, placement: :top }}
+              your comment
+            %span{title: notification.target.created_at, data: { toggle: :tooltip, placement: :bottom }}
+              = time_ago_in_words notification.target.created_at
+            ago
+          .notification--icon
+            %i.fa.fa-smile-o
       - when "Comment"
         .pull-left
           %img.img-rounded.notification--img{src: gravatar_url(notification.target.user)}
diff --git a/app/views/shared/_answerbox_buttons.html.haml b/app/views/shared/_answerbox_buttons.html.haml
index da2262fe..f37b6738 100644
--- a/app/views/shared/_answerbox_buttons.html.haml
+++ b/app/views/shared/_answerbox_buttons.html.haml
@@ -1,8 +1,9 @@
 %span.hidden-xs.text-muted
   - unless user_signed_in?
     - if a.smile_count > 0
-      %span{id: "ab-smile-count-#{a.id}"}= a.smile_count
-      users smiled this
+      %button.btn.btn-info.btn-sm{name: 'ab-smile', disabled: true}
+        %i.fa.fa-smile-o
+        %span{id: "ab-smile-count-#{a.id}"}= a.smile_count
 - if user_signed_in?
   - if current_user.smiled? a
     %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile', data: { a_id: a.id, action: :unsmile }}
diff --git a/app/views/shared/_comment_smiles.html.haml b/app/views/shared/_comment_smiles.html.haml
new file mode 100644
index 00000000..5aaa36b2
--- /dev/null
+++ b/app/views/shared/_comment_smiles.html.haml
@@ -0,0 +1,18 @@
+.modal.fade{"id" => "modal-view-comment#{comment.id}-smiles","aria-hidden" => "true", "aria-labelledby" => "modal-view-comment#{comment.id}-smiles-label", :role => "dialog", :tabindex => "-1"}
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{"data-dismiss" => "modal", :type => "button"}
+          %span{"aria-hidden" => "true"} ×
+          %span.sr-only Close
+        %h4#modal-ask-followers-label.modal-title People who smiled this comment
+      .modal-body
+        - if comment.smiles.all.count == 0
+          No one smiled this, yet.
+        - else
+          %ul.user-list.user-list-smiles
+            - comment.smiles.all.each do |smile|
+              %li.user-list-entry.user-list-entry-smiles
+                %a{href: show_user_profile_path(smile.user.screen_name)}
+                  %img.img-rounded{src: gravatar_url(smile.user), alt: user_screen_name(smile.user, false, false)}
+                  %span= user_screen_name(smile.user, false, false)
diff --git a/app/views/shared/_comments.html.haml b/app/views/shared/_comments.html.haml
index 20c52a0c..07c7971e 100644
--- a/app/views/shared/_comments.html.haml
+++ b/app/views/shared/_comments.html.haml
@@ -4,17 +4,36 @@
   %ul.comments
     - a.comments.order(:created_at).each do |comment|
       %li{data: { comment_id: comment.id }}
+        %div{class: "ab-comment-smile-list", style: "height: 0; width: 0"}= render "shared/comment_smiles", comment: comment
         .media.comments--media
           .pull-left
             %img.img-rounded.answerbox--img{src: gravatar_url(comment.user)}
           .media-body.comments--body
             %h6.media-heading.answerbox--question-user= user_screen_name comment.user
-            - if user_signed_in?
-              .pull-right
+            .pull-right
+              %span.hidden-xs.text-muted
+                - unless user_signed_in?
+                  - if comment.smile_count > 0
+                    %button.btn.btn-info.btn-sm{name: 'ab-smile-comment', disabled: true}
+                      %i.fa.fa-smile-o
+                      %span{id: "ab-comment-smile-count-#{comment.id}"}= comment.smile_count
+              - if user_signed_in?
+                - if current_user.smiled_comment? comment
+                  %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile-comment', data: { c_id: comment.id, action: :unsmile }}
+                    %i.fa.fa-frown-o
+                    %span{id: "ab-comment-smile-count-#{comment.id}"}= comment.smile_count
+                - else
+                  %button.btn.btn-info.btn-sm{type: :button, name: 'ab-smile-comment', data: { c_id: comment.id, action: :smile }}
+                    %i.fa.fa-smile-o
+                    %span{id: "ab-comment-smile-count-#{comment.id}"}= comment.smile_count
                 .btn-group
                   %button.btn.btn-link.btn-sm.dropdown-toggle{data: { toggle: :dropdown }, aria: { expanded: :false }}
                     %span.caret
                   %ul.dropdown-menu.dropdown-menu-right{role: :menu}
+                    %li
+                      %a{href: '#', type: :button, data: { target: "#modal-view-comment#{comment.id}-smiles", toggle: :modal}}
+                        %i.fa.fa-smile-o
+                        View comment smiles
                     - if privileged?(comment.user) or privileged?(a.user)
                       %li.text-danger
                         %a{href: '#', data: { action: 'ab-comment-destroy', c_id: comment.id }}
diff --git a/config/routes.rb b/config/routes.rb
index 712f511f..760a680a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -76,6 +76,8 @@ Rails.application.routes.draw do
     match '/destroy_friend', to: 'friend#destroy', via: :post, as: :destroy_friend
     match '/create_smile', to: 'smile#create', via: :post, as: :create_smile
     match '/destroy_smile', to: 'smile#destroy', via: :post, as: :destroy_smile
+    match '/create_comment_smile', to: 'smile#create_comment', via: :post, as: :create_comment_smile
+    match '/destroy_comment_smile', to: 'smile#destroy_comment', via: :post, as: :destroy_comment_smile
     match '/create_comment', to: 'comment#create', via: :post, as: :create_comment
     match '/destroy_comment', to: 'comment#destroy', via: :post, as: :destroy_comment
     match '/report', to: 'report#create', via: :post, as: :report
diff --git a/db/migrate/20150504004931_create_comment_smiles.rb b/db/migrate/20150504004931_create_comment_smiles.rb
new file mode 100644
index 00000000..e14cde62
--- /dev/null
+++ b/db/migrate/20150504004931_create_comment_smiles.rb
@@ -0,0 +1,17 @@
+class CreateCommentSmiles < ActiveRecord::Migration
+  def change
+    create_table :comment_smiles do |t|
+      t.integer :user_id
+      t.integer :comment_id
+
+      t.timestamps null: false
+    end
+
+    add_index :comment_smiles, :user_id
+    add_index :comment_smiles, :comment_id
+    add_index :comment_smiles, [:user_id, :comment_id], unique: true
+
+    add_column :users,    :comment_smiled_count, :integer, default: 0, null: false
+    add_column :comments, :smile_count,          :integer, default: 0, null: false
+  end
+end
diff --git a/spec/models/comment_smile_spec.rb b/spec/models/comment_smile_spec.rb
new file mode 100644
index 00000000..43e4d9f6
--- /dev/null
+++ b/spec/models/comment_smile_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CommentSmile, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From ab35c2740c11acd90a4bc14ab84c8b6eb40716be Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Mon, 4 May 2015 07:14:27 +0530
Subject: [PATCH 225/231] monkey patch buggy underlines in smile modal

---
 app/assets/stylesheets/scss/generic.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/assets/stylesheets/scss/generic.scss b/app/assets/stylesheets/scss/generic.scss
index ed58b618..f4ecb99c 100644
--- a/app/assets/stylesheets/scss/generic.scss
+++ b/app/assets/stylesheets/scss/generic.scss
@@ -16,4 +16,11 @@
   span {
     margin-left: 5px;
   }
+
+  a:hover {
+    text-decoration: none;
+    span {
+      text-decoration: underline;
+    }
+  }
 }

From 513c41619ca03e14ca45726305561acb4c7eb8a6 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Mon, 4 May 2015 07:41:53 +0530
Subject: [PATCH 226/231] Thanks, Mac (remove .DS_Store)

---
 app/views/ajax/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/views/ajax/.DS_Store

diff --git a/app/views/ajax/.DS_Store b/app/views/ajax/.DS_Store
deleted file mode 100644
index 97ac1d1504f03026051520df7ffe76ba731e1ef9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%Sr?>5Ul753tsl<F@Lal_7axyCL)M;M;*k+KA4A(+kCp!-BEUQ&az53B-LH%
z&SVNEnE(ij?(P_v0hqE0260AA=+U9QoGci0j%w51oOMlGk4&?hl&t*#4VHMoGq%@%
zf-CYBYW8!yqr($(mRMuOHb=p+hFr^N!}x-kYdn&@B_}mC{Z`qA88xd{xF=sSl8P5H
z6<#&BWMzprvftNpp7q>X<!(ypt8xWg0aw5k_#+DN%odv-8hY;vxB{-gmjbdsL^i>c
zu{YGMgPmRhh!fIk^yMxgH8Eq#*c)<$7Oa$Lr6FH2f|ZkxIWJ}G4XqqOpUipklRqyn
zL7z@OYC1wP^xhS41%?XjTR4;R|CFE1=p}zx;*l%h3j8w#!lbw?7JR9Ew*GiMIcp=^
tHJg~^_2SUz4}Jm|$UbtUgEk(;XI{$K8_F!gYdO(>1XK|3T!CLu-~+n_GHw6>


From 97b27248c2b0ea69a05aa2f143af24da2c8defe9 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Mon, 4 May 2015 16:43:48 +0200
Subject: [PATCH 227/231] added CommentSmile to 'Smiles' in the stats section
 in about page

---
 app/views/static/about.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml
index 89bf0f34..37728e7e 100644
--- a/app/views/static/about.html.haml
+++ b/app/views/static/about.html.haml
@@ -72,7 +72,7 @@
               %h4.entry-text#asked-count= Comment.count
               %h6.entry-subtext Comments
             .col-md-6.col-sm-6.col-xs-6
-              %h4.entry-text#answered-count= Smile.count
+              %h4.entry-text#answered-count= Smile.count + CommentSmile.count
               %h6.entry-subtext Smiles
           .row
             .col-xs-6

From 8b88827a005a1b8e1ca61411f1f17019b1afa9c9 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 5 May 2015 02:36:57 +0530
Subject: [PATCH 228/231] Fix retrospring/bugs#43

---
 app/controllers/answer_controller.rb | 3 +++
 app/models/answer.rb                 | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/controllers/answer_controller.rb b/app/controllers/answer_controller.rb
index 9924b9bf..e6abf19c 100644
--- a/app/controllers/answer_controller.rb
+++ b/app/controllers/answer_controller.rb
@@ -13,6 +13,9 @@ class AnswerController < ApplicationController
       notif.update_all(new: false) unless notif.empty?
       notif = Notification.where(target_type: "Smile", target_id: @answer.smiles.pluck(:id), recipient_id: current_user.id, new: true)
       notif.update_all(new: false) unless notif.empty?
+      # @answer.comments.smiles throws
+      notif = Notification.where(target_type: "CommentSmile", target_id: @answer.comment_smiles.pluck(:id), recipient_id: current_user.id, new: true)
+      notif.update_all(new: false) unless notif.empty?
     end
   end
 end
diff --git a/app/models/answer.rb b/app/models/answer.rb
index 52568fa8..25ffc23a 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -4,6 +4,7 @@ class Answer < ActiveRecord::Base
   has_many :comments, dependent: :destroy
   has_many :smiles, dependent: :destroy
   has_many :subscriptions, dependent: :destroy
+  has_many :comment_smiles, through: :comments, source: :smiles
 
   after_create do
     Inbox.where(user: self.user, question: self.question).destroy_all

From 65c852585d27e799771d0503053fa9ae88f21fa5 Mon Sep 17 00:00:00 2001
From: Yuki <aaron.ahmed.eve@gmail.com>
Date: Tue, 5 May 2015 02:40:54 +0530
Subject: [PATCH 229/231] notification tab for comment smiles

---
 app/views/notifications/_notification_nav.html.haml  | 3 ++-
 app/views/notifications/_notification_tabs.html.haml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/notifications/_notification_nav.html.haml b/app/views/notifications/_notification_nav.html.haml
index a2513801..f7aaa51e 100644
--- a/app/views/notifications/_notification_nav.html.haml
+++ b/app/views/notifications/_notification_nav.html.haml
@@ -13,4 +13,5 @@
         = nav_entry "Answers", notifications_path('answer')
         = nav_entry "Smiles", notifications_path('smile')
         = nav_entry "Comments", notifications_path('comment')
-        = nav_entry "Followers", notifications_path('relationship')
\ No newline at end of file
+        = nav_entry "Comment Smiles", notifications_path('commentsmile')
+        = nav_entry "Followers", notifications_path('relationship')
diff --git a/app/views/notifications/_notification_tabs.html.haml b/app/views/notifications/_notification_tabs.html.haml
index 1849d32e..138ae2ff 100644
--- a/app/views/notifications/_notification_tabs.html.haml
+++ b/app/views/notifications/_notification_tabs.html.haml
@@ -5,4 +5,5 @@
       = list_group_item "Answers", notifications_path('answer'), badge: Notification.for(current_user).where(target_type: "Answer", new: true).count
       = list_group_item "Smiles", notifications_path('smile'), badge: Notification.for(current_user).where(target_type: "Smile", new: true).count
       = list_group_item "Comments", notifications_path('comment'), badge: Notification.for(current_user).where(target_type: "Comment", new: true).count
+      = list_group_item "Comment Smiles", notifications_path('commentsmile'), badge: Notification.for(current_user).where(target_type: "CommentSmile", new: true).count
       = list_group_item "Followers", notifications_path('relationship'), badge: Notification.for(current_user).where(target_type: "Relationship", new: true).count

From 42b41a268b622cd58206920afd9176f5c263d2d0 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Tue, 5 May 2015 18:09:26 +0200
Subject: [PATCH 230/231] fix not shown ban reason

---
 app/controllers/application_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e178da33..beed49fb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
-  
+
   before_filter :configure_permitted_parameters, if: :devise_controller?
   before_filter :banned?
 
@@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base
       name = current_user.screen_name
       # obligatory '2001: A Space Odyssey' reference
       flash[:notice] = "I'm sorry, #{name}, I'm afraid I can't do that."
-      if current_user.ban_reason.nil?
+      unless current_user.ban_reason.nil?
         flash[:notice] += "\nBan reason: #{current_user.ban_reason}"
       end
       if not current_user.permanently_banned?

From 61fdaf67423219c16c9d9825fa8682321cc44981 Mon Sep 17 00:00:00 2001
From: pixeldesu <git@pixelde.su>
Date: Wed, 6 May 2015 02:07:12 +0200
Subject: [PATCH 231/231] = != -

---
 app/views/user/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index 568706b9..3aa75ebe 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -5,7 +5,7 @@
     .hidden-xs= render 'shared/links'
   .col-md-9.col-xs-12.col-sm-8.j2-col-reset
     = render 'shared/questionbox'
-    = unless @user.banned?
+    - unless @user.banned?
       #answers
         - @answers.each do |a|
           = render 'shared/answerbox', a: a