maxwell
|
0343e7a226
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-03 00:10:11 -07:00 |
|
maxwell
|
545577a950
|
em-webfinger ssl should work
|
2010-11-02 19:16:08 -07:00 |
|
Raphael
|
d5a4de58b3
|
User#post is now like a future controller, Photo#instantiate no longer saves
|
2010-11-02 19:16:02 -07:00 |
|
Raphael
|
1c67211ebc
|
Move post dispatching to dispatch_post
|
2010-11-02 19:16:02 -07:00 |
|
maxwell
|
d482334ca2
|
Revert "Revert "IZ MS webfinger now trys ssl first, then http""
This reverts commit 153265aae8.
|
2010-11-02 18:59:18 -07:00 |
|
maxwell
|
0ecc27a935
|
MS IZ posts should now update
|
2010-11-02 18:56:00 -07:00 |
|
maxwell
|
4de89df4dc
|
MS IZ setting the diaspora handle in photo instantiate
|
2010-11-02 18:32:02 -07:00 |
|
Raphael
|
ab4e3a9f7f
|
add a couple specs to album_spec
|
2010-11-02 18:16:14 -07:00 |
|
danielvincent
|
bf12dc6bc7
|
fix spec
|
2010-11-02 17:44:13 -07:00 |
|
maxwell
|
153265aae8
|
Revert "IZ MS webfinger now trys ssl first, then http"
This reverts commit af3247b62f.
|
2010-11-02 17:37:45 -07:00 |
|
Raphael
|
5cdeed6c54
|
Add a spec to people_controller, make those specs a little clearer
|
2010-11-02 17:10:19 -07:00 |
|
Raphael
|
ccd92fb850
|
make requests controller spec a little clearer
|
2010-11-02 16:55:23 -07:00 |
|
maxwell
|
1951df8d9c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 16:49:54 -07:00 |
|
maxwell
|
3baa8b4552
|
IZ MS two pending photo specs now pass
|
2010-11-02 16:49:40 -07:00 |
|
danielvincent
|
e9f3efea79
|
person searchable by diaspora_handle
|
2010-11-02 16:48:58 -07:00 |
|
maxwell
|
8c89f8d87a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 16:42:52 -07:00 |
|
Raphael
|
20d5daafbc
|
Two pending specs on photo serialization for Max and Ilya
|
2010-11-02 16:41:53 -07:00 |
|
Raphael
|
15ecc22130
|
Unpending user spec
|
2010-11-02 16:41:31 -07:00 |
|
Raphael
|
2c903ea519
|
check that User#build does not save a Person
|
2010-11-02 16:28:55 -07:00 |
|
danielvincent
|
da8124f8a7
|
hcard has searchable field, and is taken in to account when building Person from webfinger
|
2010-11-02 16:12:43 -07:00 |
|
danielvincent
|
fff43bf650
|
profile defaults key searchable to true. search takes searchable into account.
|
2010-11-02 16:12:42 -07:00 |
|
maxwell
|
34f190ce75
|
MS IZ added a check for person in webfinger response in receive_salmon method
|
2010-11-02 16:10:17 -07:00 |
|
maxwell
|
af3247b62f
|
IZ MS webfinger now trys ssl first, then http
|
2010-11-02 15:49:41 -07:00 |
|
maxwell
|
449a6f3ea0
|
MS IZ removed a refrence to REDFINGER
|
2010-11-02 15:14:40 -07:00 |
|
maxwell
|
4332174525
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 13:58:36 -07:00 |
|
maxwell
|
3251b8ba2e
|
MS IZ fixed a hole where another user could update another friends post
|
2010-11-02 13:58:27 -07:00 |
|
Sarah Mei
|
cd7bdf6758
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 13:37:40 -07:00 |
|
Sarah Mei
|
fad9c09212
|
refactor aspect-edit.js in prep for jasmine testing
|
2010-11-02 13:37:27 -07:00 |
|
maxwell
|
c3d0c78bd1
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
lib/diaspora/user/receiving.rb
|
2010-11-02 12:46:08 -07:00 |
|
maxwell
|
19bbf8ce4d
|
IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive
|
2010-11-02 12:38:30 -07:00 |
|
Raphael
|
a9b429d163
|
Merge remote branch 'ed0h/helper-method-for-markdown'
|
2010-11-02 12:14:41 -07:00 |
|
Raphael
|
ff21c827e4
|
Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'"
This reverts commit 2b128d88ec, reversing
changes made to 8778bdab3b.
|
2010-11-02 12:14:12 -07:00 |
|
Raphael
|
2b128d88ec
|
Merge remote branch 'ed0h/336-markdown-for-status-messages'
Conflicts:
pkg/ubuntu/dist
|
2010-11-02 11:45:16 -07:00 |
|
Raphael
|
bbd8cadc14
|
Retaining specs and line from robustdj's patch
|
2010-11-02 11:27:51 -07:00 |
|
danielvincent
|
a3ce5f1cd7
|
REMOVED IMPORTER
|
2010-11-02 11:17:47 -07:00 |
|
Raphael
|
0b8425cbde
|
user.aspect is gone
|
2010-11-02 11:02:08 -07:00 |
|
Raphael
|
c031416ca8
|
Merge branch 'master' into HEAD
Conflicts:
lib/diaspora/user/receiving.rb
pkg/ubuntu/dist
|
2010-11-02 10:54:37 -07:00 |
|
Sarah Mei
|
dc97c852f4
|
Person delegates first_name and last_name to profile.
|
2010-11-01 22:22:15 -07:00 |
|
livefromthemoon@gmail.com
|
aab74cf1ff
|
Added markdown support for status messages
|
2010-11-02 03:55:14 +01:00 |
|
maxwell
|
15d6cff837
|
MS IZ everything now uses diaspora handle. this feels so good
|
2010-11-01 18:42:42 -07:00 |
|
maxwell
|
3c8b40c427
|
IZ MS retractions now use diaspora handle
|
2010-11-01 17:11:06 -07:00 |
|
maxwell
|
06445901f8
|
IZ MS retrations for posts now green
|
2010-11-01 17:11:06 -07:00 |
|
maxwell
|
ccf897ed62
|
IZ MS; fixing parser spec
|
2010-11-01 14:56:31 -07:00 |
|
maxwell
|
922aa85fb7
|
MS IZ refactor green
|
2010-11-01 14:54:40 -07:00 |
|
danielvincent
|
f6b4be97a3
|
requests are almost there
|
2010-11-01 14:54:40 -07:00 |
|
Raphael
|
9d273c6d24
|
Now expecting a 500 on someone passing an id to create, should really be a 422
|
2010-11-01 12:31:00 -07:00 |
|
Raphael
|
488df6eaa0
|
RS IZ a good test to overwrite ids
|
2010-11-01 11:35:37 -07:00 |
|
Raphael
|
6c0b187d40
|
Merge remote branch 'jwinky/446-user-name-length-limit'
Conflicts:
app/models/user.rb
|
2010-11-01 11:00:02 -07:00 |
|
Raphael
|
7f7697c11d
|
Merge remote branch 'traction/441-failed-aspect-creation-redirect'
|
2010-10-31 23:22:10 -07:00 |
|
Sarah Mei
|
ce213513eb
|
PeopleController#update handles getting an empty string for :image
|
2010-10-31 17:49:47 -07:00 |
|