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
Raphael
ff21c827e4
Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'"
...
This reverts commit 2b128d88ec8778bdab3b
2010-11-02 12:14:12 -07:00
MrZYX
80b8e5e42d
updated german locale (informal) to reflect latest changes
2010-11-02 12:12:47 -07:00
MrZYX
7cd6e3a868
updated german locale (informal) with keys from pull request 465
...
again with help of michiwend
2010-11-02 12:12:47 -07:00
MrZYX
b1c9961a72
updated german locale so no keys are missing (informal)
...
also added parts for german from the rails i18n project
still some parts missing, unclear or not translatable look at #FIXME's
even added translation that is missing in en.yml :P
thanks to michiwend for help
2010-11-02 12:12:47 -07:00
danielvincent
fdd3264812
proxy buffering enabled and gzip compression for files other than text/html in nginx.conf
2010-11-02 12:03:10 -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
8778bdab3b
Merge remote branch 'ed0h/503-language-html-tag'
2010-11-02 11:43:12 -07:00
Raphael
9d71ed1120
Merge remote branch 'robustdj/453-aspect-labels'
...
Conflicts:
app/models/user.rb
pkg/ubuntu/dist
2010-11-02 11:31:51 -07:00
Raphael
7fdd0475ae
robustdj's specs now green
2010-11-02 11:27:51 -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
Raphael
67219248b0
unscope i18n calls
2010-11-02 10:32:34 -07:00
