Merge branch 'develop' of github.com:LLK/scratch-www into HOC-content-update

server/config.js

@@ -18,6 +18,9 @@ module.exports = {
     // Analytics & Monitoring
     ga_tracker: process.env.GA_TRACKER || '',
 
+    // Error handling
+    sentry_dsn: process.env.SENTRY_DSN || '',
+
     // Use minified JS libraries
     min: (process.env.NODE_ENV === 'production') ? '.min' : ''
 };

server/template.html

@@ -48,10 +48,16 @@
         <!-- Scripts -->
         <script src="/js/lib/react{{min}}.js"></script>
         <script src="/js/lib/react-dom{{min}}.js"></script>
+        <script src="/js/lib/raven.min.js"></script>
 
         <script src="/js/main.bundle.js"></script>
         <script src="/js/{{view}}.bundle.js"></script>
 
+        <!-- Error logging (Sentry) -->
+        <script>
+            Raven.config('{{&sentry_dsn}}').install()
+        </script>
+
         <!-- Analytics (GA) -->
         <script>
             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

src/components/activity/activity.jsx

@@ -34,7 +34,7 @@ var Activity = React.createClass({
                 title={formatMessage(defaultMessages.whatsHappening)}>
 
                 {this.props.items && this.props.items.length > 0 ? [
-                    <ul>
+                    <ul key="activity-ul">
                         {this.props.items.map(function (item) {
                             if (item.message.replace(/\s/g, '')) {
                                 var actorProfileUrl = '/users/' + item.actor.username + '/';
@@ -60,7 +60,7 @@ var Activity = React.createClass({
                         })}
                     </ul>
                 ] : [
-                    <div className="empty">
+                    <div className="empty" key="activity-empty">
                         <h4>
                             <FormattedMessage
                                 id="activity.seeUpdates"