Commit graph

294 commits

Author SHA1 Message Date
Michael Fellinger
c6f5b4ed16 Basic 1.9.2 port 2010-09-16 14:41:33 +09:00
Stephen Caudill
5595dc5f48 Retab the project 2010-09-16 13:16:10 +08:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
e9009ea609 Downcase username only if it is there 2010-09-15 18:23:54 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
0e0df7fb22 downcase before validation 2010-09-15 17:21:23 -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
Daniel Vincent Grippi
ee89bfaf8f removed do bad things 2010-09-15 16:18:33 -07:00
maxwell
b8bbc58d30 save person after changing handle 2010-09-15 16:02:23 -07:00
maxwell
77bd68e7c7 MS the deploy config is wrong 2010-09-15 15:55:26 -07:00
maxwell
6e29a66e09 Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	app/models/user.rb
2010-09-15 15:46:15 -07:00
maxwell
3a4eb294f8 MS made it two callbacks for handles and keys 2010-09-15 15:45:26 -07:00
Daniel Vincent Grippi
b2b2748fea seed aspects on user create 2010-09-15 15:39:04 -07:00
maxwell
7741951a42 MS removing production stuff from master... yowch 2010-09-15 15:26:06 -07:00
maxwell
8828707c45 MS fixed the login bug, deploying to master 2010-09-15 15:15:15 -07:00
maxwell
b68ec3a5b8 MS DG setting diaspora handle in a unclean way 2010-09-15 13:53:36 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
f256d433fd nevermind 2010-09-14 19:34:26 -07:00
Daniel Vincent Grippi
02e1ed82a3 making profiles socket 2010-09-14 19:07:23 -07:00
maxwell
6f75a81a9d IZ MS trying again on fixing remote profile images 2010-09-13 15:48:30 -07:00
Raphael
34a4804b9f Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:49:01 -07:00
Raphael
fd31e9aeeb Force downcase on usernames 2010-09-13 14:48:55 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Daniel Vincent Grippi
4bf8bc9c0b wrong key being sent in recieve method for posts (group_id => group_ids) 2010-09-12 22:17:39 -07:00
Daniel Vincent Grippi
945a6ffbeb added a logger in post 2010-09-12 22:11:01 -07:00
Daniel Vincent Grippi
31a746db2f group_ids to string in post 2010-09-12 22:05:07 -07:00
Daniel Vincent Grippi
cf48079446 group_ids must be converted to strings 2010-09-12 21:47:03 -07:00
Daniel Vincent Grippi
1874ebe51d forgot to map to group ids in retraction 2010-09-12 21:33:39 -07:00
Daniel Vincent Grippi
62994f1660 retractions should now actually websocket again 2010-09-12 21:24:22 -07:00
maxwell
08233a74c5 MS added anohter logger so i can debug friend requests 2010-09-11 14:39:09 -07:00
Raphael
ab6d631a27 White space in user file, deleting net/curl as unused 2010-09-10 16:25:19 -07:00
Raphael
a44d40168a Encryption removed from everything other than comments, most irrelevant specs removed 2010-09-10 16:04:09 -07:00
Raphael
cab8610bea Actually use salmon to push comments 2010-09-10 10:38:16 -07:00
Raphael
aa1f3c6438 Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file 2010-09-10 10:31:23 -07:00
Raphael
7448684358 Return results of queries 2010-09-09 17:56:21 -07:00
Raphael
222847ca92 Using methods that exist can be helpful 2010-09-09 17:54:33 -07:00
Raphael
e9377a681c Don't use push_to_groups for retractions 2010-09-09 17:52:35 -07:00
Raphael
2b1724c42f Pass id to groups_with_post 2010-09-09 17:44:33 -07:00
Raphael
87bef90932 Salmon for retractions and profiles 2010-09-09 17:28:32 -07:00
Raphael
6b4501c342 Move generate key back into user 2010-09-09 16:23:08 -07:00
Raphael
522450c9d3 RS IZ added a logger statement and a guid in the webfinger profile 2010-09-09 16:19:34 -07:00
Raphael
240dda4eab Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished 2010-09-09 12:21:36 -07:00
Raphael
4fd0853e71 Moving to salmon 2010-09-08 18:29:39 -07:00
Daniel Vincent Grippi
f7dd0b10b9 DG MS; changed the gear on top nav to not be a tab 2010-09-08 12:34:08 -07:00
Daniel Vincent Grippi
edae8f1e66 DG MS; fixed a view bug in user edit page. page also displays diaspora username . 2010-09-08 11:58:03 -07:00