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

1277 commits

Author SHA1 Message Date
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
Raphael
55d84b3288 Broke up user spec, put user update back in routes 2010-08-17 22:03:45 -07:00
Raphael
82f53663ab remove user index 2010-08-17 20:39:05 -07:00
Raphael
9285839296 Merging in socket-group 2010-08-17 20:30:30 -07:00
Raphael
20bc88c0bf Merge branch 'socket-group' of github.com:diaspora/diaspora_rails 2010-08-17 20:19:29 -07:00
Raphael
9fcc02a580 Ensure bson on visible person 2010-08-17 19:56:21 -07:00
Raphael
9f9395bc9c visible_person_by_id should check against self.person.id 2010-08-17 19:51:29 -07:00
Raphael
456e9e9634 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 
Conflicts:
	app/models/user.rb
 2010-08-17 19:34:19 -07:00
Raphael
48756e77f3 Friend_by_id changed to visible_person_by_id 2010-08-17 19:32:42 -07:00
Raphael
eb84b39f93 change before to after 2010-08-17 19:11:59 -07:00
Raphael
e8e141b24e Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 19:04:03 -07:00
Raphael
2b8e637934 no names in publisher 2010-08-17 19:03:47 -07:00
Raphael
f75ff0b680 Remove links from publisher 2010-08-17 18:57:26 -07:00
Raphael
86afa7a987 Remove bookmarks and blogs 2010-08-17 18:56:42 -07:00
Raphael
4fe6a54c09 seed groups 2010-08-17 18:54:27 -07:00
Raphael
1c91faa2c5 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 18:52:35 -07:00
Raphael
43160496c9 Tommy 2010-08-17 18:52:15 -07:00
Raphael
d554b3ef1a flashsocket 2010-08-17 18:49:23 -07:00
ilya
2614cb5add DG IZ; find_all_by instead of find_by 2010-08-17 18:37:08 -07:00
Raphael
ffc9b00489 taking group seed out 2010-08-17 18:35:33 -07:00
Raphael
07549ed17e Start with a group' 2010-08-17 18:30:08 -07:00
Raphael
8619584834 things mostly working 2010-08-17 18:27:50 -07:00
ilya
f4f377e7e7 DG IZ finding albums by person_id 2010-08-17 18:26:48 -07:00
ilya
daf08cd9f9 DG IZ posts by the user get websocketed on the group page and albums 
get signed?
 2010-08-17 18:06:35 -07:00
Raphael
6901b4f83e Devise routes 2010-08-17 17:54:20 -07:00
Raphael
7186f3537a Move back paragraph tag in confirmations view 2010-08-17 17:48:00 -07:00
ilya
f15b3c46b2 DG IZ; reverted to before removing latest message methods 2010-08-17 17:40:48 -07:00
Raphael
bb85c46be1 syntax error 2010-08-17 17:28:17 -07:00
Raphael
244023ac47 Infield labels on sign in 2010-08-17 17:26:37 -07:00
Raphael
6f24a454c8 merge 2010-08-17 17:23:37 -07:00
Raphael
fb84daf68a Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 17:21:38 -07:00
Raphael
1aefaedda1 merge 2010-08-17 17:21:10 -07:00
Raphael
08de5caf97 make signup page look better 2010-08-17 17:20:29 -07:00
ilya
054dafdf99 couple more 2010-08-17 17:16:11 -07:00
ilya
c1ff8544d3 removed a couple of js lines 2010-08-17 17:04:37 -07:00
ilya
e5036862f6 DG IZ removed the latest message javascript as well as the hash 2010-08-17 16:49:58 -07:00
Raphael
26a892ab4c putting email verification back in 2010-08-17 16:43:54 -07:00
ilya
d211abb1bc DG IZ on page for group js method now returns true 2010-08-17 16:32:14 -07:00
ilya
d5d1a2d00f DG IZ; javascript variable misnamed 2010-08-17 16:29:51 -07:00
Raphael
ba83cb9d29 Index on email 2010-08-17 16:24:52 -07:00
ilya
5e95650ae3 DG IZ logger info 2010-08-17 16:11:25 -07:00
ilya
f70cf4a60a DG IZ first group for now, added logging statements 2010-08-17 16:09:55 -07:00
ilya
7d68089c8b DG IZ using group_id when passing the id around the app 2010-08-17 16:02:12 -07:00
ilya
87bc9dad1d DG IZ added group id to the action hash 2010-08-17 15:27:12 -07:00
Raphael
88cb7aaa8b Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 14:52:17 -07:00
ilya
fd539926c2 DG IZ; changed variable 'c' to 'comment' 2010-08-17 13:59:58 -07:00
Raphael
063164fea2 comma 2010-08-17 13:59:57 -07:00
Raphael
0fdb337076 Confirmable 2010-08-17 13:57:45 -07:00
ilya
b5c6bbd1df DG IZ; moved commenting methods into User (from Person). 2010-08-17 13:56:52 -07:00
Raphael
771c594814 Take out pivotal only for a second 2010-08-17 13:49:18 -07:00
Raphael
e6768cb5c8 helper method 2010-08-17 13:21:29 -07:00
Raphael
1d6e132a9f Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots 2010-08-17 13:07:26 -07:00
Raphael
d5c608c7ae Removing welcome home line 2010-08-17 13:07:11 -07:00
Raphael
842b321dfa User email checking, routes working again 2010-08-17 13:02:42 -07:00
ilya
2a90e59f1e DG IZ the group should view the posts for the group (and yourself) w 2010-08-17 12:22:14 -07:00
ilya
2af41a0ea9 DG IZ; posts_for :group method in User 2010-08-17 12:14:02 -07:00
Raphael
ccbbf40584 validation lambda out to method 2010-08-17 11:48:59 -07:00
Raphael
015940b60e Pass to the lambda 2010-08-17 11:45:47 -07:00
ilya
4f8b8ad3c5 DG IZ saving the post 2010-08-17 11:03:31 -07:00
Raphael
453cb06691 changing settings and deploy scripts, validating email 2010-08-17 11:01:30 -07:00
ilya
7316c6073c DG IZ local person bug 2010-08-17 10:58:50 -07:00
ilya
0af6f7b0e5 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:48:47 -07:00
ilya
5dff3369ad DG IZ; removed puts statements. 2010-08-17 10:48:40 -07:00
ilya
a9c9619a54 DG IZ; posting from a user includes adding to the many posts association in said user 2010-08-17 10:43:18 -07:00
Raphael
72559cbce1 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:37:18 -07:00
Raphael
50919ef491 Requesting now searches the local server by email for a matching person. 2010-08-17 10:37:09 -07:00
ilya
5761d5db36 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:35:37 -07:00
ilya
dea6551374 DG IZ; moved post() into User from Person. 2010-08-17 10:35:25 -07:00
Raphael
e32315b6c6 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-17 10:25:11 -07:00
Raphael
2c1c5df281 Moved search specs, renamed method 2010-08-17 10:24:59 -07:00
ilya
fc7f59bdfc DG IZ stream for the current user's posts 2010-08-17 10:13:23 -07:00
danielvincent
7e5ace7cbc minor cleanup in models 2010-08-16 22:44:22 -07:00
ilya
1d92d11841 DG IZ; user refs are incremented as well as decremented for Posts 2010-08-16 20:39:24 -07:00
ilya
74c70d9410 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/models/user.rb
	spec/lib/diaspora_parser_spec.rb
 2010-08-16 18:18:30 -07:00
ilya
b5594ad6bc DG IZ; post user refs started (permissions) 2010-08-16 18:11:23 -07:00
Raphael
eae4053902 Encryption removed from callbacks, except retractions sort of. verification is in user.receive 2010-08-16 17:23:54 -07:00
Raphael
fbee1aabb1 Special casing comments from people that you are not friends with so it accepts them 2010-08-16 16:32:20 -07:00
Raphael
3ff4387cd8 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-16 16:22:55 -07:00
Raphael
ad07521e07 Made a few more tests pass 2010-08-16 16:22:46 -07:00
ilya
b3d8f59c77 removed many posts association within group model 2010-08-16 15:51:31 -07:00
Raphael
3a591b0713 Merging in friend-refactor... 2010-08-16 15:35:14 -07:00
ilya
16a4cbc4e2 DG IZ redirect to requests on error 2010-08-16 15:21:45 -07:00
Raphael
6bb8c52dc4 Syntax error in requests 2010-08-16 15:16:29 -07:00
ilya
7e7b71efd4 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-16 15:08:36 -07:00
ilya
33ed838b79 DG IZ added an error message on request delete 2010-08-16 15:08:05 -07:00
Raphael
2e3066d82d Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-16 15:04:20 -07:00
Raphael
b0537e2f34 Comments pushing in the right directions 2010-08-16 15:04:09 -07:00
ilya
4a36df29e5 DG IZ now the links are of button style 2010-08-16 14:59:23 -07:00
ilya
92aa72447f DG IZ fixed the css in selector 2010-08-16 14:57:30 -07:00
ilya
373321beef DG IZ made the selector box going to the right thing by passing only the id 2010-08-16 14:52:59 -07:00
ilya
97e5468cea adding the user to the correct group 2010-08-16 14:46:15 -07:00
ilya
6a3eb97fd4 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector 2010-08-16 14:43:13 -07:00
ilya
b1c29083df changed the link data-method 2010-08-16 14:34:16 -07:00
Raphael
fa2e621b0f Syntax error 2010-08-16 14:24:30 -07:00
Raphael
e4af2ccb1f Rename send_comment to dispatch_comment, simplify it 2010-08-16 14:22:14 -07:00
Raphael
71aaa9240c only socket if the object isn't yours 2010-08-16 14:18:08 -07:00
Raphael
b463958f0d Check ownership on the comment's post 2010-08-16 14:06:52 -07:00
Raphael
deeb4832c1 Error: insufficient parenthases 2010-08-16 14:02:26 -07:00
Raphael
1f40ea23b6 logging is awesome 2010-08-16 13:58:05 -07:00
Raphael
91b0a1e8f9 PAAAARSER 2010-08-16 13:51:49 -07:00
Raphael
f8e2e6bf2d Infinite loops are the best 2010-08-16 13:49:48 -07:00
Raphael
598c646b07 Hack to get comments working for now 2010-08-16 12:56:02 -07:00
Raphael
e2d5bf909f Call right method in dev_utilities, clear junk out of comments helper 2010-08-16 12:45:31 -07:00
Raphael
1f0ca49ce5 url, not user.url 2010-08-16 12:29:26 -07:00
Raphael
fb8d3b3e85 Check for local person before destroying accepted request 2010-08-16 12:26:15 -07:00
Raphael
d7a9c3c087 Take out another couple friends.first and replace with friend_by_id 2010-08-16 12:18:36 -07:00
Raphael
4f22222b30 Splitting accept_friend_request into two methods 2010-08-16 12:10:23 -07:00
ilya
2bc9d0156d 2 arguments in the hidden field 2010-08-16 11:59:13 -07:00
Raphael
b37b8303d3 Check for friending yourself in requests helper 2010-08-16 11:55:32 -07:00
ilya
9df38199ab Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector 2010-08-16 11:50:51 -07:00
Raphael
00a9bd820b Parser confused :( 2010-08-16 11:50:43 -07:00
ilya
122da43058 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector 2010-08-16 11:50:04 -07:00
Raphael
a8b402636a Shorten ensure_bson 2010-08-16 11:47:23 -07:00
Raphael
f4d6a04f4f Get objects by bson id 2010-08-16 11:46:36 -07:00
ilya
0ee03afe1d DG IZ selector box on request page 2010-08-16 11:39:33 -07:00
Raphael
4c731bf818 special-casing local webfinger 2010-08-16 11:29:14 -07:00
Raphael
6ae4c31e05 Person show should be scoped through user 2010-08-16 11:18:52 -07:00
Raphael
99fb383dc0 BSONify ids in by_id methods 2010-08-16 11:13:00 -07:00
Raphael
eb793ea129 Took out a couple more references to User.owner 2010-08-16 11:07:18 -07:00
Raphael
3efa36587a Took out a bunch of user.owner references 2010-08-16 11:01:58 -07:00
Raphael
26abc68236 Use group_by_id or friend_by_id, no querying on friends or groups 2010-08-16 10:50:38 -07:00
Raphael
0e67ef8d7e Inspect the friend before calling unfriended by 2010-08-16 10:38:36 -07:00
Raphael
ad2d8f8b46 Specify id field in the query whose result is passed to unfriended_by 2010-08-16 10:37:07 -07:00
Raphael
e84b25b3f5 Log the xml again 2010-08-16 10:31:39 -07:00
ilya
053ed9176d Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-16 10:00:25 -07:00
ilya
d0c02859e6 DG IZ got one more log statement in the user person retraction 2010-08-16 10:00:04 -07:00
danielvincent
f1f827120b intentional failing test in user for tomorrow. 2010-08-15 21:03:19 -07:00
danielvincent
80b81c1ae1 comment now validates presence of text. also, removed unused method overriding ==. 2010-08-15 19:28:59 -07:00
danielvincent
18cd4b858a broke out group index and show 2010-08-14 00:27:43 -07:00
danielvincent
c81ea5a632 minor changes 2010-08-14 00:21:10 -07:00
danielvincent
a7eab9e50c minor section header tweaks (album stuff) 2010-08-13 23:20:39 -07:00
ilya
22910ef4ce Check retraction signature on person retraction 2010-08-13 19:09:55 -07:00
ilya
99c8869b8f Removing a friend now deletes them from the group(s) they are in 2010-08-13 18:56:33 -07:00
ilya
ac40f7974e RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend 2010-08-13 18:37:09 -07:00
ilya
bd271b7bec RS, IZ; Refactored the user unfriend and unfriended_by 2010-08-13 17:33:26 -07:00
ilya
c1d2f271d9 RS, IZ; close the file after writing the backer number 2010-08-13 12:43:27 -07:00
ilya
7e377fc292 RS, IZ; adding set backer number to routes, not authenticating it 2010-08-13 12:37:49 -07:00
ilya
23c57c653f RS, IZ; Trying to speed up cap db reset 2010-08-13 12:34:24 -07:00
ilya
5c9a96d245 That last commit was dumb, including the right module 2010-08-13 12:11:10 -07:00
ilya
0b23b959b4 Adding parser methods to devutilities, these should probably be in controller helpers 2010-08-13 12:06:29 -07:00
ilya
99eec04265 Using webfinger in dev_utilities 2010-08-13 11:59:54 -07:00
ilya
339f1a65e2 Removing friends check on zombiefriends 2010-08-13 11:50:43 -07:00
ilya
085dd61607 RS, IZ; changed zombiefriends to use webfinger 2010-08-13 11:43:30 -07:00
ilya
ef97b4f19d RS, IZ; updated DB seed to have a group, zombiefriend with a group 2010-08-13 11:36:59 -07:00
ilya
7bd1193c5e RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions 2010-08-13 11:19:20 -07:00
ilya
1fcb033b68 RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass 2010-08-13 10:55:18 -07:00
ilya
23fc799b4d Turning up logging on friend request receive 2010-08-13 10:04:33 -07:00
ilya
af6c70db47 RS, IZ; hack to test requests, accepted friends go into the first group. 2010-08-13 09:56:18 -07:00
ilya
3d57fb7f78 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-13 09:47:29 -07:00
ilya
5e33de7e56 unfriended method in the user 2010-08-13 09:47:08 -07:00
danielvincent
64c7a87aeb removed two bogus lines from user.receive 2010-08-13 08:57:22 -07:00
danielvincent
3d12e9ab51 DG RS; friending through groups 2010-08-12 21:30:16 -07:00
ilya
26bebbe393 MS IZ changing it back 2010-08-12 10:04:56 -07:00
ilya
9bec1131f6 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-12 10:03:51 -07:00
danielvincent
f7e43ee3d0 photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now... 2010-08-12 00:27:26 -07:00
danielvincent
013a6d0849 add photo is now in a fancy-pancy box 2010-08-11 20:45:57 -07:00
ilya
352b9f65e0 MS IZ unfriending maybe works 2010-08-11 20:23:28 -07:00
danielvincent
97b04fc0d7 nevermind 2010-08-11 20:12:10 -07:00
danielvincent
3e1081acaa commented out tinyMCE js for the time being 2010-08-11 20:09:16 -07:00
Raphael
8b51f94d1d Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 18:13:38 -07:00
Raphael
eb36190188 DG, RS; Albums create failure prettier 2010-08-11 18:13:23 -07:00
ilya
283b4a40b5 IZ MS tests now pass 2010-08-11 17:51:46 -07:00
ilya
b0455b9532 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 17:45:13 -07:00
ilya
dd3fb1677b MS IZ continuiung to squash failing tests 2010-08-11 17:44:43 -07:00
Raphael
a19e29f2c2 RS, DG; Album.mine_or_friends actually fixed 2010-08-11 17:33:37 -07:00
Raphael
144d673dac DG, RS; album button looks better 2010-08-11 17:16:20 -07:00
Raphael
3d46a49b97 RS, DG; fixing Album.mine_or_friends 2010-08-11 16:50:22 -07:00
Raphael
cf5476f601 RS, DG; stop crashing trying to socket albums 2010-08-11 16:40:08 -07:00
Raphael
ab25e35a71 Comment guids now serialize 2010-08-11 16:31:12 -07:00
Raphael
d8959326d5 RS, DG; unsocketing is back in 2010-08-11 16:24:05 -07:00
Raphael
4b5071ec05 DG, RS; socketing back in for your own posts 2010-08-11 16:12:55 -07:00
Raphael
2d14f64745 RS, DG; Socketing moved to user 2010-08-11 16:10:27 -07:00
Raphael
0907d7a9fd RS, DG; Cleaned up the switch in user.receive 2010-08-11 16:01:16 -07:00
Raphael
bee71c5a23 RS, DG; All saving moved to user 2010-08-11 15:22:06 -07:00
Raphael
c6a620c7dd RS, DG; store_from_xml is gone, use user.receive 2010-08-11 15:05:05 -07:00
Raphael
5228e51262 RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated. 2010-08-11 14:40:48 -07:00
Raphael
5abd604dad RS, DG; build_xml_for has been eliminated. 2010-08-11 14:21:53 -07:00
Raphael
d7828a8bf3 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 
Conflicts:
	spec/controllers/publics_controller_spec.rb
 2010-08-11 13:59:21 -07:00
Raphael
9c9ebbf4c7 build_xml_for is no longer static, we should probably change the name 2010-08-11 13:58:18 -07:00
ilya
29b1217fcd Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-11 12:29:35 -07:00
ilya
11a8b8f3d4 MS IZ testing many the friend request user methods 2010-08-11 12:28:48 -07:00
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -07:00
Raphael
144e9ed439 Bookmarks now clean link in instantiate, posting them should work right again 2010-08-11 11:18:40 -07:00
Raphael
683bb0dbef Took out create redirects on ajaxy things, authenticating statusmessages 2010-08-11 10:52:01 -07:00
Raphael
355aba75df RS, DG; removing the last link_to_person 2010-08-11 10:02:45 -07:00
Raphael
f73c5c6a05 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 18:08:37 -07:00
Raphael
cc070ba168 RS, DG; Removed fancybox gone mad from photo adder 2010-08-10 18:08:27 -07:00
Raphael
a201390123 DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken 2010-08-10 17:59:22 -07:00
maxwell
1683370da5 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 17:36:54 -07:00
maxwell
a45d852f30 MS IZ request specs now PASS 2010-08-10 17:36:25 -07:00
Raphael
bd7ce5250f renamed the route for signup. also, removed the link from the login page: get_to_the_choppa 2010-08-10 17:14:58 -07:00
Raphael
4b102de1db Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:56:42 -07:00
Raphael
37bf5b45f1 RS, DG; You now can't open the photo upload form while photos are uploading 2010-08-10 16:56:19 -07:00
Raphael
3104eeebc9 RS, DG; Photo websocket margins fixed 2010-08-10 16:40:25 -07:00
maxwell
b9718c079b Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:05:10 -07:00
maxwell
8a3eb9f6cf IZ MS one last receive url...i think... 2010-08-10 16:04:08 -07:00
Raphael
a9ebe44b1d Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 16:03:54 -07:00
Raphael
0fb55be7a0 RS, DG; You can now sign up to be a user on a seed 2010-08-10 16:03:38 -07:00
maxwell
89c54d1a63 MS IZ receive url in the request and a slash in person 2010-08-10 15:56:34 -07:00
Raphael
8b9cd3453d RS, DG; User.instatntiate simplified 2010-08-10 15:44:14 -07:00
maxwell
432ce02a14 MS IZ receive url is better 2010-08-10 15:35:40 -07:00
Raphael
a8b77cf868 DG RS; made an instantiate method for user which makes a person and profile 2010-08-10 15:35:27 -07:00
maxwell
da4de20ce1 IZ MS made things push to the receive url 2010-08-10 15:24:51 -07:00
maxwell
487de2d865 MS IZ receive, not recieve 2010-08-10 15:17:12 -07:00
maxwell
7ff25ef81a MS IZ saved the person model 2010-08-10 15:10:11 -07:00
maxwell
016c8fa471 MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up 2010-08-10 14:11:41 -07:00
maxwell
b5f962c725 trying root path in host meta 2010-08-10 13:58:17 -07:00
maxwell
0ffe893f8a MS IZ merging diffs 2010-08-10 12:37:04 -07:00
maxwell
71612ba33d changing some webfinger resources 2010-08-10 12:36:00 -07:00
Raphael
aa1f892c35 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-10 12:27:02 -07:00
Raphael
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
Raphael
a48fbaaf59 RS, DG; DashboardsController has been eliminated. 2010-08-10 11:36:00 -07:00
maxwell
95c4de5d6c MS IZ fixed all of the request specs zomg 2010-08-10 11:26:32 -07:00
Raphael
b645eb3f3d RS, DG, comments socket again 2010-08-10 11:05:29 -07:00
Raphael
aa4d428ab7 RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in => 2010-08-10 11:02:04 -07:00
Raphael
4308f35b4b Changed partial on request index 2010-08-10 10:18:16 -07:00
Raphael
d1bedeb993 RS, DG; don't show the group-specific nav if there is no group 2010-08-10 10:11:13 -07:00
maxwell
d7d9c8aac5 MS put some current users checks into a single one 2010-08-09 21:30:56 -07:00
danielvincent
4e062c143b new album partial has a title. album title is in italics in new photo partial 2010-08-09 21:29:19 -07:00
danielvincent
d207c8b955 fixed way too high z-index in album div 2010-08-09 21:27:17 -07:00
danielvincent
988eea4215 fixed comment view bug 2010-08-09 21:21:35 -07:00
danielvincent
36adf1b6fd Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 21:10:31 -07:00
maxwell
9d41ed3ef1 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 21:10:14 -07:00
danielvincent
96fa34ea60 changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error. 2010-08-09 21:10:11 -07:00
maxwell
38abd51666 MS IZ fixed a couple of failing specs in the parser 2010-08-09 21:09:51 -07:00
danielvincent
fd8d92a095 moved next/prev links in photo show to be inline with full size link. 2010-08-09 20:23:01 -07:00
danielvincent
d712218a14 removed commented out stuff on photo_new partial. also, fixed the delete button in photo show. 2010-08-09 20:18:20 -07:00
danielvincent
acd00c2a59 fixed top right buttons on album page, etc. also, made the image loader simpler. 2010-08-09 20:14:03 -07:00
maxwell
68c4de6c16 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 19:05:12 -07:00
Raphael
91b42ac0e2 Specs now mostly pass again, one is failing 2010-08-09 18:06:09 -07:00
Raphael
744693e7fb RS, DG; There is now a add friend box on the front page that passes group idto the app 2010-08-09 17:33:54 -07:00
maxwell
d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 
Conflicts:
	app/controllers/publics_controller.rb
	app/models/user.rb
 2010-08-09 17:31:46 -07:00
maxwell
56d7c67bbb Going toward pending requests 2010-08-09 17:21:41 -07:00
Raphael
838fec4921 RS, DG; Working on group nav, fixed some stuff in photo 2010-08-09 16:34:06 -07:00
Raphael
02f66d4c0e Merge branch 'group-top' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 15:59:23 -07:00
Raphael
aebe7b97c0 DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
Raphael
d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top 
Conflicts:
	app/views/albums/show.html.haml
	app/views/authors/show.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
 2010-08-09 15:09:05 -07:00
Raphael
039ec0d06e warzombie is now more friendly 2010-08-09 15:05:54 -07:00
Raphael
c14bb5a4f8 Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
Raphael
59147eb232 Person.new in dev seed 2010-08-09 13:03:27 -07:00
Raphael
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00
maxwell
82578ad80c MS IZ doing the friend querying correctly in user 2010-08-09 12:25:36 -07:00
maxwell
4243d8efca MS IZ using the particular user's friends in the send_friend_request_to 2010-08-09 12:19:26 -07:00
maxwell
ac7530d17f MS IZ person doesn't have friends user does 2010-08-09 11:51:32 -07:00
maxwell
f4428679ef First attempt at fixing warzombie friendingw 2010-08-09 11:44:13 -07:00
maxwell
921ee029b6 MS IZ putting the person in the return trip 2010-08-09 11:12:15 -07:00
maxwell
8532be1307 MS IZ moved activate_friend to user 2010-08-09 11:03:16 -07:00
maxwell
67843a21e2 MS IZ saving the person in accept of FR 2010-08-09 10:50:49 -07:00
Raphael
0a40efdaf7 Removing unused messages 2010-08-09 10:47:45 -07:00
Raphael
73a6cd911b DG, RS; User person delegation fixed 2010-08-09 10:46:02 -07:00
maxwell
544f7f08e5 MS IZ doesn't delete from pending friends since there is nothing in it 2010-08-09 10:38:13 -07:00
maxwell
7be374ac48 MS IZ fixed a couple of view things as well as the dev db seed script 2010-08-09 10:10:41 -07:00
ilya
890f927492 removed references of mine? method in all views 2010-08-08 22:53:23 -07:00
ilya
719bf450e1 I can't get no satisfaction from get satisfaction 2010-08-08 20:54:50 -07:00
ilya
8e6dfe7166 DG IZ having an email key makes devise work, ring to deploy 2010-08-08 17:00:39 -07:00
danielvincent
a6f5603dc9 added email field to login screen. strange error won't let me log in? 2010-08-06 23:55:05 -07:00
maxwell
f4ca29da41 PeopleController now renders json when given a query. Unfortunately, it only renders the matching friend ids without first or last names... 2010-08-06 17:19:33 -07:00
Raphael
214685e5a9 Dev seed might now work 2010-08-06 17:11:50 -07:00
Raphael
7076097ee4 RS, IZ; The tests are green. 2010-08-06 16:56:13 -07:00
maxwell
58de12df5e DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name) 2010-08-06 16:35:02 -07:00
Raphael
4350e17656 RS, IZ; removed lots of putses, fixed up request, parser, retractions 2010-08-06 16:01:39 -07:00
Raphael
f2e327d908 User factory now works 2010-08-06 13:27:42 -07:00
Raphael
0f596af5c4 Refactored message_queue getting, fixed retraction spec 2010-08-06 13:13:00 -07:00
Raphael
d130b82e42 RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns? 2010-08-06 11:52:33 -07:00
danielvincent
6f1a596dff small color changes 2010-08-06 00:40:44 -07:00
danielvincent
c54d47337b updated button style 2010-08-06 00:15:22 -07:00
Raphael
b5cbfab36e RS, IZ; Comment spec now passes 2010-08-05 19:01:45 -07:00
maxwell
5d924dadf4 MS DG; 19 failing specs left 2010-08-05 17:16:51 -07:00
maxwell
dc0eb7de51 Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-05 15:13:59 -07:00
maxwell
5e6d0c1153 Merge branch 'master' of github.com:diaspora/diaspora_rails into 
friend-refactor, also fixed more specs

Conflicts:
	app/models/person.rb
	app/models/user.rb
	spec/factories.rb
 2010-08-05 15:13:05 -07:00
Raphael
bffb63d9f0 IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml 2010-08-05 14:39:48 -07:00
danielvincent
dae8f26692 DG MS; fixed most photo specs 2010-08-05 11:56:37 -07:00
Raphael
bb66e87905 RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00
Raphael
f8e7d3f313 RS, IZ; Rolling back special casing of friend-request 2010-08-05 11:14:40 -07:00
Raphael
2429a1a476 RS, IZ; keys should roxml 2010-08-05 11:13:38 -07:00
Raphael
ebe14b5afd RS, IZ; Not using person in friend request verification 2010-08-05 11:09:36 -07:00
Raphael
f487e271c0 RS, IZ; Posts now sign, signatures and keys now serialize 2010-08-05 10:43:02 -07:00
danielvincent
4827953bec DG MS; person specs are now passing. retraction on unfriend is now uncommented 2010-08-05 10:29:30 -07:00
danielvincent
42c0b82068 one failing test in Person. i have no idea. 2010-08-04 23:54:15 -07:00
danielvincent
d6bc93fb96 commented out retraction on unfriending due to ROXML messing things up 
.
 2010-08-04 23:47:27 -07:00
ilya
4a3f6b2986 need to serialize key to bson 2010-08-04 21:08:25 -07:00
ilya
f11e973602 added the inport key thing in user 2010-08-04 20:44:18 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
danielvincent
f2d7f35b84 unfriend still not removing association from bad_friend 2010-08-04 20:29:54 -07:00
danielvincent
7a556e1b3c Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-04 19:23:56 -07:00
danielvincent
c92a225556 DG MS; user-person relationship done. bunch of failing stuff. 2010-08-04 19:22:14 -07:00
Raphael
6832c67a78 RS IZ friend requests are hopefully now signed 2010-08-04 17:20:34 -07:00
Raphael
7676179e54 IZ, RS; now passing correct object to verify_signature 2010-08-04 17:10:38 -07:00
Raphael
5a802299d5 IZ, RS; Retractions should now be signed 2010-08-04 17:06:15 -07:00
Raphael
2388237174 RS, IZ; Replace type_name method with object.class.to_s 2010-08-04 16:36:08 -07:00
Raphael
b8a2e8ecdf RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific 2010-08-04 16:13:32 -07:00
Raphael
e2c0ae2cee Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00
Raphael
c245d8c60c Merging ostatus deletion with selenium start 2010-08-04 16:01:19 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
09958bc207 DG MS; removed delete friend button from current user's show page 2010-08-04 15:43:24 -07:00
danielvincent
278189462b fixed ostatus generator references in models 2010-08-04 09:59:15 -07:00
danielvincent
c5ace3069d diaspora module correctly loads everything (lazy) 2010-08-04 00:41:23 -07:00
danielvincent
c78b111fec Merge branch 'master' into group-top 2010-08-03 16:42:33 -07:00
Raphael
e3c28c4fee Fixed Photos, and Carrierwave initializer 2010-08-02 21:31:14 -07:00
Raphael
da3bf35d81 Typo in album 2010-08-02 18:30:09 -07:00
Raphael
6b1f020839 Moved utilities out to special controller, took pound sign out of database name 2010-08-02 18:03:16 -07:00
danielvincent
5030fbb8b5 Merge branch 'master' into group-top 2010-08-02 17:28:17 -07:00
danielvincent
3d5f27fe5a javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing 2010-08-02 17:27:45 -07:00
Raphael
74691228d3 RS, IZ; All relevant controllers now create with user.post 2010-08-02 16:32:52 -07:00
danielvincent
102b912878 moved group nav to its own partial 2010-08-02 16:20:30 -07:00
Raphael
9fe37b1d8c RS, IZ; Cleaned up user spec, started to add current_user.post 2010-08-02 16:16:23 -07:00
danielvincent
3e5cecd532 Merge branch 'master' into group-top 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-08-02 16:09:13 -07:00
Raphael
d503c6541f RS; posted statuses now use the websocket to update latest, time is now styled right 2010-08-02 11:13:21 -07:00
Raphael
b8ae6b44a2 RS; Image filename is now the Photo model id 2010-08-02 10:05:34 -07:00
danielvincent
5974bf3571 group nav is now links to nothing 2010-08-01 23:26:24 -07:00
danielvincent
19b633d3a3 top nav for groups partially there. 2010-08-01 22:26:56 -07:00
Raphael
c95ceecf9e Clarified socket helper, added a selenium test 2010-07-30 12:40:02 -07:00
Raphael
6fe00982f2 RS, IZ, fixing another error on person show 2010-07-30 10:32:36 -07:00
Raphael
0fd35709b1 RS, IZ, fixing error on person show with no posts 2010-07-30 10:26:00 -07:00
Raphael
e7ef3c06ed Websocketed photos now fade in 2010-07-30 10:20:50 -07:00
ilya
3eeb81ad34 DG IZ; time_created_at uses published_at instead of created_at for OstatusPost 2010-07-29 20:43:03 -07:00
ilya
f191aef981 DG IZ profile profile photos should update, removed the scaled down hack 2010-07-29 19:44:58 -07:00
ilya
abc5ee412d DG IZ assiging the new profile to the person in the parse objects from xml 2010-07-29 19:24:52 -07:00
ilya
0aa268a62d DG IZ trying asymetric searization and marshaling 2010-07-29 19:12:20 -07:00
ilya
27bf29119d restoring display inline 2010-07-29 18:03:18 -07:00
ilya
085ea0a665 RS, IZ, DG Removing display inline 2010-07-29 17:59:44 -07:00
ilya
f6495e2bec RS IZ photos now fade in on the album upload page 2010-07-29 17:26:05 -07:00
maxwell
6aa1fa1826 DG MS profiles send? who knows... 2010-07-29 15:53:38 -07:00
Raphael
a636d97837 Removed crash if there was no latest status message 2010-07-29 14:38:46 -07:00
Raphael
3376057c33 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 13:58:49 -07:00
danielvincent
11a099914c on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited. 2010-07-29 11:07:44 -07:00
danielvincent
fd4475370d added profile url to author show page 2010-07-29 10:30:24 -07:00
maxwell
cb3d6db9b0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 10:06:11 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
ilya
c8b40001e5 IZ album edit page was not added 2010-07-28 21:10:35 -07:00
Raphael
1e954eae4f took out old puts, put in new one 2010-07-28 20:37:42 -07:00
maxwell
6a8291b56f Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 18:35:06 -07:00
maxwell
049361ea15 MS profiles should send, need to just make the parser now 2010-07-28 18:32:00 -07:00
ilya
96a9c9455d DG IZ; make photos in stream larger, because they need love too 2010-07-28 17:46:43 -07:00
ilya
6f3e7bc78b DG IZ; minor tweaks 2010-07-28 17:31:05 -07:00
ilya
acb295d695 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 17:05:14 -07:00
ilya
03cf61bd7c new user top bar 2010-07-28 17:04:56 -07:00
maxwell
e14e391a22 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 16:50:48 -07:00
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -07:00
ilya
1700ce8e18 DG IZ; tweaks to album index page 2010-07-28 16:12:49 -07:00
ilya
3f27e1f67d DG IZ photo spacing now works 2010-07-28 14:48:28 -07:00
ilya
5723d91dae DG IZ; moved some buttons around, added album edit page 2010-07-28 14:00:02 -07:00
ilya
9e3c6a0936 DG IZ; brushed up ostatus user page 2010-07-28 12:13:36 -07:00
maxwell
eb4262dfc7 MS merged master 2010-07-28 11:13:17 -07:00
danielvincent
e2b5af35c1 minute changes 2010-07-28 00:04:43 -07:00
maxwell
a57727c1fc Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 16:18:59 -07:00
maxwell
c41dea1e8b MS small profile tweaks 2010-07-27 16:18:46 -07:00
danielvincent
7992b1b0e0 delete photo button on photo show page instead of delete album. 2010-07-27 16:10:42 -07:00
danielvincent
fdd1a5d93b more recovery 2010-07-27 16:04:59 -07:00
maxwell
92cc48beaf Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 15:52:50 -07:00
maxwell
3cecbf1511 MS profile page fixes 2010-07-27 15:52:42 -07:00
danielvincent
34291340b2 trying to get back up to speed 2010-07-27 15:50:44 -07:00
maxwell
9dd5c08296 fixed two small UI bugs 2010-07-27 14:45:04 -07:00
maxwell
86e090bac3 MS figured out moz gradient business 2010-07-27 14:34:16 -07:00