nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4382 commits 4 branches 0 tags 121 MiB
Commit graph

89 commits

Author SHA1 Message Date
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
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
danielvincent
3d302f8db7 facebook and twitter both use omniauth and are saved as OmniauthServices 2010-10-25 17:41:59 -07:00
maxwell
be39df75fe removed fb_status from the factories. whoops. 2010-10-25 17:41:58 -07:00
maxwell
fdd222003a fixed failing specs due to omitted factories. 2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
maxwell
b17ae0bf38 DG MS removed unused fb_status model and respective specs, fixtures. 2010-10-25 12:26:08 -07:00
Sarah Mei
d32d47b790 work in progress cucumber feature for posting messages 2010-10-24 22:57:43 -07:00
root
acc9c116e5 Add a cookbook to run after bundling to install everything 2010-10-24 19:22:15 +00:00
Raphael
c58b4706a5 Update carrierwave in Gemfile.lock 2010-10-21 10:09:52 -07:00
Sarah Mei
560910b53d More cruisecontrol bits 2010-10-20 20:47:07 -07:00
maxwell
494a0e2d3f updating the db script for dev to set the default pictures 2010-10-20 18:24:09 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -07:00
maxwell
0f75072477 make import spec pending with diaspora handle bug 2010-10-14 23:03:23 -07:00
maxwell
341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
 2010-10-14 23:02:06 -07:00
Sarah Mei
5e8d34621a ohai rails 3.0.1 2010-10-14 20:51:54 -07:00
maxwell
a30a2666c6 merging 2010-10-14 16:32:37 -07:00