Commit graph

410 commits

Author SHA1 Message Date
ilya
48c212c1ab made a public view, copied the fb publisher there 2010-09-23 12:18:26 -07:00
danielvincent
fc0350e4e1 DG IZ; user can post a status update from user edit page to facebook. 2010-09-22 17:49:11 -07:00
danielvincent
bc70ebdb95 DG IZ; quick form in user edit 2010-09-22 17:33:57 -07:00
danielvincent
ae58120deb another typo... 2010-09-22 17:18:46 -07:00
danielvincent
26478403e2 DG IZ; connecting/disconnecting from fb 2010-09-22 17:14:58 -07:00
danielvincent
159d72c04c DG IZ; logged in as? 2010-09-22 16:56:39 -07:00
danielvincent
fcc681df71 DG IZ moved to be APP_CONFIG for host 2010-09-22 16:32:52 -07:00
danielvincent
8ed98270a6 Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
	config/routes.rb
2010-09-22 16:09:25 -07:00
danielvincent
81250c0e9d Merge branch 'master' of github.com:diaspora/diaspora into reposting 2010-09-22 15:49:13 -07:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07:00
Thomas Krehbiel
10e6ff9df8 Fix for sending unlimited duplicate friend requests 2010-09-22 18:16:10 -04:00
danielvincent
5ef32b7d55 DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial 2010-09-22 12:03:25 -07:00
danielvincent
6dd7911c8c DG IZ; update_or_repost 2010-09-22 10:52:29 -07:00
ilya
efd901dcd9 RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG 2010-09-21 15:46:57 -07:00
danielvincent
9571ade89c basic setup 2010-09-21 12:29:39 -07:00
danielvincent
9c334e24e4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 17:26:35 -07:00
danielvincent
e588d7ab6a DG IZ moving friends is now ajaxy 2010-09-20 17:26:20 -07:00
maxwell
24ca139241 MS remove some stray puts 2010-09-20 17:11:07 -07:00
maxwell
cb0f0b72eb MS removed a log and trying to be slightly more pedantic 2010-09-20 15:32:18 -07:00
maxwell
5e2fdedf8b MS removed another logging of encrypted data.... 2010-09-20 15:07:30 -07:00
danielvincent
4fe4326ed1 DG IZ photo uploading now works 2010-09-20 15:00:02 -07:00
danielvincent
af9cda52af DG IZ; always query through the current_user in the controllers. 2010-09-20 13:18:11 -07:00
danielvincent
b097f93bf5 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-20 11:39:17 -07:00
danielvincent
fe306b37ab DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00
Ariel Zavala
6501974f30 added more translations missing on views 2010-09-21 01:43:54 +08:00
Raphael
84789f64c9 scope album queries through user 2010-09-17 14:57:14 -07:00
Raphael
5df33a6fd0 Take out users/show, use current_user in update 2010-09-17 10:50:18 -07:00
Raphael
be26794e4a only write to your own profile 2010-09-17 10:46:14 -07:00
Raphael
b45906f902 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 21:35:48 -07:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
maxwell
e668071ea5 README.md 2010-09-16 18:48:18 -07:00
danielvincent
cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
Raphael
feb4cbfd29 Merge branch 'master' of http://github.com/fbrubacher/diaspora 2010-09-16 12:14:11 -07:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03:00
Raphael
d124686723 Need more stack traces! 2010-09-15 23:22:02 -07:00
Raphael
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jamie Wilkinson
5d87ca0904 Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting 2010-09-16 10:07:57 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
bf33313bf9 take out index, change backer seed, no puts 2010-09-15 17:13:17 -07:00
Raphael
02dda4f0a7 change the name of instantiate back 2010-09-15 17:08:56 -07:00
Raphael
01d26f6d0e Using custom registrations controller 2010-09-15 17:05:21 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Raphael
8c8eb02316 Reset albumscontroller 2010-09-15 10:20:46 -07:00
Raphael
5d303518c2 Adding in COPYRIGHT, AUTHORS, and blueprint attribution 2010-09-15 10:09:42 -07:00
maxwell
0d37f065dc MS RS fixed a small group adding bug 2010-09-14 15:13:55 -07:00
Daniel Vincent Grippi
24cd518f11 DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00