Skip to content

Releasing build 410 #1054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zfi merged 3 commits into from
Jun 19, 2017
Merged

Releasing build 410 #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18c1f98
Eanable graph blocks for production
pjewald Jun 19, 2017
7f9d97e
Merge branch 'demo' of github.com:parallaxinc/BlocklyProp into demo
pjewald Jun 19, 2017
1fe1f4a
Bump build to 410 prior to deployment to production.
pjewald Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...in/resources/com/parallax/server/blocklyprop/internationalization/translations.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ footer.clientdownloadlink = BlocklyProp-client
# Application version numbers.
application.major = 0
application.minor = 96
application.build = 383
application.build = 410

html.content_missing = Content missing

Expand Down
16 changes: 6 additions & 10 deletions src/main/webapp/frame/framec.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,16 +442,12 @@
</value>
</category>
<category name="<fmt:message key="category.communicate" />" include="activity-board,flip,other" colour="340">
<c:choose>
<c:when test="${experimental == true}">
<category name="<fmt:message key="category.communicate.graphing" />" include="activity-board,flip,other">
<block type="graph_settings">
<field name="XAXIS">40,S</field>
</block>
<block type="graph_output"></block>
</category>
</c:when>
</c:choose>
<category name="<fmt:message key="category.communicate.graphing" />" include="activity-board,flip,other">
<block type="graph_settings">
<field name="XAXIS">40,S</field>
</block>
<block type="graph_output"></block>
</category>
<category name="<fmt:message key="category.communicate.oled" />">
<block type="oled_initialize"></block>
<block type="oled_font_loader"></block>
Expand Down