danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
danielvincent
|
df800dc87e
|
ostatus builder
|
2010-09-27 17:58:44 -07:00 |
|
ilya
|
cf0df90dae
|
moved the private key into user where it belongs, two failing cucumber tests
|
2010-09-26 22:08:42 -07:00 |
|
Dorian
|
6ffc03a4c9
|
Big clean up: delete trailing whitespace
|
2010-09-26 12:48:40 -04:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Raphael
|
70a22ae839
|
Merge branch 'master' into HEAD
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
|
2010-09-24 09:15:10 -07:00 |
|
root
|
03f8cbc249
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-21 16:59:26 -04:00 |
|
Thomas Krehbiel
|
bdd752f07b
|
Fix for 'Local variable hides method'
|
2010-09-20 21:49:14 -04:00 |
|
maxwell
|
2be0cca2cd
|
MS adding downcase to webfinger lookup
|
2010-09-20 16:51:02 -07:00 |
|
danielvincent
|
fb2f027b24
|
DG IZ; escape regex characters in Person.search
|
2010-09-20 15:25:19 -07:00 |
|
maxwell
|
5d1fdcaf3a
|
MS fixing bug #67. stripping whitespace from search
|
2010-09-20 11:38:24 -07:00 |
|
maxwell
|
5bf6d358a4
|
MS added small log for when user is found from webfinger
|
2010-09-19 20:40:03 -07:00 |
|
maxwell
|
07d2de6646
|
removed an annoying log of encrypted salmon.
|
2010-09-19 20:36:39 -07:00 |
|
danielvincent
|
08f833ba7a
|
case insensitivity on search
|
2010-09-18 17:21:18 -07:00 |
|
danielvincent
|
e9a3f46fbd
|
fixed query function to go through mongomapper instead of custom
|
2010-09-18 16:42:07 -07:00 |
|
Raphael
|
b3549c79f4
|
Give slightly more specific error message
|
2010-09-17 12:49:49 -07:00 |
|
Raphael
|
99ad001d28
|
Fix websocket spec, take out puts in by_webfinger
|
2010-09-17 09:52:31 -07:00 |
|
maxwell
|
e668071ea5
|
README.md
|
2010-09-16 18:48:18 -07:00 |
|
Raphael
|
32fc6212ab
|
Put only the hostname in diaspora_handle
|
2010-09-15 23:49:55 -07:00 |
|
Michael Fellinger
|
35c9922c61
|
And fix some more requires
|
2010-09-16 15:24:26 +09: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 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -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 |
|
ilya
|
2311c33626
|
MS IZ mocked all the webrequest tests
|
2010-09-14 11:13:58 -07:00 |
|
Daniel Vincent Grippi
|
84b29770fe
|
Put raise back in webfinger fail
|
2010-09-13 16:05:43 -07:00 |
|
Daniel Vincent Grippi
|
40ecf176e8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 14:26:15 -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
|
b05d106aed
|
Remove user_refs from Person, put pendings in the broken photo specs
|
2010-09-13 12:16:43 -07:00 |
|
Raphael
|
c73ce3ff99
|
RS IZ added a logger statement and a guid in the webfinger profile
|
2010-09-09 16:20:27 -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
|
fd61535e11
|
Hcards working
|
2010-09-09 15:43:16 -07:00 |
|
Raphael
|
67f9d9dab5
|
Add hcard, add id for pod_location
|
2010-09-09 15:34:20 -07:00 |
|
Raphael
|
59006e657f
|
Hcard done manually
|
2010-09-09 15:15:37 -07:00 |
|
Raphael
|
c6aff4a562
|
making the hcard work
|
2010-09-09 13:02:59 -07:00 |
|
Raphael
|
4fd0853e71
|
Moving to salmon
|
2010-09-08 18:29:39 -07:00 |
|
Daniel Vincent Grippi
|
5e34506df6
|
added custom as_json methods to models
|
2010-08-29 23:46:19 -07:00 |
|
Daniel Grippi
|
de8450c7c5
|
line spacing adjustments.
|
2010-08-29 23:04:28 -07:00 |
|
Raphael
|
c629c23232
|
Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document
|
2010-08-27 10:05:14 -07:00 |
|
Raphael
|
2dd2f38442
|
Attempting to make comments from unknown users save
|
2010-08-26 19:15:22 -07:00 |
|
maxwell
|
a37b5ae09b
|
IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method
|
2010-08-23 18:45:20 -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
|
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
|
36f8289522
|
Fixing retractions on albums, adding back remove_from_view
|
2010-08-18 10:03:37 -07:00 |
|