danielgrippi
da9e57b2c9
added oink in dev mode
2012-01-26 13:18:58 -08:00
Jonne Haß
bddd9b244f
flickr embedding doesn't break the JS anymore
2012-01-26 05:38:43 +01:00
danielgrippi
e170829bf7
pull back less Person objects in the stream query.
2012-01-25 19:40:40 -08:00
Dennis Collinson
b0ef88fb9f
WIP convert multiStream query to evilQuery
2012-01-25 19:10:25 -08:00
Maxwell Salzberg
c490224516
change the name of the rake task as we are doing it locally for now
2012-01-25 18:23:49 -08:00
Dennis Collinson
f332610016
Refactor user.shareables_from into evil query class for optimization, possibly broken.
2012-01-25 16:32:18 -08:00
Dennis Collinson
d69953b0d6
enter the idea of the evilquery
2012-01-25 14:20:16 -08:00
Maxwell Salzberg
939383ef32
You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash
2012-01-25 11:22:45 -08:00
Jonne Haß
e1658f8d8b
switch PhotosController#index over to guid, fix #2729
2012-01-25 12:45:02 +01:00
Jonne Haß
9c67cd7eb9
collapse Post#last_three_comments and Commentable#last_three_comments, do not double query comments in CommentsController#index for a JSON response, remove spec that tests ordering as it's not deterministic on psql without specified order
2012-01-25 12:44:50 +01:00
danielgrippi
72aee6b2c1
don't use .last(3), use .limit(3) instead. also, don't put an order on an association as it isn't overridable. (this commit minimizes AR object instantiation in the stream)
2012-01-24 23:47:45 -08:00
Maxwell Salzberg
3808547ac4
adding back the images we use in development
2012-01-24 18:20:50 -08:00
Maxwell Salzberg
9aaec14800
remove a bunch of unused images. we might use one or two of these on test but we can deal with it later [ci skip]
2012-01-24 17:52:40 -08:00
danielgrippi
eaed3505e4
Don't create share_visibilities for public posts, sans migration of deleting old data.
2012-01-24 16:49:07 -08:00
Maxwell Salzberg
821c164809
update resque-ensure-connected
2012-01-24 16:48:28 -08:00
Maxwell Salzberg
53304df740
I can't test this at this momement. I will put it back in once i have a
...
chance to test it first Revert "finally found a way to disable airbrake [ci skip]"
This reverts commit 8aafd56482
2012-01-24 15:42:39 -08:00
Maxwell Salzberg
335172c411
move unicorn killer to initializer so thin still works, also a fix for newrelic not sending data
2012-01-24 15:42:25 -08:00
Jonne Haß
8aafd56482
finally found a way to disable airbrake [ci skip]
2012-01-25 00:28:28 +01:00
danielgrippi
d301d453a1
whoops. [ci skip]
2012-01-24 15:13:30 -08:00
danielgrippi
c1d3df6a64
fix require [ci skip]
2012-01-24 15:12:58 -08:00
Maxwell Salzberg
e0186138f2
add rpm_contrib for instrumenting resque jobs
2012-01-24 14:58:36 -08:00
Maxwell Salzberg
a1aae2c3dc
add airbrake back to resque
2012-01-24 14:58:36 -08:00
Maxwell Salzberg
ba010833c7
move newrelic and airbrake out of any group, as it is not loading at all
...
if it is in any bundler group #confused
2012-01-24 14:58:36 -08:00
danielgrippi
52438ffaf2
add unicorn back in. only use one worker process for now. also, move chrome_frame middleware into the correct load path in lib. [ci skip]
2012-01-24 14:56:55 -08:00
Jonne Haß
100625d18c
fix people and person specs for the guid stuff on psql
2012-01-24 23:02:07 +01:00
Daniel Grippi
89472992cc
Merge pull request #2720 from MrZYX/people_slash_guid
...
use guid instead of id for /people/ urls
2012-01-24 13:14:08 -08:00
Maxwell Salzberg
41e6377ba5
move airbrake and newrelic to reporting bundler group
2012-01-24 11:55:59 -08:00
Jonne Haß
cb14572083
only use if defined
2012-01-24 19:45:46 +01:00
Jonne Haß
6f283632c5
fix resharing a reshare, javascript isn't ruby :P
2012-01-24 19:44:45 +01:00
Jonne Haß
5ad15974fb
make sure custom rvmrc works too if you directly cd into a subdir [ci skip]
2012-01-24 19:20:27 +01:00
danielgrippi
b021a26674
make mentions in selector more ledgable [ci skip]
2012-01-24 10:09:21 -08:00
Jonne Haß
19785d909b
ensure services is an array in StatusMessagesController#create
...
This fixes posting to a single service for Ruby 1.9
For some reason Rails doesn't convert a single foo[]=bar
not to the expected :foo => ["bar"] but to :foo => "bar"
On Ruby 1.8 String#map exists and just yields self, on
Ruby 1.9 String#map got removed
2012-01-24 18:54:36 +01:00
Jonne Haß
4797e8f2f8
updated 35 locale files [ci skip]
2012-01-24 13:29:17 +01:00
Jonne Haß
51d1bbbd70
app.user returns false instead of undefined if logged out, fix #2723
2012-01-24 11:56:48 +01:00
Sarah Mei
dbfbab3a4f
jammit is looking for this file. @denniscollective have a look at this tomorrow and remove if we don't need it
2012-01-23 21:11:38 -08:00
Sarah Mei
0820ef442e
Merge pull request #2722 from dmorley/patch-11
...
Update config/assets.yml
2012-01-23 20:43:44 -08:00
David Morley
cec98ba454
Update config/assets.yml
2012-01-23 20:18:41 -08:00
Dennis Collinson
45f0031763
Merge branch 'jquery-mentions-input'
2012-01-23 19:52:04 -08:00
Dennis Collinson
f9e9a3500e
rebased, removed orphaned callbacks
2012-01-23 19:38:38 -08:00
Dennis Collinson
18cd151456
cuke fix
2012-01-23 19:32:15 -08:00
Dennis Collinson
f506a8778c
moving javascript hax
2012-01-23 19:32:15 -08:00
Dennis Collinson
870ad3d9f7
DC DG; some fixes, mentioning works.
2012-01-23 19:32:15 -08:00
Dan Hansen
51332931ee
almost done
2012-01-23 19:31:01 -08:00
Dan Hansen
e169879311
remove jquery.elastic dependency
2012-01-23 19:31:00 -08:00
Dan Hansen
3b4e3fd87e
mentions now work for stream publisher
2012-01-23 19:31:00 -08:00
danielgrippi
94ad9264f1
DG DH; wip
2012-01-23 19:31:00 -08:00
Dan Hansen
168d6cbdbe
jquery.mentionsInput wip, almost done
2012-01-23 19:31:00 -08:00
Maxwell Salzberg
c073cb078f
update messagebus gem
2012-01-23 16:29:19 -08:00
Jonne Haß
a19736e0c4
d'oh committed db/schema.rb
2012-01-23 23:45:15 +01:00
Jonne Haß
7aaaf4f43b
use guid instead of id for /people/ urls
2012-01-23 23:35:31 +01:00
