Commit graph

11702 commits

Author SHA1 Message Date
Adrián Chaves Fernández (Gallaecio)
c659b8f393 Updated the Galician translation. 2012-04-14 22:29:52 +02:00
Florian Staudacher
4e030c3de8 made install script a little smarter, hope u like it ;) 2012-04-14 20:28:39 +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
9f6ad65d73 update schema, views spec 2012-04-13 18:32:35 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Sean Tilley
af389a97f8 refactor appconfig 2012-04-13 19:56:46 -05:00
Dennis Collinson
a0ea8c8542 Update aspects dropdown to say number of selected aspects 2012-04-13 17:49:49 -07:00
Sean Tilley
aaa8930264 Refactor AppConfig 2012-04-13 19:46:23 -05: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
Maxwell Salzberg
9791d8bfa9 remove production pod url override [ci skip] 2012-04-13 10:37:40 -07:00
Maxwell Salzberg
fae883df56 comments for what I want this to be 2012-04-13 10:25:52 -07:00
Maxwell Salzberg
a1b4cae7b4 move jasmine back for now; dont want to deal with figuring it out 2012-04-13 10:13:48 -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
Dennis Collinson
9e50d0efb6 Newspaper theme selected by default, template picker object 2012-04-12 15:21:07 -07:00
Sean Tilley
9af60d520b Update README [ci skip] 2012-04-12 17:12:53 -05:00
Sean Tilley
2457da83a1 Bulleted lists in Readme. Oh, Markdown! [ci skip] 2012-04-12 17:12:08 -05:00
Sean Tilley
604c1a8eb2 Update Readme to be hella less sprawling [ci skip] 2012-04-12 17:09:47 -05:00
Dennis Collinson
c1f2bbac88 Wallpaper frame selected when post has one photo 2012-04-12 11:56:27 -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ß
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
Maxwell Salzberg
8e22d69d8e fix webfinger for (old?) nokogiri syntax 2012-04-11 18:19:14 -07:00
Maxwell Salzberg
d6f317af3d move debugger to proper group 2012-04-11 18:18:54 -07:00
Dennis Collinson
20da08408f can mention in new composer 2012-04-11 17:07:53 -07: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
danielgrippi
ffbc3aa241 update some gems [ci skip] 2012-04-11 12:48:50 -07: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
Maxwell Salzberg
37c3c3a860 update jasmine and move it to the test/development group
move jasmine to development and test env, update it
2012-04-10 19:34:13 -07:00
Movilla
7193bf7777 Issue #3134:Problem with translation in authorizations/new.html.haml 2012-04-11 00:00:41 +02: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
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
Maxwell Salzberg
ce2fd67a19 Revert "re add postgres to the mix"
This reverts commit ecf77b6ab4.
2012-04-10 11:52:08 -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
ecf77b6ab4 re add postgres to the mix 2012-04-10 11:35:30 -07:00
Maxwell Salzberg
62c3a3b350 double wait time to see if travis responds to that, as its not even getting to the ording issue at this point 2012-04-10 11:08:14 -07:00
Maxwell Salzberg
f6b6a67729 this file got renamed 2012-04-10 10:30:52 -07:00
Jonne Haß
79acc2c4cf This doesn't work altogether, fix it yourself [ci skip]
Revert "ensure that time is always far beyond last post creation"

This reverts commit 749b403d13.

Revert "make Timecop travel persistent for the whole run"

This reverts commit 5d9bdd80ab.

Revert "Timecop post creation for cucumber"

This reverts commit dba3dbbfeb.
2012-04-10 12:56:25 +02:00
Jonne Haß
749b403d13 ensure that time is always far beyond last post creation
oh yeah Timecop is really the best solution... hmpf
2012-04-10 12:32:17 +02:00
Jonne Haß
5d9bdd80ab make Timecop travel persistent for the whole run
So now we're getting dirty, this wouldn't be necessary with my solution...
2012-04-10 11:54:06 +02: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
1c9e01f0a2 Merge pull request #3117 from diaspora/deterministic_order
made stream order deterministic [ci skip]
2012-04-09 13:35:04 -07:00