Raphael
b580b7bd2c
Putting fixtures in specs...
2011-01-18 10:42:50 -08:00
Raphael
fdc9534fc7
Fix specs in the presence of fixture_builder
2011-01-18 10:25:26 -08:00
zhitomirskiyi
995d285fdd
ssl s3, attrs
2011-01-17 15:56:06 -08:00
danielvincent
2eb1901073
s3 support minus rake migration.
2011-01-17 15:56:06 -08:00
Sarah Mei
910ae49fca
Lock down gem versions & github refs in mysql branch because it's got that same damn aws problem.
2011-01-15 15:23:34 -08:00
Raphael
738e8c65c8
Merge almost complete, 4 failures
2011-01-14 16:00:10 -08:00
maxwell
32d1d26e22
updated some dependancies
2011-01-11 14:39:44 -08:00
Raphael
b642cd6840
Merging master into mysql
2010-12-26 16:30:17 -08:00
Raphael
f043c9cc7e
Took MongoMapper out of the bundle, trying to fix querying.
2010-12-20 16:53:56 -08:00
maxwell
ed0e739ac3
updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with
2010-12-20 11:22:52 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff
post_spec now passes with mysql
2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d
profile_spec is passing with mysql... baby steps.
2010-12-18 18:45:55 -08:00
Raphael
0e77577fbd
Websocket now uses redis
2010-12-10 11:25:38 -08:00
MrZYX
acc8803cee
try at fixing specs for ruby 1.9, SystemTimer isn't needed anymore for 1.9
2010-12-03 16:33:28 +01:00
Alec Leamas
acb3381dc6
Sticking to git: urls for git repos, as we always do.
...
Using a single type of url means just a single type of problems ;)
2010-12-03 12:20:48 +01:00
Raphael
3ee246d873
Merge branch 'resque-receive'
...
Conflicts:
Gemfile.lock
2010-12-02 19:42:05 -08:00
maxwell
11f04a060e
frustrated
2010-12-02 18:48:50 -08:00
maxwell
b9131c0e46
pushing to my website for further debugging
2010-12-02 18:47:48 -08:00
maxwell
38d9d75162
posts now have public permalinks
2010-12-02 18:47:48 -08:00
Raphael
8798f05ff7
Revert "Revert redis merge to fix bugs on master"
...
This reverts commit 30698d674b
2010-12-02 15:33:26 -08:00
Raphael
30698d674b
Revert redis merge to fix bugs on master
2010-12-02 15:20:27 -08:00
danielvincent
8cb2a3a79a
resque init, config, gemfile
2010-12-02 12:35:26 -08:00
maxwell
9aa093a0a3
api compatabile, but ugly
2010-12-02 12:35:25 -08:00
danielvincent
5e8606169d
rolling back twitter gem to 0.9.12 release.
2010-11-23 10:55:40 -08:00
zhitomirskiyi
481204a157
mongo cloudfiles backup task
2010-11-19 10:57:28 -08:00
maxwell
585ab020f8
move back to magent master
2010-11-18 12:36:47 -08:00
maxwell
31d33054ef
added jammit, now js and css compress for production
2010-11-17 21:51:59 -08:00
maxwell
3db8da992a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 20:14:12 -08:00
maxwell
c08a991130
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 20:14:00 -08:00
danielvincent
f59f6be4b0
users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp.
2010-11-17 19:37:08 -08:00
maxwell
045c8f1aac
updated magent, now using my fork untill bugfix gets pulled
2010-11-17 13:49:12 -08:00
maxwell
72f99afe9c
commenting out sprinkle from the gemfile because it is misbehaving with CI
2010-11-16 18:38:32 -08:00
danielvincent
e2e3b2511d
removing mini_fb gem
2010-11-16 16:46:41 -08:00
zhitomirskiyi
8a47b3d538
DG IZ rails updated
2010-11-15 19:00:15 -08:00
zhitomirskiyi
b437f201a5
DG IZ using em-websocket from HEAD; updated flash policy for FABridge over wss://
2010-11-15 18:42:26 -08:00
Raphael
1b39b79446
Make invitation view with no inviters sensible
2010-11-15 16:35:00 -08:00
Raphael
d3098cf6bc
Add option to close registration in app_config
2010-11-15 12:15:40 -08:00
Sarah Mei
bfb6abd71e
try require => false on chef instead
2010-11-03 22:18:48 -07:00
zhitomirskiyi
96b44faed5
commenting chef out of bundle saved 5 secs off server start
2010-11-03 19:57:21 -07:00
maxwell
a22060d1fb
removing webfinger
2010-11-02 13:59:20 -07:00
Sarah Mei
50efd27710
Removing webmock from cucumber - interferes with capybara (more investigation needed).
2010-10-31 20:04:24 -07:00
Sarah Mei
d0446aa316
require => false on jasmine to get rid of warnings
2010-10-30 10:58:32 -07:00
Alec Leamas
d572f8fafc
Packaging update
...
Handle git gems by cloning repo to local one, rewriting Gemfile
urls and sending both repos and gems in source packages.
Separate doc dir w licensec.
Gemfile, Gemfile.lock now lives in bundle, linked to application.
Rewrite http git urls to git: to make it uniform & simpler
2010-10-30 18:03:14 +02:00
Sarah Mei
3fd198d1bc
mongrel doesn't build under 1.9
2010-10-29 22:35:33 -07:00
Sarah Mei
d819c98718
can haz working jasmine
2010-10-29 22:21:08 -07:00
livefromthemoon@gmail.com
6e1121179d
guess locale from browser settings
2010-10-28 17:29:17 +02:00
Sarah Mei
f314ab39df
At some point, we should upgrade database_cleaner to 0.6.0. That point is not now. (It breaks cucumber.)
2010-10-26 19:05:18 -07:00
maxwell
606c7a02a4
MS DG public message now post to twitter, if connected
2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a
twitter oauth dance complete
2010-10-25 17:41:58 -07:00
Sarah Mei
d32d47b790
work in progress cucumber feature for posting messages
2010-10-24 22:57:43 -07:00
