N.S.Devaraj
94e5b4dc7b
Update master
2012-06-05 11:17:26 +05:30
Maxwell Salzberg
9cf946b20e
use a smaller thumb on the home stream
2012-06-04 15:19:05 -07:00
Maxwell Salzberg
9071540400
use pod name helper in emails
2012-06-04 14:04:39 -07:00
Maxwell Salzberg
1da029a22f
this stopped working because there is a new way to render views by default in spec_helper.rb
2012-06-04 12:49:24 -07:00
Maxwell Salzberg
304c33f19e
explicitly render_views in publics controller
2012-06-04 12:49:24 -07:00
Maxwell Salzberg
0975488964
possible rspec bug?
...
updating from 2.9 ~> 2.10 causes
spec/controllers/publics_controller_spec.rb to break. Namely, it now
seems that the host_meta, and web finger actions now return successful
http codes, but have blank bodies. Running this code by hand shows that
the response bodies are indeed not blank, as reported by rspec-rails
2.9.x
2012-06-04 12:49:24 -07:00
Maxwell Salzberg
ebf2543586
Merge pull request #3355 from diaspora/update-gems
...
update a bunch more unlocked gems [ci skip]
2012-06-04 00:12:54 -07:00
Maxwell Salzberg
b0eeb11464
update a bunch more unlocked gems
2012-06-03 23:52:20 -07:00
Maxwell Salzberg
d62a2ffc78
according to rspec-rails docs, rspec-rails should be in both test and development groups. Also, remove some implied gems which are sucked in by rspec-rails
2012-06-03 23:45:49 -07:00
Maxwell Salzberg
89406b568e
update a bunch of gems that DONT break the build
2012-06-03 23:34:10 -07:00
Maxwell Salzberg
4eb95a1b6b
Merge pull request #3353 from SuperTux88/fix-reshare-link-border
...
remove border from reshare link [ci skip]
2012-06-03 23:09:22 -07:00
Maxwell Salzberg
5d79d1ad00
Merge pull request #3354 from dmorley/patch-17
...
allow interactions to be viewed on public posts when not logged in
2012-06-03 23:08:54 -07:00
David Morley
d3b5e330b3
allow interactions to be viewed on public posts when not logged in
2012-06-03 21:49:08 -03:00
Benjamin Neff
769836c221
remove border from reshare link
2012-06-03 18:42:55 +02:00
Maxwell Salzberg
64bf4a1f48
adding the ability to customize your open graph namespace
2012-06-01 17:31:34 -07:00
Maxwell Salzberg
36ebefeaad
Merge pull request #3342 from diaspora/update_rails
...
updating rails to 3.2.5
2012-06-01 14:15:04 -07:00
Jonne Haß
2773694ba3
minor spelling fix [ci skip]
2012-06-01 23:02:56 +02:00
danielgrippi
9bf60d178a
Revert "consolidate mixpanel streams by making Profile one page [ci skip]"
...
This reverts commit 5af37fd3da
2012-06-01 13:48:51 -07:00
danielgrippi
5af37fd3da
consolidate mixpanel streams by making Profile one page [ci skip]
2012-06-01 13:24:01 -07:00
Maxwell Salzberg
80daa05817
update haml to get rid if weird escape_javascript bug
2012-05-31 23:10:34 -07:00
Maxwell Salzberg
018e513130
remove disable_with depreciation warning.
2012-05-31 22:35:07 -07:00
Maxwell Salzberg
4db207b3dd
update to 3.2.5
2012-05-31 22:14:32 -07:00
Maxwell Salzberg
324e460cfb
updating rails to 3.2.4
2012-05-31 15:34:26 -07:00
Maxwell Salzberg
cf6974b898
fix photo uploader loading image
2012-05-31 11:58:11 -07:00
Jonne Haß
0592eb025e
updated 14 locale files [ci skip]
2012-05-31 17:22:58 +02:00
danielgrippi
8e2657d26b
more instrumentation [ci skip]
2012-05-30 19:26:07 -07:00
danielgrippi
dac781cb4f
array woes. boo [ci skip]
2012-05-30 19:03:23 -07:00
Dennis Collinson
f3d1afcc96
memoize selected frame
2012-05-30 18:09:59 -07:00
Dennis Collinson
374ec73fa4
make it clearer which frame is active, and fixes for scrolling flow.
2012-05-30 18:06:12 -07:00
danielgrippi
1c81e4f587
app.track => app.instrument to be less confusing
2012-05-30 17:56:28 -07:00
Maxwell Salzberg
91db7859d8
Merge pull request #3340 from DeadSuperHero/YouTubeFix
...
Fix for YouTube Embeds in Show Pages [ci skip]
2012-05-30 17:52:50 -07:00
danielgrippi
a836b06d3e
mixpanel on posting
2012-05-30 17:32:18 -07:00
Sean Tilley
dfa925c375
remove max-height for iframe in show pages, this gets rid of the Chromium bug where YouTube videos appear in strange, elongated dimensions
2012-05-30 19:11:27 -05:00
Dennis Collinson
a7ced3f77b
make stream infininte scroll view static method on the page
2012-05-30 16:58:21 -07:00
Dennis Collinson
a9288daf19
refactor stream page scroll spy
2012-05-30 16:58:21 -07:00
Dennis Collinson
1ac01cc156
add our changes back to bootstrap custom
2012-05-30 16:58:21 -07:00
Dennis Collinson
0c8146a069
adding vanilla bootsrap scrollspy
2012-05-30 16:58:21 -07:00
Maxwell Salzberg
d926529ad7
wip dennis
2012-05-30 16:58:21 -07:00
danielgrippi
51d71bf394
DG MS; added scrollspy wip
...
Conflicts:
app/assets/javascripts/app/pages/stream.js
app/assets/templates/stream-frame.jst.hbs
2012-05-30 16:58:21 -07:00
danielgrippi
ee27764816
missing quotes. ugh. [ci skip]
2012-05-30 16:50:31 -07:00
danielgrippi
9e42d4386f
actually add the guid into the layouts [ci skip]
2012-05-30 16:34:29 -07:00
danielgrippi
ca492b407c
add guid to mixpanel
2012-05-30 16:31:26 -07:00
danielgrippi
de680216f0
add mixstuff to post.haml layout [ci skip]
2012-05-30 15:33:40 -07:00
danielgrippi
d8470d303a
simple mixtracking
2012-05-30 15:25:19 -07:00
danielgrippi
cf884fb1c9
finally fixed teh analytics helper [ci skip]
2012-05-30 14:56:02 -07:00
danielgrippi
7e544167f3
finally fixed analytics helper [ci skip]
2012-05-30 14:40:08 -07:00
danielgrippi
786a0be8b3
forgot one [ci skip]
2012-05-30 14:19:48 -07:00
danielgrippi
de8d7770fe
don't use double quotes in javascript tag helper for mixpanel [ci skip]
2012-05-30 14:11:45 -07:00
danielgrippi
f3e568d3c1
actually include mixpanel. durr [ci skip]
2012-05-30 14:00:25 -07:00
danielgrippi
72d2f619fc
added GA back into rack; added mixpanel configuration options
2012-05-30 13:30:28 -07:00
