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 |
|
Sarah Mei
|
850dcfd322
|
Updated versions of carrierwave, aws, cucumber, culerity, gherkin, haml, mail, rspec, rspec-core, rspec-expectations, rspec-mocks, and rspec-rails. What could possibly go wrong?
|
2010-12-20 02:49:44 -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 |
|
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 |
|
Sarah Mei
|
9adadd39fe
|
new versions of lots o' stuff
|
2010-12-01 22:49:20 -08:00 |
|
danielvincent
|
5e8606169d
|
rolling back twitter gem to 0.9.12 release.
|
2010-11-23 10:55:40 -08:00 |
|
maxwell
|
769c0e1055
|
DG MS trying to finish statusmessage refactor
|
2010-11-21 16:13:01 -08:00 |
|
maxwell
|
9b7d2ed0f6
|
DG MS; status messages can now have photos.
|
2010-11-21 16:13:01 -08:00 |
|
Sarah Mei
|
ad6f6498ef
|
Updated version of thor and mongomapper.
|
2010-11-20 19:08:13 -08:00 |
|
Sarah Mei
|
90193a16f5
|
fix 1.9 build
|
2010-11-19 23:14:08 -08:00 |
|
zhitomirskiyi
|
e8d86d6d07
|
pulled out the certlocations to a config file
|
2010-11-19 18:14:14 -08:00 |
|
Raphael
|
22aa0d3f26
|
Updating Gemfile.locl
|
2010-11-18 15:14:01 -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
|
092f0ef7a8
|
invite link when you get a webfinger error
|
2010-11-16 19:07:19 -08:00 |
|
danielvincent
|
e2e3b2511d
|
removing mini_fb gem
|
2010-11-16 16:46:41 -08:00 |
|
zhitomirskiyi
|
8edc516edf
|
Revert "added the socket policy file perl script, starts on script server, added a chef task"
This reverts commit ed9a66d9a4.
|
2010-11-16 12:34:00 -08:00 |
|
zhitomirskiyi
|
ed9a66d9a4
|
added the socket policy file perl script, starts on script server, added a chef task
|
2010-11-16 12:01:10 -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
|
1a4fa2713a
|
More specs for aspect-edit.js. Initialize now fully covered.
Also, bundler upgraded our cucumber and rspec.
|
2010-11-07 16:58:51 -08:00 |
|
Sarah Mei
|
32d953f457
|
Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.
|
2010-11-06 16:50:07 -07: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 |
|
Alec Leamas
|
a08fa76975
|
Updating Gemfile.lock
|
2010-11-03 12:58:06 +01:00 |
|
maxwell
|
34f190ce75
|
MS IZ added a check for person in webfinger response in receive_salmon method
|
2010-11-02 16:10:17 -07:00 |
|
Sarah Mei
|
e282abd526
|
cucumber feature for user authentication.
|
2010-11-01 22:22:35 -07:00 |
|
maxwell
|
15d6cff837
|
MS IZ everything now uses diaspora handle. this feels so good
|
2010-11-01 18:42:42 -07:00 |
|
Sarah Mei
|
d0446aa316
|
require => false on jasmine to get rid of warnings
|
2010-10-30 10:58:32 -07: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 |
|