Commit graph

2479 commits

Author SHA1 Message Date
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
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
06936bcdce stylesheets are basically now being served from sprockets 2012-03-27 18:07:20 -07:00
Dennis Collinson
11eb1eb7d8 MS DC fix tests 2012-03-27 14:52:53 -07:00
Dennis Collinson
37bf5c5aee REMOTIPART WIP 2012-03-27 14:52:51 -07:00
danielgrippi
4c46cc4246 MS DG; mentions work in new publisher 2012-03-27 14:52:50 -07:00
Dennis Collinson
3a47590d06 DG DC OMG FORMZ 2012-03-27 14:52:50 -07:00
Dennis Collinson
9fbc4b745a MS DC posting from post/new werks 2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d MS DC posts/new page init 2012-03-27 14:51:40 -07:00
Jonne Haß
67a2f29e84 updated 12 locale files [ci skip] 2012-03-27 13:07:04 +02:00
Florian Staudacher
b7b8a11551 fix #2665 - allow umlauts and other non-ascii characters in url 2012-03-24 00:10:36 +01:00
Jonne Haß
37d4f97764 updated 22 locale files [ci skip] 2012-03-23 13:26:16 +01:00
Dennis Collective
f55e6fa5a1 Merge pull request #3039 from movilla/master
Add translation app/views/admins/correlations.haml[ci skip]
2012-03-22 14:37:10 -07:00
movilla
3b2725f133 Comprobación para el castellano para app/views/admins/correlations.haml 2012-03-22 21:57:29 +01:00
movilla
1c14f4bdf3 Update en.yml for translation app/views/admins/correlations.haml 2012-03-22 21:51:21 +01:00
Dennis Collective
a369ee6145 Merge pull request #3037 from movilla/master
Add translation app/views/admins/_admin_bar.haml for Admin Panel
2012-03-22 11:44:26 -07:00
movilla
c8c708930f Añadida comprobación en castellano 2012-03-22 17:02:51 +01:00
movilla
708c61bc2f Upload en.yml for translation /app/views/admins/_admin_bar.haml 2012-03-22 17:01:12 +01:00
danielgrippi
e19c84b5a3 remove the monkey patch that didn't work. 2012-03-21 13:58:20 -07:00
danielgrippi
03409495f9 better patch for ActiveSupport 2012-03-21 13:50:24 -07:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported
monkeypatch
2012-03-21 13:50:24 -07:00
danielgrippi
5c431d933f MS DG down to four failures 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
835f808e5a more progress 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
35a6f4f265 basic 3.1 upgrade... a few things are still broken. help me out and run the tests and fix them <3 2012-03-21 13:50:24 -07:00
Jonne Haß
3c23364fbc refactor locale initialization and selection a bit 2012-03-21 19:25:47 +01:00
movilla
2d32595db6 Añadida traducción en castellano para comprobar 2012-03-21 15:41:53 +01:00
movilla
965c30f406 Update config/locales/diaspora/en.yml 2012-03-21 15:37:54 +01:00
Maxwell Salzberg
416b577eca I am a jerk and I told someone to take this out last night fixes #3027 2012-03-20 15:17:41 -07:00
Jonne Haß
dceb3253a0 updated 8 locale files [ci skip] 2012-03-20 14:00:05 +01:00
Benjamin Neff
042a125f4d fix legacy routes for old invite links 2012-03-20 03:47:48 +01:00
Maxwell Salzberg
af008ab713 remove unused expander plugin 2012-03-19 19:13:15 -07:00
Jonne Haß
491d484a2e updated 28 locale files [ci skip] 2012-03-18 22:22:07 +01:00
Maxwell Salzberg
aee17798c1 rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form 2012-03-17 17:10:08 -07:00
Jonne Haß
7e7de439f8 fix untranslatable stuff from the invite refactor 2012-03-17 13:52:46 +01:00
Maxwell Salzberg
11505a386c adding a test for decremented invites, as, and check the invite is valid in the controller 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works,
and improving admin functionality
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Diaspora Europe
d626148a83 fix will paginate renderer 2012-03-16 18:58:01 +01:00
Daniel Grippi
39ee27acf0 Merge pull request #3003 from diasp/will-paginate-bootstrap
mobile: added will paginate for bootstrap
2012-03-15 12:09:29 -07:00
Florian Staudacher
7b4c377df1 make tests happy 2012-03-15 19:44:18 +01:00
Florian Staudacher
e6b403434f some restructuring around oembed providers 2012-03-15 18:34:47 +01:00
Diaspora Europe
fe65058624 use will paginate, added renderer for bootstrap 2012-03-15 16:44:25 +01:00
Diaspora Europe
3f26c0e3d7 mobile: added will paginate for bootstrap 2012-03-15 16:44:25 +01:00
Jonne Haß
0419ca0bb6 made change password explanations translatable [ci skip] 2012-03-15 15:22:20 +01:00
Maxwell Salzberg
2d3df3e374 two cukes failed because the local files were changed? 2012-03-14 18:44:10 -07:00
Jonne Haß
b3868fc6dd updated 9 locale files [ci skip] 2012-03-14 10:29:16 +01:00
Maxwell Salzberg
2a30e60fe0 Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly 2012-03-13 16:41:16 -07:00
Steven Hancock
f2922c943c Cross-Origin Resource Sharing
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.

CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.

closes #2216
2012-03-10 23:49:56 -08:00
Jonne Haß
854735dc52 fix plurals 2012-03-10 17:18:42 +01:00
Jonne Haß
40be5ab805 updated 37 locale files, added es-MX 2012-03-10 17:08:52 +01:00
Steven Fuchs
7048fa6d50 fixing conflicts in merge 2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e run second search ajaxily when no results are found from remote pod. 2012-03-07 23:19:50 -05:00
Dennis Collinson
9b08f3f69a package assets always isn't refreshing, back to on 2012-03-07 18:42:41 -08:00
Maxwell Salzberg
b7fc774d06 semi-colons; use them 2012-03-07 16:24:02 -08:00
Maxwell Salzberg
ee2fafa31d totally gross js load order problem.. make the widget system fire after the backbone app to get the notification and search autocomplete back 2012-03-07 15:20:21 -08:00
danielgrippi
bdcbf5b985 responsive show pages [ci skip] 2012-03-06 15:19:05 -08:00
danielgrippi
cb9420bfd6 don't use symlinks; fix assets ordering issues. 2012-02-28 11:04:15 -08:00
Maxwell Salzberg
22cda15aa8 presenter now has a title 2012-02-27 18:11:41 -08:00
danielgrippi
5bebd97bca added translations to post viewer 2012-02-27 15:14:19 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles
Conflicts:
	lib/diaspora/shareable.rb
2012-02-27 14:27:05 -08:00
Jonne Haß
38e4394e55 updated 22 locale files [ci skip] 2012-02-27 22:33:19 +01:00
Jonne Haß
0604a36a15 updated 161 locale files [ci skip] 2012-02-26 01:07:13 +01:00
Dennis Collinson
b28508ecbc MS DC show last post and show page works unauthenticated
phasing out app.user() for app.currentUser
2012-02-24 19:09:00 -08:00
Dennis Collinson
5154500239 small refactoring around router.js 2012-02-24 14:33:57 -08:00
danielgrippi
2c0cfa53dc don't show left-right nav when idle 2012-02-24 13:31:17 -08:00
danielgrippi
806487a5ff namespace view folder with folders 2012-02-23 11:12:20 -08:00
danielgrippi
91e77e9dce small css tweaks 2012-02-22 20:50:56 -08:00
danielgrippi
846b14fac6 DG MS; you can comment from show pages. killer tofu. 2012-02-22 17:42:51 -08:00
danielgrippi
5a1f3675b5 namespacing. set up initial feedback hooks. 2012-02-21 15:23:29 -08:00
danielgrippi
c0eeb7680b pages wip 2012-02-21 15:23:28 -08:00
danielgrippi
691bdb96cd DG MS; post vitals on top left; user action placeholder on top right 2012-02-21 15:23:28 -08:00
danielgrippi
e3ebf05ac2 DG MS; new templates for post show pages. 2012-02-21 15:23:27 -08:00
Jonne Haß
14d7348a0d updates locales and fixed needed empty timeago translations 2012-02-20 14:24:30 +01:00