Commit graph

11367 commits

Author SHA1 Message Date
Florian Staudacher
ae3e225e28 finally (hopefully) fix non-ascii urls + new & old tests 2012-03-30 00:29:34 +02:00
Maxwell Salzberg
52c9d76a86 Merge pull request #3065 from diasp/2176-url-in-rss
Make URL clickable in RSS #2176
2012-03-29 12:18:36 -07:00
Dennis Collinson
6488cd004b Disable Mentions in trumpeter to fix cukechange assertion of mood 2012-03-29 12:16:59 -07:00
Maxwell Salzberg
79a09dbea6 Merge pull request #3069 from movilla/trad_mobile
Small translations of mobile "My Activity" and add translation "via mobile" for mobile posts
2012-03-29 12:14:35 -07:00
Dennis Collinson
34bdc09763 simplify env.rb for great justicethe jquery hack was messing up cukes, killed that 2012-03-29 11:51:32 -07:00
Maxwell Salzberg
53f82a3ae7 update readme to tell people about pre-asset-pipeline-tag 2012-03-29 10:48:01 -07:00
movilla
2d1393b0c5 Add translation: via mobile 2012-03-29 17:33:51 +03:00
movilla
af10497b6c Add translation via mobile 2012-03-29 17:26:03 +03:00
Steven Hancock
6abe718227 Mobile UI fixes
This fixes issues with mobile UI rendering

Issues fixed:
* vendor/bootstrap.css and vendor/bootstrap-responsive.css need to
  be precompiled for the mobile UI to render properly
* Rails 3.1 is more strict about layout fallbacks, the single-post
  view in the mobile UI needs to have the "application" layout
  specified to render properly
2012-03-29 05:52:45 -07:00
Diaspora Europe
9fdca1adf8 make URL clickable in RSS #2176 2012-03-29 13:43:04 +02:00
Steven Hancock
731446e078 Stylesheet naming issue (new-templates.css)
Replace all references to new_templates.css with the correct filename,
new-templates.css
2012-03-29 01:29:07 -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
Dennis Collinson
f25effcafe move handlebars templates for asset pipeline 2012-03-28 16:21:30 -07:00
Dennis Collective
4caa2cc3df WARNING: DO NOT PULL TO YOUR POD- asset pipeline not in readme. 2012-03-28 14:58:34 -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
402694e516 fixing cukes 2012-03-28 14:47:28 -07:00
Maxwell Salzberg
5dbfd89d93 some more fixes for the show pages 2012-03-28 13:56:52 -07:00
Maxwell Salzberg
9008e661d7 fix for the stream not loading; we were creating status_message objects that were simply wrappers around posts. in the lastest codebase, status_messages in js are what we are using for the new post form, so we need to just tell our post collection to stop making status_messages directly 2012-03-28 10:37:08 -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
76bbe7be3f Precompile more Javascript assets
This should be the last of them, I've gone through every view and made sure
that every javascript file included by a javascript_include_tag is now on the
list of assets to precompile.
2012-03-27 18:08:29 -07:00
Steven Hancock
f96fc5834f Make the Mention button work with the asset pipeline
* Fix the javascript_include_tag in the status_messages/new view
* Precompile pubhlsiher.js and jquery.textchange.min.js

This fixes a 500 error that was being thrown when the Mention button
was clicked, due to the above two javascripts not being precompiled
and a javascript include that needed to be updated to load
jquery.textchange.js from the correct path.
2012-03-27 18:08:28 -07:00
Steven Hancock
208fdee0cd Make static error pages load images from /assets 2012-03-27 18:08:28 -07:00
Steven Hancock
95b1603a36 Precompile contact-list.js
Add contact-list.js to the list of precompiled assets.

contact-list.js is required to display user serarch results, but was not
precompiled by default (in jammit or in the asset pipeline), which causes
a 500 error on Heroku.
2012-03-27 18:08:28 -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
d7bc014fa6 Make Capistrano precompile assets on deploy
This is straight out of the Rails guide. :)

Capistrano (v2.8.0 and above) includes a recipe to handle asset
precompiling in deployment. Since Gemfile.lock says we're using
v2.9.0 anyway, we should be using this to make life easier for
podmins who use Capistrano to deploy. :)
2012-03-27 18:08:28 -07:00
Steven Hancock
b48d5fb9c1 Refactor sass/scss stylesheets to use Rails asset helpers
Now that sass-rails and the asset pipeline work, we should use the
asset helpers Rails gives us rather than hard-coding
url("/assets/filename.png") for loading assets from sass/scss
stylesheets.
2012-03-27 18:08:28 -07:00
Steven Hancock
b24a4a7213 Correctly enable the asset pipeline
* Add the Rails 3.1+ Bundler.require statement to config/application.rb
  (properly enabling the :assets group)
* Move handlebars_assets gem into the :assets group where it belongs. :)
* Downgrade sass-rails to 3.1.4 since enabling the :assets group exposed
  a known bug in sass-rails ~> 3.1.5 [rails/sass-rails#78].
2012-03-27 18:08:27 -07:00
Steven Hancock
3e4bdc4260 Fix image tags in public/default.html to use asset pipeline 2012-03-27 18:08:27 -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
e1607baff4 jquery_include_tag helper
Implement the jquery_include_tag helper, which is used in several
views but was not implemented in the code. This helper attempts to
load jQuery from the Google CDN (matching the version of the vendored
jquery.js in jquery-rails), falling back to the vendored copy if the
google CDN fails. The helper also loads jquery_ujs.js from jquery-rails.

A jquery_cdn setting is added to application.yml to enable or disable
serving jQuery from the Google CDN (for those podmins who would rather
not use Google's services).

Update app/views/application.html.haml to use the jquery_include_tag
helper since it was the only view that was including the vendored
copy of jquery directly with jquery_include_tag.
2012-03-27 18:07:44 -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
danielgrippi
9dffb426d4 remove jquery from assets; wip 2012-03-27 18:07:23 -07:00
danielgrippi
f72f1d4059 more progress 2012-03-27 18:07:22 -07:00
danielgrippi
5b2716d2ef MS DG; move images to assets 2012-03-27 18:07:22 -07:00
danielgrippi
06936bcdce stylesheets are basically now being served from sprockets 2012-03-27 18:07:20 -07:00
Maxwell Salzberg
0e4f9ae98d fix chubbies by expliciting setting the view path 2012-03-27 17:54:27 -07:00
Maxwell Salzberg
ba917ec80b some sad fixes to try and appease travis :( 2012-03-27 16:31:56 -07:00
Maxwell Salzberg
843c0d9c1a Merge pull request #3068 from diaspora/posting
Merging the trumpeter
2012-03-27 16:11:14 -07:00
Dennis Collinson
9550082a94 fix notification cuke 2012-03-27 16:07:42 -07:00
movilla
3b66dd6e3f small translations of mobile My Activity 2012-03-28 00:46:20 +02:00
Maxwell Salzberg
9d26643288 update heroku_san 2012-03-27 15:44:12 -07:00
Dennis Collinson
09f40c8684 Feature Flag new publisher 2012-03-27 15:28:30 -07:00
Dennis Collinson
6288eff599 day mood for a post responds to content
extract creating a post with templates to a static post view method.

Legacy templates extracted, day view

day mood shows photos and has variable text size
2012-03-27 14:54:27 -07:00
Dennis Collinson
663abcb0aa MS DC Pull out stream post logic into own class 2012-03-27 14:54:27 -07:00
Dennis Collinson
2bb677b34b Revert "a little framer styling"
This reverts commit 0ba13491e50d67360d0ed9e2e77dc8095994b8fd.
2012-03-27 14:52:53 -07:00