Permalink
Browse files

merge changes from origin master

  • Loading branch information...
mason
mason committed May 21, 2012
2 parents 262d593 + 934ebd8 commit beb77bf90e6e6fcb80a9c18abad8ce0ef4f461d5
View
@@ -6,3 +6,6 @@ logs/*
/config/test/config.yml
/config/prod/config.yml
/config/dev/config.yml
+/doc/prod
+log/error.log
+tmp/
View
@@ -7,11 +7,9 @@ var flow = new Flow();
module.exports = {
init : function (){
- if( NODE_ENV === 'dev' ){
- flow.series( function ( next ){
- seed.init( next );
- });
- }
+ flow.series( function ( next ){
+ if( NODE_ENV === 'dev' ) seed.init( next );
+ });
flow.series( function ( next ){
rater.init( next );
View
@@ -1,4 +1,4 @@
-var Faker = require( 'faker' );
+var Faker = require( 'Faker' );
var mongoose = require( 'mongoose' );
var User = mongoose.model( 'User' );
var Topic = mongoose.model( 'Topic' );
View
@@ -131,7 +131,8 @@ module.exports = {
flow.end( function (){
LOG.debug( 'sidebar updated' );
- callback && callback();
+ // callback && callback();
+ if( UTILS.typeof( callback ) === 'function' ) callback();
});
}
};
@@ -27,7 +27,7 @@ <h1><a href="http://coke-js.org" id="logo">COKE - node.js MVC</a></h1>
<li class="nav-item"><a href="#" class="nav-link">Demos</a></li>
<li class="nav-item"><a href="#" class="nav-link">Docs</a></li>
<li class="nav-item"><a href="/" id="nav-selected" class="nav-link">Forum</a></li>
- <li class="nav-item"><a href="#" class="nav-link">Source</a></li>
+ <li class="nav-item"><a href="https://github.com/dreamerslab/coke" class="nav-link">Source</a></li>
</ul>
</nav>
</div> <!-- #header -->

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1 @@
+#textarea{width:690px}.reply-actions{text-align:right}#new-edit-title{margin:0}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit beb77bf

Please sign in to comment.