danielgrippi
e5206f3429
DC fix back button to profile with this.deferred reference
2012-05-17 11:47:17 -07:00
danielgrippi
ed6785d7cb
don't use an iframe for the composer anymore. yayyyyy
2012-05-16 18:55:25 -07:00
Maxwell Salzberg
a6758c0832
Merge pull request #3264 from movilla/share_amparito
...
Translation invitation Share this link /stream [ci skip]
2012-05-16 17:48:14 -07:00
Maxwell Salzberg
b124d3e5a1
Revert "update factory girl" new version does not support 1.8.7 :(
...
This reverts commit c52342b7cb
2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb
update factory girl
2012-05-16 17:17:14 -07:00
Maxwell Salzberg
455dc34eae
remove hotlink controller, just rewrite those landing assets
2012-05-16 15:02:59 -07:00
Maxwell Salzberg
143df27e5a
redirect old atom.xml :( [ci skip]
2012-05-16 14:48:01 -07:00
danielgrippi
08fddf7422
raise on hotlinking [ci skip]
2012-05-16 14:41:09 -07:00
Florian Staudacher
bdf7dba42e
update ruby version, be more verbose while installing, load .rvmrc the hard way
2012-05-16 16:11:04 +02:00
danielgrippi
ebbbf74489
add 1.9.3 back into the gemfile. LETS DO THIS [ci skip]
2012-05-15 17:19:28 -07:00
danielgrippi
fb0fa46613
whoops (gemfile) [ci skip]
2012-05-15 17:10:44 -07:00
movilla
d394272e5d
Translation invitation Share this link /stream
2012-05-16 00:56:34 +02:00
Maxwell Salzberg
4d9df0ec25
Merge pull request #3263 from movilla/stats_amparito2
...
[Rebase] Add translation app/views/admins/stats.html.haml for Admin Panel [ci skip]
2012-05-15 15:52:39 -07:00
danielgrippi
15eab43408
explicitly set ruby version in gemfile [ci skip]
2012-05-15 14:40:00 -07:00
danielgrippi
f9bc493581
remove 1.9.3 from heroku env [ci skip]
2012-05-15 14:26:42 -07:00
danielgrippi
d7a099dadb
add publish_actions to facebook connection [ci skip]
2012-05-15 14:07:34 -07:00
Movilla
4fac6c9619
Rebase Add translation app/views/admins/stats.html.haml => Admin Panel
2012-05-15 22:38:48 +02:00
Maxwell Salzberg
900067ba1e
disable the mass assignment thing until we deal with it [ci skip]
2012-05-15 13:35:22 -07:00
Movilla
a3daa00a41
Rebase Add translation app/views/admins/stats.html.haml for Admin Panel
2012-05-15 22:27:08 +02:00
Maxwell Salzberg
e3ccbb3471
use a forked version of heroku_san until upstream updates; rake now freezes args which was causing probs
...
'
2012-05-15 13:13:23 -07:00
Jonne Haß
9950342599
updated locales [ci skip]
2012-05-15 17:09:13 +02:00
Maxwell Salzberg
89d72f7f1e
most recent version of rails has a bug which causes conversations to break: see https://github.com/rails/rails/issues/6312
2012-05-14 21:53:36 -07:00
Maxwell Salzberg
ab2e740ca2
upgrade to Rails 3.2.3
2012-05-14 21:53:16 -07:00
Maxwell Salzberg
4d58940e51
update rails admin [ci skip]
2012-05-14 19:58:07 -07:00
Dennis Collinson
6282450418
killing rich media styling, WE'LL DO IT LIVE
2012-05-14 19:13:33 -07:00
Maxwell Salzberg
9af48d85aa
be less strict in asserting post template as not all small frames are .post(which seems weird)
2012-05-14 19:00:25 -07:00
Dennis Collinson
bca3046cad
money party.
2012-05-14 18:55:32 -07:00
Dennis Collinson
927b78b79d
kill references to ServiceUser
2012-05-14 18:47:14 -07:00
Dennis Collinson
68439ebab3
fix service user migration
2012-05-14 18:36:25 -07:00
Dennis Collinson
a90968ea2d
basic experimental stream
2012-05-14 17:57:02 -07:00
Maxwell Salzberg
5620412fbd
Merge branch 'kill-service-users'
2012-05-14 16:37:21 -07:00
Maxwell Salzberg
fe6dcffa8f
remove cubbies from sidebar, also add invite code directly to sidebar to make even clearer
2012-05-14 16:33:56 -07:00
Maxwell Salzberg
06f389231a
kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk
2012-05-14 16:25:19 -07:00
Maxwell Salzberg
7a256d7810
window.preloads is always set to at least a empty json object
2012-05-14 16:24:55 -07:00
Maxwell Salzberg
379df76118
Update to faraday-middleware, as faraday stack has been deprecated.
...
Hopefully this will make REE happy in Travis
2012-05-14 15:59:07 -07:00
Maxwell Salzberg
ad6151c808
Revert "@joshsusser hates our ci setup, /cc @suss"
...
This reverts commit cbca19b3f5
2012-05-14 15:59:06 -07:00
Maxwell Salzberg
5968583857
Merge pull request #3253 from SuperTux88/fix-paragraph-margin
...
fix paragraph margin for comments and posts [ci skip]
2012-05-14 15:39:25 -07:00
Maxwell Salzberg
7a6633e82a
Merge pull request #3256 from SuperTux88/invitation-mail
...
Invitation mail cleanup
2012-05-14 15:38:43 -07:00
Benjamin Neff
e15aff46a6
delete message input field
2012-05-15 00:23:54 +02:00
Maxwell Salzberg
9d20f66d2f
Merge pull request #3252 from movilla/regis_tra
...
Translation registrations/new [ci skip]
2012-05-14 15:18:52 -07:00
Maxwell Salzberg
641ead632b
Merge pull request #3254 from SuperTux88/fix-oembed-css
...
fix oembed when empty [ci skip]
2012-05-14 15:17:46 -07:00
Dennis Collinson
ca1a61825d
make post load faster from profile to show
...
using dirty preloads for now.
I like it dirty.
2012-05-14 12:14:11 -07:00
danielgrippi
7a11e9fd37
full bleed the mobile images [ci skip]
2012-05-14 11:44:41 -07:00
Florian Staudacher
6661f91e1d
make sure bundler is installed, be more specific in 'welcome' message [ci skip]
2012-05-14 13:01:49 +02:00
Jonne Haß
f4d996d644
do not break non heroku setups/do not confront them with a useless cryptic error message/do not use bundler 1.2 features but lock 1.1 in the Gemfile
2012-05-13 17:03:33 +02:00
danielgrippi
bcadedc258
specify ruby 1.9.3 in bundler for heroku. this requires a Successfully installed bundler-1.2.0.pre
...
1 gem installed
Installing ri documentation for bundler-1.2.0.pre...
Building YARD (yri) index for bundler-1.2.0.pre...
Installing RDoc documentation for bundler-1.2.0.pre... [ci skip]
2012-05-12 23:49:25 -07:00
danielgrippi
70b28105e7
fix a little padding and background image weirdness on ios [ci skip]
2012-05-12 22:56:18 -07:00
danielgrippi
f14907e64c
more responsive stuffs [ci skip]
2012-05-12 22:29:08 -07:00
danielgrippi
31049fe1c4
get a little responsive in our css [ci skip]
2012-05-12 22:04:12 -07:00
Daniel Grippi
4fc44f137f
Merge pull request #3255 from SuperTux88/fix-aspect-dropdown
...
fix aspect dropdown on contacts page [ci skip]
2012-05-12 20:21:38 -07:00
