Skip to content

Commit e4ca744

Browse files
author
Matt Karl
committed
Template inheritance work, needs testing
1 parent ad11d4b commit e4ca744

File tree

11 files changed

+580
-100
lines changed

11 files changed

+580
-100
lines changed

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"name": "SpringRollStudio",
3-
"version": "0.2.0-alpha.3",
3+
"version": "0.2.0-alpha.4",
44
"private": true,
55
"dependencies": {
66
"jqueryui": "*",
77
"bootstrap": "~3.2.0",
8+
"cloudkid-namespace": "*",
89
"requestAnimationFrame": "*",
910
"bootstrap-confirmation": "https://github.com/tavicu/bootstrap-confirmation.git",
1011
"wavesurfer.js": "*",

deploy/assets/css/preview.css

Lines changed: 102 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/assets/js/preview.js

Lines changed: 226 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deploy/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
Remote Trace
4242
</a>
4343
</div>
44-
<footer class="version">Version <span id="version">0.2.0-alpha.3</span></footer>
44+
<footer class="version">Version <span id="version">0.2.0-alpha.4</span></footer>
4545
</body>
4646
</html>

deploy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "SpringRollStudio",
33
"description": "Application for SpringRoll projects",
4-
"version": "0.2.0-alpha.3",
4+
"version": "0.2.0-alpha.4",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/SpringRoll/SpringRollStudio"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "SpringRollStudio",
33
"private": true,
4-
"version": "0.2.0-alpha.3",
4+
"version": "0.2.0-alpha.4",
55
"dependencies": {
66
"grunt": "~0.4.5",
77
"grunt-exec": "~0.4.6",

project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpringRollStudio",
3-
"version": "0.2.0-alpha.3",
3+
"version": "0.2.0-alpha.4",
44
"main": [
55
"components/node-webkit-app/src/utils/UpdateChecker.js",
66
"components/node-webkit-app/src/utils/Browser.js",
@@ -82,6 +82,7 @@
8282
"new": [
8383
"components/node-webkit-app/src/utils/Browser.js",
8484
"src/springroll/Module.js",
85+
"src/springroll/new/Template.js",
8586
"src/springroll/new/TemplateManager.js",
8687
"src/springroll/new/Installer.js",
8788
"src/springroll/new/NewProject.js",

0 commit comments

Comments
 (0)