Commit graph

11717 commits

Author SHA1 Message Date
Maxwell Salzberg
8b50f80875 be pedantic in posts show as maybe certain crawlers are being greedy as to what formats they can accept 2012-04-19 20:07:14 -07:00
Maxwell Salzberg
6d7f6129fe remove puts in spec [ci skip] 2012-04-19 17:47:32 -07:00
Maxwell Salzberg
307ee15884 hella open graph tags
added some basic open graph tags to the posts#show page.
2012-04-19 17:40:13 -07:00
Dennis Collinson
d0b7833dba cucumber does not like comments in the Feature section 2012-04-19 16:01:36 -07:00
Dennis Collinson
1938c75478 comment out chubbies till it's a focus. 2012-04-19 15:40:21 -07:00
Dennis Collinson
8cc5f86298 reverting some test env munging
max isn't a princess
learn2git
learn2bash
lulz
2012-04-19 14:59:33 -07:00
Dennis Collinson
cbca19b3f5 @joshsusser hates our ci setup, /cc @suss
Revert "silence asset noise in development.  Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea."

This reverts commit 1307907330.
2012-04-19 14:43:19 -07:00
Dennis Collinson
7f3c4c209e fix post spec 2012-04-19 14:37:46 -07:00
Dennis Collinson
7253f190b5 rename css selector to MAGIC 2012-04-19 14:18:55 -07:00
Dennis Collinson
f7d320b622 MS DG; checkboxes are togglable, with tested css magick 2012-04-19 14:05:55 -07:00
wubwubwubcr3w
ebd367c5a1 also readd mbp-respond.min.js 2012-04-19 22:00:15 +02:00
wubwubwubcr3w
70ba2651c3 second attempt on readding modernizr-custom.js 2012-04-19 20:37:42 +02:00
Florian Staudacher
fe7de0544d forgot to rename that ... (fixes #3169) 2012-04-19 20:24:11 +02:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Florian Staudacher
9f1713b8f9 bind to new eventname [ci skip] 2012-04-19 14:06:09 +02:00
danielgrippi
bf62709c1d Merge branch 'stream-for-photos' 2012-04-18 18:36:34 -07:00
danielgrippi
e379a6df0f Merge branch 'master' into stream-for-photos
Conflicts:
	app/assets/javascripts/app/views/stream_view.js
2012-04-18 18:30:54 -07:00
Dennis Collinson
7831f9cad3 Max Salzberg was wrong.
/cc @joshsusser @groupon @dhh
2012-04-18 18:04:38 -07:00
Maxwell Salzberg
1307907330 silence asset noise in development. Thanks to @joshsusser. @denniscollective said I should put something pithy here, but that sounds like a bad idea. 2012-04-18 17:26:27 -07:00
Maxwell Salzberg
3279bf7ad5 Merge branch 'oembed_provider' 2012-04-18 16:13:09 -07:00
Maxwell Salzberg
ab48ca260b kinda ugly hack for ports in url with iframes 2012-04-18 16:12:57 -07:00
Maxwell Salzberg
c9e3852de8 oembed mostly works 2012-04-18 16:12:56 -07:00
Maxwell Salzberg
31172a9959 basic oembed provider set up... too tried to finish this now 2012-04-18 16:12:56 -07:00
danielgrippi
a307b60dd2 DC DG extract infininte scroll to a mixin 2012-04-18 12:34:43 -07:00
Maxwell Salzberg
7361b8f305 for some reason the final step did not get shown [ci skip] 2012-04-18 12:00:03 -07:00
Maxwell Salzberg
225b296c69 point it to the master blob, too [ci skip] 2012-04-18 11:58:36 -07:00
Maxwell Salzberg
ef1d6672fa fix readme [ci skip] 2012-04-18 11:56:40 -07:00
Sean Tilley
7ce18162d1 Update README [ci skip] 2012-04-18 11:25:31 -07:00
Sean Tilley
b791404b12 Add infos back in. [ci skip] 2012-04-18 11:24:40 -07:00
Florian Staudacher
d8c42fde67 remove app.models.Photos 2012-04-18 20:21:16 +02:00
Florian Staudacher
8eb70c8a80 use app.models.Stream instead of app.models.Photos,
change naming a bit to be more general since its posts+photos now
(re #3158)
2012-04-18 20:20:56 +02:00
Florian Staudacher
4385027443 small js fixes
closes #3106 - hardening url handling,
fixes #2725 - backport from upstream
2012-04-18 19:59:34 +02:00
danielgrippi
3621576717 add/remove hidden class for pagination instead of manipulating HTML contents on every page load. 2012-04-18 10:27:22 -07:00
Maxwell Salzberg
b10aedb615 update the iframe route, fix a small styleing thing in newspaper style for iframe view 2012-04-17 22:43:47 -07:00
Maxwell Salzberg
90a2f05515 include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770 2012-04-17 22:28:01 -07:00
Sean Tilley
4d95c52960 Image Redirect URL should be blank [ci skip] 2012-04-18 00:18:22 -05:00
Sean Tilley
d46734e90c Set single_process_mode to true by default [ci skip] 2012-04-17 23:27:34 -05:00
danielgrippi
3479cb7bdd refactored stream and Stream View
streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.
2012-04-17 21:06:34 -07:00
Sean Tilley
27513cf319 Simplify instructions for setting up a test environment [ci skip] 2012-04-17 21:42:23 -05:00
danielgrippi
37cd6f616e refactor stream fetching logic 2012-04-17 19:18:12 -07:00
Dennis Collinson
16223d003f change new publisher to public by default to make testing easier 2012-04-17 16:43:42 -07:00
Jonne Haß
25f6df230d Merge pull request #3150 from Gallaecio/l10n-gl
Updated the Galician translation.
2012-04-17 13:59:43 -07:00
Maxwell Salzberg
1a7ec495c9 Merge pull request #3136 from movilla/Auto_fix
Issue #3134:Problem with translation in authorizations/new.html.haml
2012-04-17 13:52:29 -07:00
Maxwell Salzberg
d456fed99c Merge pull request #3148 from DeadSuperHero/appconfiglove
Refactor application.yml.example [ci skip]
2012-04-17 10:48:24 -07:00
Maxwell Salzberg
6fefcca292 update readme [ci skip] 2012-04-17 10:29:32 -07:00
Maxwell Salzberg
672eb1674f use rails admin gem, not the smaller git repo. NOTE: I will delete diaspora/rails_admin_smaller in about a week to let people who pulled it get off of it 2012-04-17 10:20:52 -07:00
Florian Staudacher
ec5289bd3b continue working on install script [ci skip] 2012-04-17 02:21:05 +02:00
Jonne Haß
b99e77d8ce Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-04-16 23:59:03 +02:00
Jonne Haß
959523aae8 updated 22 locale files [ci skip] 2012-04-16 23:58:57 +02:00
Florian Staudacher
fe130caf10 moved non-ascii url markdown tests to text_formatter_spec, added test case + fix 2012-04-16 23:41:05 +02:00