Commit graph

2454 commits

Author SHA1 Message Date
Jordi Mallach
4d92653874 Fix typo in key name: seperated → separated. 2012-04-15 19:07:59 +02:00
Jordi Mallach
2bb9fbf58d Fix typo in key name: autorize → authorize. 2012-04-15 19:05:03 +02:00
Jordi Mallach
7b73c62a0b Update Catalan translation to cac2b1e. 2012-04-15 18:56:55 +02:00
Steven Hancock
7e517c2636 Initialize on asset precompile
This re-enables 'config.assets.initialize_on_precompile' to allow the
Rails Admin assets to precompile. On Heroku deploys, this may require
the Heroku Labs 'user_env_compile' feature to be enabled, which you
should be using anyway for Asset Sync to work properly. :)
2012-04-13 20:42:05 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass
bootstrap-sass (w00t)
2012-04-13 17:44:08 -07:00
Maxwell Salzberg
9791d8bfa9 remove production pod url override [ci skip] 2012-04-13 10:37:40 -07:00
Maxwell Salzberg
e861357463 change some defaults for the test enviroment, make a basic install script in bash 2012-04-13 09:49:03 -07:00
Jonne Haß
d20af894a4 whoops, dashes and symbols, ya know, I'm sorry [ci skip] 2012-04-12 20:23:16 +02:00
Jonne Haß
16f201fea5 art_nvi -> art-nvi [ci skip] 2012-04-12 18:27:16 +02:00
Jonne Haß
400bfd19d8 updated 55 locale files [ci skip] 2012-04-11 22:14:27 +02:00
Jonne Haß
cac2b1e10b lets just avoid no and yes as keys in YAML, too many issues. Thanks! [ci skip] 2012-04-11 22:06:33 +02:00
Jonne Haß
de3e157698 Revert "updated 14 locale files [ci skip]"
This reverts commit a0a804e88b.
2012-04-11 22:01:28 +02:00
Jonne Haß
a0a804e88b updated 14 locale files [ci skip] 2012-04-11 21:56:42 +02:00
Steven Hancock
021cc99492 bootstrap-sass
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
2012-04-11 06:16:01 -07:00
Jonne Haß
1ea2473986 YAML gotchas part 2: you can't use those references or whatever they're called before they are defined 2012-04-10 22:08:21 +02:00
Jonne Haß
8739d618ba reenable pg on travis but let it use a basic database.yml 2012-04-10 21:53:33 +02:00
Maxwell Salzberg
0eb946497f Merge pull request #3101 from despora/fallback_for_donation
added fallback for donation
2012-04-09 10:24:20 -07:00
Jonne Haß
b59c54c131 apparently a plain no in YAML evaluates as false, even as key 2012-04-09 15:47:32 +02:00
Jonne Haß
f6cb204699 updated 14 locale files, added estonian [ci skip] 2012-04-09 15:13:00 +02:00
Jonne Haß
bc983ee7d2 remove copy-pasta fail by me
Uh I'm sorry about that, why did nobody every complain about this? oO
2012-04-09 14:28:53 +02:00
Jonne Haß
2f7bed1f44 Merge pull request #3128 from m4tze/master
email-invitation translation error in subject and body
2012-04-09 05:26:34 -07:00
Jonne Haß
2205353171 Merge pull request #3127 from movilla/amp_arito3
Add translation /authorizations fix image
2012-04-09 05:19:48 -07:00
matze
76073d45ed ~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated
~Translate: changed the mail contents of the invitation mail: no weird html string below the invitecode url.

- M
2012-04-09 00:25:08 +02:00
movilla
6ded31a940 Add translation /authorizations fix image 2012-04-08 15:33:46 +02:00
Besnik
62c4469a9c using other quotes throughout the file 2012-04-06 23:21:40 +03:00
Besnik
44f48f7ae1 using other quotes throughout the file 2012-04-06 23:21:00 +03:00
Besnik
866524aff2 update-for-sq-locale - adding javascript.sq.yml 2012-04-06 20:13:30 +03:00
Besnik
65c698b448 update-for-sq-locale - adding devise.sq.yml 2012-04-06 20:13:30 +03:00
Jonne Haß
0850d5147f fix syntax errors in sq locale 2012-04-06 00:40:23 +02:00
Besnik
f0ef59256f Updating the translation for sq 2012-04-06 00:50:08 +03:00
Jonne Haß
9c85b0b42b hotfix spanish locale [ci skip]
If anybody has a cool idea on how to generally sanitize the input for the tag_path (own helper method?) that would be great
Thanks to jankusanagi for pointing me to this
2012-04-05 15:55:00 +02:00
Jonne Haß
9c337ac03e updated locales [ci skip] 2012-04-05 03:43:48 +02:00
Steven Hancock
39b0c2de11 Only load Asset Sync when S3 is configured
I consider this a hack, it needs review so I won't push it straight
to the main repo. I tried putting the same code in an initializer but
that appears to be too late to properly initialize the asset_sync
engine.

See diaspora/diaspora#3102
2012-04-04 04:19:37 -07:00
Lennart Prelle
01ed9fc9d9 fallback to diaspora donation if no paypal-id is present 2012-04-04 11:44:06 +02:00
Maxwell Salzberg
16354ae712 jammit rip 2012-04-03 22:53:53 -07:00
Maxwell Salzberg
bb5aa2821d use the built in asset_sync initializer. add a rake task to bootstrap
heroku and asset sync, which puts the S3 config vars in from your app
config.
2012-04-03 14:47:33 -07:00
Maxwell Salzberg
4ba3ec0b42 update initializer 2012-04-02 18:43:18 -07:00
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -07:00
Maxwell Salzberg
2da0c0f585 never use s3 in the test env ::sigh:: 2012-03-29 16:11:32 -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
movilla
2d1393b0c5 Add translation: via mobile 2012-03-29 17:33:51 +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
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
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
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
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
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
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