Commit graph

1174 commits

Author SHA1 Message Date
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -07:00
danielgrippi
3bc3f13651 upgrade backbone, fix tests
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
2012-04-03 16:31:52 -07:00
danielgrippi
e156947d0b fix jasmine specs 2012-04-02 18:17:55 -07:00
Daniel Grippi
6f75fb4173 Merge pull request #3088 from Raven24/fix-bmm-2
show an error message when creating a comment failed [ci skip]
2012-04-01 18:24:54 -07:00
Daniel Grippi
a45eed13d5 Merge pull request #3086 from Raven24/fix-publisher-height
reset publisher css height when "cleared" [ci skip]
2012-04-01 18:24:00 -07:00
Florian Staudacher
ef292c40eb create a dummy-participation object, that the post appeas followed by self 2012-04-01 22:34:54 +02:00
Florian Staudacher
e6ebf4ad62 show error message when creating a comment failed
(e.g. when the post got deleted in the meantime)
bug mash 5.2
2012-03-30 19:42:14 +02:00
Florian Staudacher
859c0b93b5 reset publisher css height when "cleared" (fixes #2867) 2012-03-30 16:09:41 +02:00
Raven24
5ad38a5372 damn my brain! 2012-03-30 01:50:21 +03:00
Maxwell Salzberg
fe1c0d34d5 Merge pull request #3084 from Raven24/non-ascii-begone
finally (hopefully) fix non-ascii urls + new & old tests
2012-03-29 15:35:48 -07:00
Florian Staudacher
ae3e225e28 finally (hopefully) fix non-ascii urls + new & old tests 2012-03-30 00:29:34 +02:00
Dennis Collinson
59f7f504e8 Wallpaper Mood 2012-03-29 15:14:09 -07:00
Dennis Collinson
6488cd004b Disable Mentions in trumpeter to fix cukechange assertion of mood 2012-03-29 12:16:59 -07:00
Steven Hancock
77b107831b punycode.js is required by our javascript
The punycode.js file was somehow removed from the repo. This
replaces it with the current version from github and adds it
to our main.js manifest. Our javascript requires punycode for
(at least) stream rendering.
2012-03-28 20:03:00 -07:00
Dennis Collinson
a9c0c4098b add bootstrap dropdown 2012-03-28 19:13:51 -07:00
Dennis Collinson
755ff52452 turn asset pipeline debugging off
there was a collision with the aspects-dropdown view in the new
publisher, also
it takes too much time with it on
2012-03-28 19:01:44 -07:00
Dennis Collinson
875ce68556 fixes for jasmine 2012-03-28 16:32:24 -07:00
Dennis Collinson
78a2ed28b9 User can select Night and Day Moods
headline method on post

extract headline and body from post, at first newline

Night Mood
2012-03-28 16:22:05 -07:00
Maxwell Salzberg
0ce0f3ca74 NOTE: DO NOT PULL THIS ON PRODUCTION TILL FURTHER NOTICE asset pipeline
WIP Merge branch 'rebased-asset-pipeline'
2012-03-28 14:52:55 -07:00
Maxwell Salzberg
283e730430 AHHH CRAZY. stupid branchs. WIP 2012-03-27 18:40:02 -07:00
Maxwell Salzberg
e1bf6441fe update new js files 2012-03-27 18:26:46 -07:00
Steven Hancock
8b92ed73a4 Remove jquery_ujs from main.js manifest
Since jquery and jquery_ujs are now included by the jquery_include_tag
helper (see commit 9e752585), they shouldn't be included by the asset
pipeline in our javascript manifests. :)
2012-03-27 18:08:28 -07:00
Steven Hancock
95d5c9ca68 Fix Jasmine tests - first pass
193 specs | 5 failing

The 5 failing specs appear (according to Firebug) to be due to missing
fixtures and/or missing routes in the Jasmine environment. Fixing these
last 5 failures is a task probably best left to a more experienced
Javascript/Jasmine developer.

This commit also moves validation.js and clear-form.js into
app/assets/javascripts and precompiles validation.js
2012-03-27 18:08:27 -07:00
Steven Hancock
1aa0b15c8c Move Javascript to the asset pipeline
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
  everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
  from .handlebars to .jst.hbs (this is to keep them in the same
  global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
  be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
  wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
  that were compiled by Jammit in the Rails 3.0 code
2012-03-27 18:07:44 -07:00