zhitomirskiyi
|
2da1f860cd
|
validate user ownership on status message destroy
|
2010-11-03 18:04:10 -07:00 |
|
zhitomirskiyi
|
8246882067
|
MS IZ fixed some permissions in photo controller
|
2010-11-03 16:42:33 -07:00 |
|
Raphael
|
03b272db60
|
Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC
|
2010-11-03 15:26:58 -07:00 |
|
zhitomirskiyi
|
7771219a0a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-03 13:16:57 -07:00 |
|
zhitomirskiyi
|
0ac4c5b04f
|
IZ MS refactored invites to use user.build
|
2010-11-03 13:16:45 -07:00 |
|
zhitomirskiyi
|
3578daa14e
|
IZ MS more photo controller specs
|
2010-11-03 12:21:32 -07:00 |
|
danielvincent
|
3e001c74d6
|
Albums#index hidden from views. Photos must be accessed through a person.
|
2010-11-03 12:21:14 -07:00 |
|
Raphael
|
c8a8849518
|
Move to build_post and dispatch_post in most controllers
|
2010-11-03 09:30:41 -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
|
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 |
|
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 |
|
Raphael
|
ae039442c3
|
Websocket now uses cookie to authenticate
|
2010-11-02 17:39:50 -07:00 |
|
danielvincent
|
a79d1f5240
|
tabbing on publisher to everyone focuses submit button
|
2010-11-02 17:35:12 -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 |
|
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
|
a5dedc9bdb
|
User.build no longer saves people, user now has attr_accessible
|
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 |
|
Raphael
|
6503cefd68
|
Get rid of some repeated ids, fix infieldlabels on manage page
|
2010-11-02 15:37:06 -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
|
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 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
|
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 |
|
danielvincent
|
a3ce5f1cd7
|
REMOVED IMPORTER
|
2010-11-02 11:17:47 -07:00 |
|
Raphael
|
67219248b0
|
unscope i18n calls
|
2010-11-02 10:32:34 -07:00 |
|
Alec Leamas
|
fceffba261
|
Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor
|
2010-11-02 16:34:47 +01: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 |
|
Raphael
|
bd6a8df7cc
|
Revert to getElementById in FileUploader, jquery isn't working
|
2010-11-01 17:07:28 -07:00 |
|
Raphael
|
47f040f740
|
Use jquery id selector
|
2010-11-01 16:45:09 -07:00 |
|
Hexagon
|
938d146405
|
Common translations are used without the namespace
|
2010-11-02 00:07:24 +01:00 |
|
Raphael
|
377cae8cba
|
Merge remote branch 'ed0h/i18n-fallbacks'
Conflicts:
pkg/ubuntu/dist
|
2010-11-01 15:57:43 -07:00 |
|
danielvincent
|
3a4f100806
|
remove *
|
2010-11-01 15:01:49 -07:00 |
|
danielvincent
|
f6b4be97a3
|
requests are almost there
|
2010-11-01 14:54:40 -07:00 |
|
Hexagon
|
1acc206fa4
|
#475: Fixed more untranslated strings
|
2010-11-01 22:22:13 +01:00 |
|