Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bug fix

  • Loading branch information...
commit fec2c17af23ac7dfb3c385d79fb8de5db89d5aea 1 parent a6a6bd9
@lancejpollard lancejpollard authored
View
8 Makefile
@@ -26,10 +26,13 @@ else
RUN = ./
endif
+all: clean
+ $(GRUNT) --config $(RUN)grunt.coffee
+
# watch more files on mac
watch-more:
ulimit -n 65536
-
+
install-dependencies:
@$(shell $(INSTALL) dependencies)
@@ -38,9 +41,6 @@ install-message:
post-install: install-dependencies install-message
-all: clean
- $(GRUNT) --config $(RUN)grunt.coffee
-
check-grunt:
ifeq ($(shell which $(GRUNT)),)
$(eval GRUNT = $(shell pwd)$(PATH_SEP)node_modules$(PATH_SEP)grunt$(PATH_SEP)bin$(PATH_SEP)grunt)
View
2  package.json
@@ -1,6 +1,6 @@
{
"name": "tower",
- "version": "0.4.2-22",
+ "version": "0.4.2-25",
"description": "Full Stack Web Framework for Node.js and the Browser",
"homepage": "http://viatropos.github.com/tower",
"main": "./index.js",
View
4 packages/tower-generator/server/generators/tower/app/appGenerator.coffee
@@ -193,7 +193,7 @@ JAVASCRIPTS =
'https://raw.github.com/epeli/underscore.string/master/lib/underscore.string.js': 'underscore.string.js'
'https://raw.github.com/caolan/async/master/lib/async.js': 'async.js'
# https://github.com/viatropos/tiny-require.js
- 'https://raw.github.com/LearnBoost/socket.io-client/master/dist/socket.io.js': 'socket.io.js'
+ 'https://raw.github.com/LearnBoost/socket.io-client/494d87db67b9e69a7534bb4ef198d708c2d227f2/dist/socket.io.js': 'socket.io.js'
# https://github.com/paulmillr/es6-shim
'https://raw.github.com/timrwood/moment/master/moment.js': 'moment.js'
'https://raw.github.com/andris9/jStorage/72c44323d33bb6a4c3610bdb774184e3a43a230f/jstorage.min.js': 'jstorage.js'
@@ -214,7 +214,7 @@ JAVASCRIPTS =
'https://raw.github.com/mrdoob/stats.js/master/src/Stats.js': 'stats.js'
'http://html5shiv.googlecode.com/svn/trunk/html5.js': 'html5.js'
-JAVASCRIPTS["http://cloud.github.com/downloads/viatropos/tower/tower-#{Tower.version}.js"] = 'tower.js'
+JAVASCRIPTS["http://cloud.github.com/downloads/viatropos/tower/tower-0.4.2-22.js"] = 'tower.js'
JAVASCRIPTS["https://raw.github.com/twitter/bootstrap/#{twitterBootstrapCommit}/js/#{javascript}.js"] = "bootstrap/#{javascript}.js" for javascript in [
'bootstrap-alert'
View
2  packages/tower-generator/server/generators/tower/app/templates/grunt.coffee
@@ -10,7 +10,7 @@ module.exports = (grunt) ->
defaultDatabase: 'memory'
# @todo grunt.loadNpmTasks('tower-tasks')
- require(require('path').join(Tower.srcRoot, 'lib/tower-tasks/tasks'))(grunt)
+ require(require('path').join(Tower.srcRoot, 'packages/tower-tasks/tasks'))(grunt)
# script files
scriptPaths = file.expand([
View
2  test/cases/model/shared/validationTest.coffee
@@ -39,7 +39,7 @@ describe 'Tower.ModelValidation', ->
page.validate()
assert.deepEqual page.validate(), true
- assert.deepEqual page.get('errors'), []
+ assert.deepEqual page.get('errors'), {}
describe 'presence', ->
test 'field "name", required: true', ->
View
4 test/cases/support/shared/formatTest.coffee
@@ -48,8 +48,8 @@ describe 'Tower.SupportFormat', ->
assert.deepEqual _.now().toDate().getSeconds(), (new Date).getSeconds()
test 'strftime', ->
- assert.equal _.strftime(_.now(), 'YYYY'), '2012'
- assert.equal _.now().strftime('YYYY'), '2012'
+ assert.equal _.strftime(_.now(), 'YYYY'), '2013'
+ assert.equal _.now().strftime('YYYY'), '2013'
test 'toDate', ->
assert.equal _.toDate("Dec 25, 1995").getFullYear(), 1995
Please sign in to comment.
Something went wrong with that request. Please try again.