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 |
|