Commit graph

5668 commits

Author SHA1 Message Date
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Dennis Collinson
a0ea8c8542 Update aspects dropdown to say number of selected aspects 2012-04-13 17:49:49 -07:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass
bootstrap-sass (w00t)
2012-04-13 17:44:08 -07:00
Steven Hancock
acf823ff1b bootstrap-sass fixes
* Update interim-bootstrap to use the partials from bootstrap-sass,
since some of the names have been changed (and we're using the
Bootstrap 2 javascript now). This should make it easy to keep the
file up to date with the version of Bootstrap we're using.
* Use interim-bootstrap instead of bootstrap-complete in default.css to
avoid the little problem I ran into with Bootstrap + Blueprint grids
not getting along. :)
* Revert the CSS class change (from .span-24.last to .row) in
layouts/application since interim-bootstrap works around that problem.
* Get rid of .icon-black since it's not needed.
* Remove the 60px padding on the page body since it isn't needed and
causes problems with the single post view.
2012-04-13 17:37:38 -07:00
Dennis Collinson
9e50d0efb6 Newspaper theme selected by default, template picker object 2012-04-12 15:21:07 -07:00
Dennis Collinson
c1f2bbac88 Wallpaper frame selected when post has one photo 2012-04-12 11:56:27 -07:00
Jonne Haß
83103c4761 deterministic stream order take 2, this time with spec 2012-04-12 16:33:02 +02:00
Dennis Collinson
d767410e6d mentions are clickable in framer 2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f can mention in new composer 2012-04-11 17:07:53 -07: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ß
3bfaa3fa24 made stream order deterministic 2012-04-11 16:42:28 +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
Dennis Collinson
f610cdce17 tweak composer [ci skip] 2012-04-10 12:22:36 -07:00
Dennis Collinson
b543f8a3ca fix display of service icons [ci-skip] 2012-04-10 12:12:40 -07:00
danielgrippi
a1d4ca9bec Refactor composer and framer to user same layout
composer touchup; added controls to the bottom; centered input area; removed forms.Base view

Fix tests
2012-04-10 11:38:35 -07:00
Maxwell Salzberg
f6b6a67729 this file got renamed 2012-04-10 10:30:52 -07:00
Maxwell Salzberg
11d9b50f3a a solution for a problem with pulling back all visible public ids when querying
after much sleuthing, this is an extremely hacky way to limit the
amount of public post _ids we are pulling back with every query.
previously, for unknown reason, we were pulling back all of them from
people you are connected to, and doing giant in queries which were
causing bad things to happen.  As far as I can tell, we are in fact
keeping track of the page( i.e. max time and offset) so there was no
need to pull all of them back.  This whole file is a huge clusterf*ck,
so it really should just get totally refactored, as the stuff that is
happening is not really as scary as it looks :(
2012-04-10 00:40:34 -07:00
Maxwell Salzberg
a70b057bf5 update resources in devise emails :( 2012-04-09 22:56:30 -07:00
Maxwell Salzberg
ff740f41f6 fix bookmarklet on mobile 2012-04-09 10:48:43 -07:00
Maxwell Salzberg
903f4cb9ac Merge pull request #3124 from liamnic/master
Fix Bookmarklet By Adding application.css[ci skip]
2012-04-09 10:34:26 -07:00
Maxwell Salzberg
6642bd5554 Merge pull request #3121 from dmorley/patch-13
Update app/views/shared/_photo_area.mobile.haml[ci skip]
2012-04-09 10:32:26 -07: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ß
e9a22ae41a fix syntax error in authorizations/new.html.haml 2012-04-09 14:44:47 +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
Liam Nicholson
0cd2eb7b8d Fix Bookmarklet By Adding application.css. 2012-04-08 09:31:40 +02:00
David Morley
c9431a6512 Update app/views/shared/_photo_area.mobile.haml 2012-04-07 15:28:35 -07:00
Florian Staudacher
9c7103be1d don't set publisher height on focus (already done in css), fixes #3109 2012-04-06 21:21:35 +02:00
Florian Staudacher
024f1fee74 disable jQuery effects for tests
... might buy us a few seconds
2012-04-05 16:12:45 +02:00
danielgrippi
59917e95ab update feature_flagger to have access to current user 2012-04-04 19:35:53 -07:00
Maxwell Salzberg
9c9562d0fd fix http urls with 3 slashes 2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d DG DC; visual fixups 2012-04-04 18:59:19 -07:00
danielgrippi
6098890783 redirect to post show on create 2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff framer has better styling 2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -07:00
Jonne Haß
5866ebe638 using an image tag as a path is an interesting idea... but a path is still working better :P [ci skip] 2012-04-05 03:14:02 +02:00
danielgrippi
59f092c26a added bootstrap extensions to new-templates [ci skip] 2012-04-04 13:22:44 -07:00
Maxwell Salzberg
d755f03cd0 add two more images to the assets 2012-04-04 13:12:07 -07:00
Maxwell Salzberg
d616e902c9 add favicon back 2012-04-04 13:00:25 -07:00
Lennart Prelle
c2195a3c22 new forms 2012-04-04 11:44:57 +02:00
Lennart Prelle
01ed9fc9d9 fallback to diaspora donation if no paypal-id is present 2012-04-04 11:44:06 +02:00
Maxwell Salzberg
8ef49586c3 update foreman 2012-04-03 23:02:16 -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
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
Steven Hancock
a8843c1036 Fix JSON caching regression
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.

Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.

closes #3094
2012-04-02 21:40:16 -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