Permalink
Browse files

Merge branch 'master' into cloudinary-images

Conflicts:
	bower.json
	client/source/buckets.coffee
	client/style/index.styl
	server/routes/admin.coffee
	server/views/admin.hbs
  • Loading branch information...
davidkaneda committed Sep 9, 2014
2 parents 4a60a23 + d649a4f commit 9ef7d6664a675a7c4d3a8fe6680f67e3b3690aea
Showing with 1,483 additions and 903 deletions.
  1. +3 −1 .gitignore
  2. +18 −10 Gruntfile.coffee
  3. +6 −3 bower.json
  4. BIN client/assets/fontastic/fonts/buckets.eot
  5. +64 −58 client/assets/fontastic/fonts/buckets.svg
  6. BIN client/assets/fontastic/fonts/buckets.ttf
  7. BIN client/assets/fontastic/fonts/buckets.woff
  8. +237 −189 client/assets/fontastic/icons-reference.html
  9. +112 −94 client/assets/fontastic/styles.css
  10. +0 −4 client/source/buckets.coffee
  11. +1 −1 client/source/controllers/buckets_controller.coffee
  12. +25 −11 client/source/helpers.coffee
  13. +17 −0 client/source/lib/view.coffee
  14. +1 −2 client/source/models/routes.coffee
  15. +8 −4 client/source/templates/buckets/dashboard.hbs
  16. +52 −59 client/source/templates/buckets/edit.hbs
  17. +6 −6 client/source/templates/entries/browser.hbs
  18. +7 −8 client/source/templates/entries/edit.hbs
  19. +7 −2 client/source/templates/entries/row.hbs
  20. +20 −10 client/source/templates/layouts/loggedin.hbs
  21. +1 −1 client/source/templates/routes/edit.hbs
  22. +9 −3 client/source/templates/routes/list.hbs
  23. +31 −30 client/source/templates/templates/editor.hbs
  24. +8 −6 client/source/templates/users/edit.hbs
  25. +4 −8 client/source/templates/users/list.hbs
  26. +16 −1 client/source/views/buckets/edit.coffee
  27. +1 −0 client/source/views/entries/browser.coffee
  28. +46 −19 client/source/views/entries/edit.coffee
  29. +21 −12 client/source/views/layout.coffee
  30. +116 −8 client/source/views/layouts/loggedin.coffee
  31. +1 −2 client/style/_footer.styl
  32. +49 −39 client/style/_nav.styl
  33. +0 −3 client/style/_toastr.styl
  34. +2 −2 client/style/_typography.styl
  35. +20 −24 client/style/_views.styl
  36. +6 −4 client/style/bootstrap.less
  37. +48 −29 client/style/index.styl
  38. +13 −0 docs/user-docs/templates.md
  39. +10 −8 migrations/20140702051422826_password_to_password_digest.coffee
  40. +18 −0 newrelic.js
  41. +13 −7 package.json
  42. +4 −0 server/config.coffee
  43. +32 −8 server/index.coffee
  44. +9 −12 server/lib/auth.coffee
  45. +1 −0 server/lib/plugins.coffee
  46. +1 −1 server/lib/renderer.coffee
  47. +21 −2 server/models/bucket.coffee
  48. +24 −10 server/models/entry.coffee
  49. +14 −10 server/models/route.coffee
  50. +0 −20 server/models/seed/buckets.json
  51. +12 −4 server/models/seed/routes.json
  52. +3 −1 server/models/user.coffee
  53. +14 −1 server/routes/admin.coffee
  54. +7 −7 server/routes/api/buckets.coffee
  55. +62 −21 server/routes/api/entries.coffee
  56. +9 −8 server/routes/api/routes.coffee
  57. +3 −2 server/routes/api/templates.coffee
  58. +9 −9 server/routes/api/users.coffee
  59. +86 −50 server/routes/frontend.coffee
  60. +32 −54 server/views/admin.hbs
  61. +2 −1 test/server/models/bucket.coffee
  62. +28 −6 test/server/models/entry.coffee
  63. +51 −0 test/server/models/route.coffee
  64. +12 −1 test/server/models/user.coffee
  65. +14 −1 test/server/routes/api/routes.coffee
  66. +9 −1 user/templates/error.hbs
  67. +4 −3 user/templates/index.hbs
  68. +3 −2 user/templates/layout.hbs
View
@@ -4,4 +4,6 @@ bower_components
/public
node_modules
tmp
-docs/api
+docs/api
+newrelic_agent.log
+.env
View
@@ -104,6 +104,9 @@ module.exports = (grunt) ->
'public/css/bootstrap.css'
'public/css/index.css'
]
+ pluginsStyle:
+ files:
+ 'public/css/plugins.css': ['public/plugins/*.css']
copy:
assets:
@@ -116,11 +119,6 @@ module.exports = (grunt) ->
cwd: 'docs/api'
src: ['**/*']
dest: 'public/docs/api'
- fontastic:
- expand: yes
- cwd: 'client/assets/fontastic/fonts/'
- src: ['*']
- dest: 'public/css/fonts/'
ace:
expand: yes
cwd: 'bower_components/ace-builds/src-min-noconflict/'
@@ -131,6 +129,11 @@ module.exports = (grunt) ->
'theme-*.js' # These are loaded on the fly anyway
]
dest: 'public/js/ace/'
+ fontastic:
+ expand: yes
+ cwd: 'client/assets/fontastic/fonts/'
+ src: ['*']
+ dest: 'public/css/fonts/'
cssmin:
app:
@@ -197,6 +200,7 @@ module.exports = (grunt) ->
app:
files:
'public/js/buckets.js': ['public/js/buckets.js']
+ 'public/vendor/spin.js/spin.js': ['public/vendor/spin.js/spin.js']
vendor:
dest: 'public/js/vendor.js'
@@ -218,6 +222,10 @@ module.exports = (grunt) ->
]
filter: 'isFile'
+ plugins:
+ dest: 'public/js/plugins.js'
+ src: ['public/plugins/*.js']
+
options:
sourceMap: yes
screwIe8: yes
@@ -259,19 +267,19 @@ module.exports = (grunt) ->
tasks: ['build-style']
express:
- files: ['server/**/*.coffee', 'node_modules/buckets-*/*.{coffee,hbs}']
+ files: ['server/**/*.coffee', 'node_modules/buckets-*/*.{coffee,hbs}', '.env']
tasks: ['express:dev']
options:
spawn: false
livereload: true
pluginScripts:
files: ['node_modules/buckets-*/**/{models,controllers,helpers,templates,views}/**/*.{coffee,hbs}', 'node_modules/buckets-*/*.{coffee,hbs}']
- tasks: ['browserify:plugins']
+ tasks: ['browserify:plugins', 'uglify:plugins']
pluginStyles:
files: ['node_modules/buckets-*/**/*.styl']
- tasks: ['stylus:plugins']
+ tasks: ['stylus:plugins', 'concat:plugins']
livereload:
options:
@@ -305,12 +313,12 @@ module.exports = (grunt) ->
grunt.loadNpmTasks 'grunt-mongo-migrations'
grunt.loadNpmTasks 'grunt-shell'
- grunt.registerTask 'build-style', ['stylus', 'less', 'concat:style']
+ grunt.registerTask 'build-style', ['stylus', 'less', 'concat:style', 'concat:pluginsStyle']
grunt.registerTask 'build-scripts', ['browserify:app']
# Building
grunt.registerTask 'default', ['build']
- grunt.registerTask 'build', ['clean:app', 'bower', 'apidoc', 'copy', 'uglify:vendor', 'browserify:plugins', 'build-scripts', 'build-style', 'modernizr']
+ grunt.registerTask 'build', ['clean:app', 'bower', 'apidoc', 'copy', 'uglify:vendor', 'browserify:plugins', 'uglify:plugins', 'build-scripts', 'build-style', 'modernizr']
grunt.registerTask 'prepublish', ['build', 'uglify:app', 'cssmin']
# Serving
View
@@ -21,15 +21,18 @@
"toastr": "~2.0.3",
"ladda": "~0.9.3",
"jquery.formParams": "~0.1.1",
- "underscore": "~1.6.0",
+ "underscore": "~1.7.0",
"ace-builds": "~1.1.3",
- "cocktail": "~0.5.7",
+ "cocktail": "~0.5.8",
"fastclick": "~1.0.2",
"gsap": "~1.13.1",
+ "open-iconic": "~1.1.1",
"seedrandom": "~2.3.6",
"Sortable": "~0.3.0",
"cloudinary_js": "~1.0.19",
- "imagesloaded": "~3.1.8"
+ "imagesloaded": "~3.1.8",
+ "bootstrap-tagsinput": "~0.4.2",
+ "typeahead.js": "~0.10.5"
},
"exportsOverride": {
"blueimp-file-upload": {
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 9ef7d66

Please sign in to comment.