Skip to content
This repository has been archived by the owner on Nov 19, 2021. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
MariagraziaAlastra committed Mar 13, 2015
2 parents 028a7f0 + 1570a20 commit bd09db6
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ddg_community_platform",
"version": "0.63.0",
"version": "0.64.0",
"engines": {
"node": ">=0.10.0"
},
Expand Down
1 change: 1 addition & 0 deletions root/static/css/ddgc0.63.0.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions root/static/css/ia0.63.0.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions root/static/js/ddgc0.63.0.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions root/static/js/ia0.63.0.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/ia/js/IAPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -612,15 +612,15 @@
$("#" + $.trim($(this).attr("id").replace("-input", "")) + "-button").hide();
}
});

if ($(".topic-group").length) {
$(".topic-group").append($("#allowed_topics").html());
}
}

$(".ia-single--right").before(templates.live.name);
if (dev_milestone != "live") {
$(".ia-single--right").before(templates.metafields);

if ($(".topic-group").length) {
$(".topic-group").append($("#allowed_topics").html());
}
}
$(".ia-single--right").append(templates.live.screens);

Expand Down

0 comments on commit bd09db6

Please sign in to comment.