Merge branch 'dev'

duckduckgo · Mar 3, 2015 · e69749b · e69749b
2 parents feb8e39 + b1638ba
commit e69749b
Show file tree

Hide file tree

Showing 75 changed files with 18 additions and 1 deletion.
diff --git a/lib/DDGC/Web/Controller/Campaign/SubmitResponse.pm b/lib/DDGC/Web/Controller/Campaign/SubmitResponse.pm
@@ -27,6 +27,15 @@ sub base :Chained('/') :PathPart('campaign') :CaptureArgs(0) {
 		$c->forward( $c->view('JSON') );
 		return $c->detach;
 	}
+	elsif ($c->req->param('campaign_name') ne 'share_followup') {
+		$c->response->status(500);
+		$c->stash->{x} = {
+			ok => 0, closed_campaign => 1,
+			errstr => "This phase is closed."
+		};
+		$c->forward( $c->view('JSON') );
+		return $c->detach;
+	}
 	elsif ($c->user->responded_campaign($c->req->param('campaign_name'))) {
 		$c->response->status(403);
 		$c->stash->{x} = {

diff --git a/lib/DDGC/Web/Controller/InstantAnswer.pm b/lib/DDGC/Web/Controller/InstantAnswer.pm
@@ -261,6 +261,7 @@ sub ia_base :Chained('base') :PathPart('view') :CaptureArgs(1) {  # /ia/view/cal
         {'name' => { '!=' => 'test' }},
         {
             columns => [ qw/ name id /],
+            order_by => [ qw/ name/ ],
             result_class => 'DBIx::Class::ResultClass::HashRefInflator',
         }
     )->all;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ddg_community_platform",
-  "version": "0.59.0",
+  "version": "0.60.0",
   "engines": {
     "node": ">=0.10.0"
   },

diff --git a/root/static/css/ddgc0.59.0.css b/root/static/css/ddgc0.59.0.css
diff --git a/root/static/css/ia0.59.0.css b/root/static/css/ia0.59.0.css
diff --git a/root/static/images/DDGcommunity_logo.png b/root/static/images/DDGcommunity_logo.png
diff --git a/root/static/images/admin_button.png b/root/static/images/admin_button.png
diff --git a/root/static/images/cduck.dev.png b/root/static/images/cduck.dev.png
diff --git a/root/static/images/cduck.large.png b/root/static/images/cduck.large.png
diff --git a/root/static/images/cduck.png b/root/static/images/cduck.png
diff --git a/root/static/images/closeBtn.png b/root/static/images/closeBtn.png
diff --git a/root/static/images/comleader_button.png b/root/static/images/comleader_button.png
diff --git a/root/static/images/duckduckgo-icon.png b/root/static/images/duckduckgo-icon.png
diff --git a/root/static/images/fduck.v101.green.png b/root/static/images/fduck.v101.green.png
diff --git a/root/static/images/headerbg.grey.png b/root/static/images/headerbg.grey.png
diff --git a/root/static/images/important.png b/root/static/images/important.png
diff --git a/root/static/images/link.png b/root/static/images/link.png
diff --git a/root/static/images/profile.male.png b/root/static/images/profile.male.png
diff --git a/root/static/images/spritemap.png b/root/static/images/spritemap.png
diff --git a/root/static/images/[email protected] b/root/static/images/[email protected]
diff --git a/root/static/images/trans.png b/root/static/images/trans.png
diff --git a/root/static/images/triangle.png b/root/static/images/triangle.png
diff --git a/root/static/img/arrow-bot-l.png b/root/static/img/arrow-bot-l.png
diff --git a/root/static/img/arrow-bot-r.png b/root/static/img/arrow-bot-r.png
diff --git a/root/static/img/arrow-top-l.png b/root/static/img/arrow-top-l.png
diff --git a/root/static/img/arrow-top-r.png b/root/static/img/arrow-top-r.png
diff --git a/root/static/img/badges/admin.png b/root/static/img/badges/admin.png
diff --git a/root/static/img/badges/leader.png b/root/static/img/badges/leader.png
diff --git a/root/static/img/badges/leader_alt.png b/root/static/img/badges/leader_alt.png
diff --git a/root/static/img/badges/tee.png b/root/static/img/badges/tee.png
diff --git a/root/static/img/badges/translation_manager.png b/root/static/img/badges/translation_manager.png
diff --git a/root/static/img/blog/pidgin_xmpp/1_welcome.png b/root/static/img/blog/pidgin_xmpp/1_welcome.png
diff --git a/root/static/img/blog/pidgin_xmpp/2_addaccount.png b/root/static/img/blog/pidgin_xmpp/2_addaccount.png
diff --git a/root/static/img/blog/pidgin_xmpp/3_acceptcert.png b/root/static/img/blog/pidgin_xmpp/3_acceptcert.png
diff --git a/root/static/img/blog/pidgin_xmpp/4_register.png b/root/static/img/blog/pidgin_xmpp/4_register.png
diff --git a/root/static/img/blog/pidgin_xmpp/5_regsuccess.png b/root/static/img/blog/pidgin_xmpp/5_regsuccess.png
diff --git a/root/static/img/blog/pidgin_xmpp/6_activateaccount.png b/root/static/img/blog/pidgin_xmpp/6_activateaccount.png
diff --git a/root/static/img/blog/pidgin_xmpp/7_addchatbuddy.png b/root/static/img/blog/pidgin_xmpp/7_addchatbuddy.png
diff --git a/root/static/img/blog/pidgin_xmpp/8_addduckduckgobot.png b/root/static/img/blog/pidgin_xmpp/8_addduckduckgobot.png
diff --git a/root/static/img/blog/pidgin_xmpp/9_duckduckgobottest.png b/root/static/img/blog/pidgin_xmpp/9_duckduckgobottest.png
diff --git a/root/static/img/blog/pidgin_xmpp/A_addchat.png b/root/static/img/blog/pidgin_xmpp/A_addchat.png
diff --git a/root/static/img/bullet-check.png b/root/static/img/bullet-check.png
diff --git a/root/static/img/darrow.png b/root/static/img/darrow.png
diff --git a/root/static/img/duck-wizard.png b/root/static/img/duck-wizard.png
diff --git a/root/static/img/duckduckhack/default.png b/root/static/img/duckduckhack/default.png
diff --git a/root/static/img/duckduckhack/logos/imdb.png b/root/static/img/duckduckhack/logos/imdb.png
diff --git a/root/static/img/duckduckhack/logos/wa.png b/root/static/img/duckduckhack/logos/wa.png
diff --git a/root/static/img/duckduckhack/logos/wiki.png b/root/static/img/duckduckhack/logos/wiki.png
diff --git a/root/static/img/duckduckhack/logos/yelp.png b/root/static/img/duckduckhack/logos/yelp.png
diff --git a/root/static/img/duckduckhack/logos/yummly.png b/root/static/img/duckduckhack/logos/yummly.png
diff --git a/root/static/img/duckduckhack/user-sprite.png b/root/static/img/duckduckhack/user-sprite.png
diff --git a/root/static/img/ducksymbol-spotlight.png b/root/static/img/ducksymbol-spotlight.png
diff --git a/root/static/img/email_icons/bubble.png b/root/static/img/email_icons/bubble.png
diff --git a/root/static/img/email_icons/bubbles.png b/root/static/img/email_icons/bubbles.png
diff --git a/root/static/img/email_icons/check-sign.png b/root/static/img/email_icons/check-sign.png
diff --git a/root/static/img/email_icons/comment-alt.png b/root/static/img/email_icons/comment-alt.png
diff --git a/root/static/img/email_icons/comment.png b/root/static/img/email_icons/comment.png
diff --git a/root/static/img/email_icons/comments.png b/root/static/img/email_icons/comments.png
diff --git a/root/static/img/email_icons/globe.png b/root/static/img/email_icons/globe.png
diff --git a/root/static/img/email_icons/lightbulb.png b/root/static/img/email_icons/lightbulb.png
diff --git a/root/static/img/email_icons/pencil.png b/root/static/img/email_icons/pencil.png
diff --git a/root/static/img/gravatar.png b/root/static/img/gravatar.png
diff --git a/root/static/img/icon.png b/root/static/img/icon.png
diff --git a/root/static/img/logo_ddg_community.png b/root/static/img/logo_ddg_community.png
diff --git a/root/static/img/logo_ddg_duckpan.png b/root/static/img/logo_ddg_duckpan.png
diff --git a/root/static/img/openid.png b/root/static/img/openid.png
diff --git a/root/static/img/profile-generic.png b/root/static/img/profile-generic.png
diff --git a/root/static/img/questions.png b/root/static/img/questions.png
diff --git a/root/static/img/rd.png b/root/static/img/rd.png
diff --git a/root/static/img/select2x2.png b/root/static/img/select2x2.png
diff --git a/root/static/img/shareit.png b/root/static/img/shareit.png
diff --git a/root/static/img/social-sketch-icons.png b/root/static/img/social-sketch-icons.png
diff --git a/root/static/img/t-shirt.png b/root/static/img/t-shirt.png
diff --git a/root/static/js/ddgc0.59.0.js b/root/static/js/ddgc0.59.0.js
diff --git a/root/static/js/ia0.59.0.js b/root/static/js/ia0.59.0.js