Commit graph

1423 commits

Author SHA1 Message Date
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Maxwell Salzberg
6e02f61395 MS remove custom resque job logging as it is making heroku very sad 2012-01-16 20:25:56 -08:00
Maxwell Salzberg
467f3b0bda MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks 2012-01-16 20:25:56 -08:00
Jonne Haß
68fb01b2fd bump typhoeus timeout to 25 seconds too #2590 [ci skip] 2012-01-16 15:20:12 +01:00
Maxwell Salzberg
35676cddac fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more 2012-01-14 00:40:42 -08:00
Maxwell Salzberg
c45057bd94 update settings logic, and heroku rake task 2012-01-13 13:59:34 -08:00
danielgrippi
efe55f395d remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller 2012-01-13 13:50:52 -08:00
Maxwell Salzberg
f937804bb8 tell travis to run rspec files in a random order 2012-01-11 19:17:07 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
Tray Torrance
def764f29f Remove logging:basic before adding logging:expanded 2012-01-09 19:26:33 -08:00
Jamie Wilkinson
c152ecf5a7 Fix typo in 'rake heroku:install_requirements' 2012-01-09 16:38:55 -08:00
Tray Torrance
a35612410f No longer skip false values; quote values so that whitespace is valid. 2012-01-08 23:21:21 -08:00
danielgrippi
64a90a30ef only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream 2012-01-07 14:23:27 -08:00
danielgrippi
1b8f78e006 remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway 2012-01-07 14:23:24 -08:00
danielgrippi
cec2d27204 ported likes logic for the stream over from old branch 2012-01-07 14:23:22 -08:00
Maxwell Salzberg
41ecf2b27d make a method in EnviromentConfiguration to test if newrelic is setup 2012-01-05 18:14:06 -08:00
Maxwell Salzberg
db387b5ed4 MS DC; remove backup.rake as we now use backup' 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
d0184ff6f3 gimme backtraces, travis 2012-01-04 00:25:42 -08:00
Maxwell Salzberg
8b4cb744e6 fix for the messagebusmailer to be happy 2012-01-03 23:31:24 -08:00
Maxwell Salzberg
9de84cbba2 only notify hoptoad if it is configured 2012-01-03 20:03:51 -08:00
Maxwell Salzberg
8a48c5c720 remove extra logging we dont use 2012-01-03 20:03:29 -08:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until
we find a better way to reimpliment it in a  more sane way
2012-01-03 18:39:54 -08:00
Maxwell Salzberg
43090d38eb AppConfig in heroku can now read array variables 2012-01-03 16:18:51 -08:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Daniel Grippi
ab8fb88e74 Merge pull request #2524 from memarko/patch-2
Update lib/stream/followed_tag.rb
2011-12-31 10:51:51 -08:00
danielgrippi
018d516b48 rescue pubsubhubbub error if your pod is offline (resolves issue when posting public posts in dev mode with no internet connectivity) 2011-12-31 13:47:53 -05:00
Maxwell Salzberg
5bbfebdba9 the invite emailer is not multipart...sigh 2011-12-30 20:54:00 -08:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Maxwell Salzberg
ebf9004f91 update messagebus to latest version of their api 2011-12-19 12:24:25 -08:00
Tray Torrance
dc71396a4d Adds maintenance rake tasks for logrotate and temp file deletion; Adds whenever gem + sample whenever file 2011-12-15 15:18:07 -08:00
memarko
890195b2d8 Update lib/stream/followed_tag.rb 2011-12-14 21:15:58 +01:00
Maxwell Salzberg
f800d50a2b i think this works 2011-12-08 16:32:19 -08:00
Maxwell Salzberg
2282fd35d1 kill no longer used youtube titles code with fire 2011-12-08 16:16:57 -08:00
Sarah Mei
f99dd3683d Add jasmine:ci and cucumber oauth back into travis 2011-12-05 22:26:14 -08:00
Sarah Mei
d245dc91a5 Clearing rake spec before defining it - see if this affects travis 2011-12-05 22:03:24 -08:00
Sarah Mei
c2b22569b0 Let's try a trace on travis and see if it tells us anything useful. 2011-12-05 21:33:36 -08:00
Sarah Mei
d1044298d4 Remove export display for now to see if it affects travis 2011-12-05 21:14:48 -08:00
Sarah Mei
925753e6e4 travis needs to fail faster 2011-12-05 20:50:30 -08:00
Sarah Mei
df06b04d83 Perhaps the bundler prerelease is the reason we're running specs twice? Let's see. 2011-12-05 20:20:48 -08:00
Sarah Mei
085471fb55 Remove default rake task's dependency on spec:fixtures for now, to see if that stops travis from running all the specs twice 2011-12-04 17:46:26 -08:00
Daniel Grippi
8212268b99 Merge pull request #2379 from Robsteranium/patch-1
guid default of "" never gets set to a secure random hex (in mysql at least)
2011-12-02 10:47:24 -08:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Robsteranium
08b23d3a7f Condensed as per Daniel's comment 2011-12-02 12:17:24 +00:00
Sarah Mei
03f33f9313 Specify exclusion of fixture and performance separately 2011-11-30 22:14:24 -08:00
Sarah Mei
993b410d95 Fix default rake task so it runs the fixture-generation specs first explicitly. 2011-11-30 21:43:04 -08:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream"
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
2011-11-30 22:22:32 -05:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream
Like stream
2011-11-30 09:11:17 -08:00
Daniel Grippi
c27d0b8780 Merge pull request #2281 from justindthomas/backup-postgres
backup task handles postgresql dumps
2011-11-29 14:09:51 -08:00