Sarah Mei
|
034d566564
|
CI has decided it wants a proper shell to launch the virtual display. So FINE. It can have one.
|
2010-11-02 21:49:24 -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
|
8f5052fe61
|
Revert "Revert "making emwebfinger not try ssl first, for now""
This reverts commit 0db30bb221.
|
2010-11-02 18:59:42 -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 |
|
Alec Leamas
|
230b07a93e
|
Merge remote branch 'upstream/master'
|
2010-11-03 02:45:40 +01: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
|
a31c22adb3
|
mailer doesn't break everything anymore. attachments are also inlined.
|
2010-11-02 17:59:50 -07:00 |
|
maxwell
|
8c350282d3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 17:52:22 -07:00 |
|
maxwell
|
2f1fbaf686
|
temp. logging statement
|
2010-11-02 17:52:04 -07:00 |
|
danielvincent
|
bf12dc6bc7
|
fix spec
|
2010-11-02 17:44:13 -07:00 |
|
Raphael
|
ae039442c3
|
Websocket now uses cookie to authenticate
|
2010-11-02 17:39:50 -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 |
|
maxwell
|
0db30bb221
|
Revert "making emwebfinger not try ssl first, for now"
This reverts commit cc2766a0ea.
|
2010-11-02 17:36:58 -07:00 |
|
danielvincent
|
a79d1f5240
|
tabbing on publisher to everyone focuses submit button
|
2010-11-02 17:35:12 -07:00 |
|
maxwell
|
7e1ee9f371
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 17:33:18 -07:00 |
|
maxwell
|
cc2766a0ea
|
making emwebfinger not try ssl first, for now
|
2010-11-02 17:33:10 -07:00 |
|
danielvincent
|
a995d250f1
|
added white text on grey asset to mailer
|
2010-11-02 17:19:49 -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 |
|
maxwell
|
51d419f41a
|
removed diaspora handle method from user
|
2010-11-02 16:42:37 -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
|
a5dedc9bdb
|
User.build no longer saves people, user now has attr_accessible
|
2010-11-02 16:28:55 -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
|
a6d1906696
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 15:52:30 -07:00 |
|
maxwell
|
af3247b62f
|
IZ MS webfinger now trys ssl first, then http
|
2010-11-02 15:49:41 -07:00 |
|
Raphael
|
6503cefd68
|
Get rid of some repeated ids, fix infieldlabels on manage page
|
2010-11-02 15:37:06 -07:00 |
|
maxwell
|
449a6f3ea0
|
MS IZ removed a refrence to REDFINGER
|
2010-11-02 15:14:40 -07:00 |
|
maxwell
|
a22060d1fb
|
removing webfinger
|
2010-11-02 13:59:20 -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
|
c27cc719a2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-02 12:46:28 -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 |
|
Raphael
|
dc6a01e7e4
|
Remove random href, thanks to Hexagon
|
2010-11-02 12:39:17 -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
|
bfcb2a9e18
|
Remove random href
|
2010-11-02 12:37:32 -07:00 |
|
Raphael
|
a9b429d163
|
Merge remote branch 'ed0h/helper-method-for-markdown'
|
2010-11-02 12:14:41 -07:00 |
|