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

1031 commits

Author SHA1 Message Date
danielvincent
f9a19e679f made header shorter 2010-08-23 15:27:34 -07:00
Raphael
dbb16faed1 Photo filename is now better 2010-08-23 15:10:19 -07:00
Raphael
0cff5a45a2 Deleting gridfs controller 2010-08-23 15:02:28 -07:00
Raphael
511f571ae5 Specs mostly pass again 2010-08-23 15:01:39 -07:00
Raphael
48959b3ded Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 14:45:20 -07:00
Raphael
76f2aa98ac Push to multiple groups 2010-08-23 14:45:13 -07:00
danielvincent
fb7e945fc2 removed useless if/else 2010-08-23 14:19:16 -07:00
danielvincent
60b7c30a8a Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 14:17:26 -07:00
danielvincent
d874ba3b38 dropdown menu for user 2010-08-23 14:17:05 -07:00
Raphael
5a02f92448 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 13:58:46 -07:00
Raphael
ae6f0fdc51 new photo form now loads through ajax 2010-08-23 13:58:33 -07:00
danielvincent
d9c091d3f8 search box in top nav 2010-08-23 12:43:12 -07:00
Raphael
0092069372 Take signed in check out of websocket js 2010-08-23 11:57:29 -07:00
Raphael
01dac4d173 Take tinymce out of layout 2010-08-23 11:56:06 -07:00
danielvincent
37a67b29a4 left/right arrow keys on photo show page go to prev/next 2010-08-23 11:22:55 -07:00
danielvincent
2355947d8e Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 11:05:36 -07:00
danielvincent
2d21ac0460 moving things around 2010-08-23 11:05:28 -07:00
Raphael
dc1dd07720 Don't crash on requesting a non-existent email address 2010-08-23 11:04:57 -07:00
Raphael
364cdfed22 Allowed email checking no longer so ridiculous 2010-08-23 10:20:19 -07:00
Raphael
15b2c23b51 Merge branch 'master' of github.com:diaspora/diaspora into pivots 2010-08-23 09:50:38 -07:00
maxwell
361adda6cd added group picker. sends the right params, but posts only have one group right now so thats a bummer 2010-08-22 22:20:34 -07:00
ilya
643c52fd62 making a clear text on the user index page 2010-08-19 18:10:55 -07:00
Raphael
8e253a6d49 Left in a merge marker 2010-08-19 16:20:38 -07:00
Raphael
f66b5f4006 Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	config/sprinkle/provision.rb
 2010-08-19 16:09:08 -07:00
ilya
7eb1bb5a00 removing the sanity check 2010-08-19 14:36:15 -07:00
ilya
542c1769f9 doing a sanity check, that not requiring serialized key passes the validation 2010-08-19 14:25:34 -07:00
ilya
501d62f215 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-19 14:13:27 -07:00
ilya
f7608f6292 RS IZ trying to create user through instantiate in seed script 2010-08-19 14:12:52 -07:00
danielvincent
36b2445a11 added title to search page 2010-08-19 13:41:48 -07:00
maxwell
35f6856380 MS search and index works 2010-08-19 12:40:50 -07:00
maxwell
756278f498 MS added friend search, and allow for autodiscover 2010-08-19 12:37:34 -07:00
maxwell
c98c52ad14 MS IZ renamed the array 2010-08-19 12:17:29 -07:00
maxwell
02da9bf634 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-19 12:00:21 -07:00
maxwell
df435dc319 MS IZ made a reques form in the user index page 2010-08-19 11:59:58 -07:00
ilya
b723c5997e Merge branch 'master' of github.com:diaspora/diaspora 2010-08-19 10:49:18 -07:00
ilya
54afb1bad4 Rolling assign_key into setup_person 2010-08-19 10:49:04 -07:00
maxwell
9942aef5d4 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-19 10:46:58 -07:00
maxwell
5d25861dc6 IZ MS person profile page now displays only posts a user can see 2010-08-19 10:46:47 -07:00
ilya
2e463c0e69 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-19 10:23:48 -07:00
ilya
9b47e67a15 call the right method in before_validation_on_create 2010-08-19 10:23:40 -07:00
maxwell
af8448dd51 photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page 2010-08-19 10:20:43 -07:00
maxwell
8131e413a4 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 22:59:18 -07:00
maxwell
84cc598017 MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page 2010-08-18 22:58:57 -07:00
ilya
9e78c9b64c removing setup person 2010-08-18 21:58:29 -07:00
ilya
0a3277d306 maybe the instantiate method will help 2010-08-18 21:51:51 -07:00
ilya
0f6ec71dcd we need assign key as well 2010-08-18 21:45:41 -07:00
ilya
0c9f041f28 we need do bad things in the user for seeding the database 2010-08-18 21:42:37 -07:00
Raphael
7ce8f94d58 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 21:10:48 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
ilya
36c06349c5 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 20:59:18 -07:00
ilya
284601c6b1 got moved photo.image.stuff to photo.url[:stuff] 2010-08-18 20:59:01 -07:00
Raphael
701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots 
Conflicts:
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 20:50:28 -07:00
Raphael
0459631d47 Show debug 2010-08-18 20:49:06 -07:00
ilya
3243435015 the album create doesn't crash the app 2010-08-18 20:14:31 -07:00
ilya
ef15cddf19 RS, IZ a slash 2010-08-18 18:13:17 -07:00
ilya
5cae2b21b1 RS, IZ fixed the url for the image 2010-08-18 18:06:13 -07:00
ilya
f6892b88d6 photo.remote_photo is relative 2010-08-18 17:50:13 -07:00
ilya
76b4b55e98 Added spec for remote photo url setting to photos 2010-08-18 17:39:38 -07:00
ilya
4019e4425a Checking for failing to set url in photo 2010-08-18 17:12:28 -07:00
ilya
b279d6582b Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 16:59:52 -07:00
ilya
803de25cc0 DG IZ albums are now posts 2010-08-18 16:59:19 -07:00
Raphael
5a2b42e4e5 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 16:37:12 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -07:00
ilya
516a667ce4 going back to showing the first group on the index page 2010-08-18 16:35:11 -07:00
ilya
5de9362933 DG IZ setting group id to nil and changing the deploy script for renaming of the repo 2010-08-18 16:27:08 -07:00
ilya
d0b2a23fcb Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 16:17:00 -07:00
ilya
21f70c643d DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing 2010-08-18 16:15:10 -07:00
Raphael
ac694eda8c A bunch of dumb checks to make the group index publisher pass tests 2010-08-18 15:42:06 -07:00
ilya
1ab21fe8b1 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-18 15:25:23 -07:00
ilya
08739ad23d DG IZ; retractions remove post references in group objects 2010-08-18 15:23:46 -07:00
Raphael
70247f987b Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-18 15:04:30 -07:00
Raphael
a52077b176 Redirect to the group you put someone in after adding them as friends 2010-08-18 14:57:53 -07:00
Raphael
61c906a9d3 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
	app/views/groups/index.html.haml
	config/deploy_config.yml
 2010-08-18 14:45:41 -07:00
Raphael
f570199d17 Add a couple specs to groups, moved socketing into each block, unclear where or why groups are being created wrongly 2010-08-18 14:30:16 -07:00
Raphael
0cc5cc5487 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/user.rb
 2010-08-18 12:20:07 -07:00
ilya
034755368b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-18 12:17:23 -07:00
Raphael
9b2f2bbddf Move socketing out to method from receive 2010-08-18 12:14:47 -07:00
ilya
f5811df5b7 DG IZ; added info text to add new friend button 2010-08-18 11:59:20 -07:00
Raphael
5e439bdb28 Ensure_bson on groups_with_person 2010-08-18 11:56:11 -07:00
Raphael
b7d648e173 Validate presence of name on group 2010-08-18 11:54:44 -07:00
Raphael
4cd46abaac render nothing at the top 2010-08-18 11:48:32 -07:00
Raphael
10aef7a0a3 Begin rescue on publics controller to make the post for nonexistent user error more readable 2010-08-18 11:46:28 -07:00
ilya
4d86933f4a DG IZ; user's visible posts method queries group objects for their posts 2010-08-18 11:40:02 -07:00
Raphael
d640c0672f switch deploy branch to actually be one we are working on 2010-08-18 10:56:09 -07:00
ilya
055c222fc2 DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial 2010-08-18 10:53:43 -07:00
ilya
b0088c73d8 DG IZ; user's own post gets referenced in group model 2010-08-18 10:37:33 -07:00
Raphael
1685e0c28b Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
 2010-08-18 10:13:25 -07:00
Raphael
045878de64 call ensure_bson once in visible_person_by_id and group_by_id 2010-08-18 10:12:22 -07:00
Raphael
b99a86e6bd Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
 2010-08-18 10:10:20 -07:00
Raphael
9a188fd9f0 Don't try to unsocket albums 2010-08-18 10:08:38 -07:00
Raphael
36f8289522 Fixing retractions on albums, adding back remove_from_view 2010-08-18 10:03:37 -07:00
danielvincent
2409fd3f20 user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self 2010-08-18 02:40:53 -07:00
Raphael
539316a235 Removing posts relation from person 2010-08-17 23:50:07 -07:00
Raphael
98a0a3032a Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 23:28:00 -07:00
Raphael
42cc1da9f6 Removing posts array from person 2010-08-17 23:27:17 -07:00
ilya
501bcdd197 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 23:25:33 -07:00
ilya
c501707f80 DG IZ posts_for to visible posts 2010-08-17 23:24:42 -07:00
Raphael
4a4686ce6e refactored signature validation got specs passing 2010-08-17 23:21:00 -07:00
ilya
55b4d4758f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
 2010-08-17 22:58:46 -07:00
Raphael
cb152ea3c3 Shortened user receive, moderated groups.first in the socketing 2010-08-17 22:34:01 -07:00