don't use symlinks; fix assets ordering issues.

This commit is contained in:
danielgrippi 2012-02-28 11:04:15 -08:00
parent 61b4e77bde
commit cb9420bfd6
7 changed files with 19 additions and 19 deletions

View file

@ -15,23 +15,6 @@ javascripts:
- public/javascripts/app/templates/**/*.handlebars - public/javascripts/app/templates/**/*.handlebars
main: main:
- public/javascripts/vendor/underscore.js
- public/javascripts/vendor/backbone.js
- public/javascripts/vendor/handlebars-1.0.0.beta.6.js
- public/javascripts/vendor/markdown/*
- public/javascripts/app/app.js
- public/javascripts/app/helpers/*
- public/javascripts/app/router.js
- public/javascripts/app/views.js
- public/javascripts/app/models/post.js
- public/javascripts/app/models/*
- public/javascripts/app/pages/*
- public/javascripts/app/collections/*
- public/javascripts/app/views/stream_object_view.js
- public/javascripts/app/views/content_view.js
- public/javascripts/app/views/*.js
- public/javascripts/app/views/**/*.js
- public/javascripts/rails.validations.js - public/javascripts/rails.validations.js
- public/javascripts/rails.js - public/javascripts/rails.js
- public/javascripts/vendor/jquery.hotkeys.js - public/javascripts/vendor/jquery.hotkeys.js
@ -53,10 +36,27 @@ javascripts:
- public/javascripts/fileuploader-custom.js - public/javascripts/fileuploader-custom.js
- public/javascripts/diaspora.js - public/javascripts/diaspora.js
- public/javascripts/pages/*.js
- public/javascripts/helpers/*.js - public/javascripts/helpers/*.js
- public/javascripts/pages/*.js
- public/javascripts/widgets/*.js - public/javascripts/widgets/*.js
- public/javascripts/vendor/underscore.js
- public/javascripts/vendor/backbone.js
- public/javascripts/vendor/handlebars-1.0.0.beta.6.js
- public/javascripts/vendor/markdown/*
- public/javascripts/app/app.js
- public/javascripts/app/helpers/*
- public/javascripts/app/router.js
- public/javascripts/app/views.js
- public/javascripts/app/models/post.js
- public/javascripts/app/models/*
- public/javascripts/app/pages/*
- public/javascripts/app/collections/*
- public/javascripts/app/views/stream_object_view.js
- public/javascripts/app/views/content_view.js
- public/javascripts/app/views/*.js
- public/javascripts/app/views/**/*.js
- public/javascripts/view.js - public/javascripts/view.js
- public/javascripts/aspects-dropdown.js - public/javascripts/aspects-dropdown.js
- public/javascripts/contact-edit.js - public/javascripts/contact-edit.js
@ -69,6 +69,7 @@ javascripts:
login: login:
- public/javascripts/login.js - public/javascripts/login.js
mobile: mobile:
- public/javascripts/vendor/jquery-1.7.1.min.js - public/javascripts/vendor/jquery-1.7.1.min.js
- public/javascripts/vendor/jquery.charcount.js - public/javascripts/vendor/jquery.charcount.js

View file

@ -1 +0,0 @@
images/

View file

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View file

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

View file

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB