zhitomirskiyi
|
e537104fb4
|
pulling in
|
2011-03-06 21:36:03 -08:00 |
|
Raphael Sofaer
|
e00a033e9e
|
Update rspec-instafail, test git headers
|
2011-03-06 10:18:37 -08:00 |
|
Raphael Sofaer
|
981c37d286
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-03-06 09:58:28 -08:00 |
|
MrZYX
|
c79b55f520
|
updated locales
|
2011-03-05 16:32:01 +01:00 |
|
danielgrippi
|
8fafc48d32
|
more private message wip.
|
2011-03-04 18:17:49 -08:00 |
|
danielgrippi
|
d50863cc90
|
added the ability to message someone from their profile page
|
2011-03-04 11:28:09 -08:00 |
|
danielgrippi
|
48fff29bf6
|
fixed conversation receive. made visibilities on conversation :dependent => :destroy
|
2011-03-04 11:19:01 -08:00 |
|
Raphael Sofaer
|
a865373bfa
|
Adjust readme
|
2011-03-04 10:30:10 -08:00 |
|
MrZYX
|
06ff32d8d5
|
updated locales
|
2011-03-04 14:43:44 +01:00 |
|
danielgrippi
|
5f55dfa1bc
|
private message inbox wip
|
2011-03-03 17:32:26 -08:00 |
|
Raphael Sofaer
|
eb9705c82d
|
Adjust batch invite text
|
2011-03-03 17:23:20 -08:00 |
|
Raphael Sofaer
|
435451bc5b
|
admins can resend invitations
|
2011-03-03 16:59:33 -08:00 |
|
MrZYX
|
f0ba62be59
|
replaced ▼ with ▼, this fixes #904 and shouldn't harm anything.
|
2011-03-03 21:32:44 +01:00 |
|
MrZYX
|
ae0595bca8
|
fixed #903
|
2011-03-03 21:25:01 +01:00 |
|
Raphael Sofaer
|
3d0831f2b2
|
Merge remote branch 'mnutt/photo_upload_status'
|
2011-03-03 11:43:16 -08:00 |
|
Raphael Sofaer
|
da12954d22
|
Move statusmessage create view out to partial
|
2011-03-03 11:10:44 -08:00 |
|
zhitomirskiyi
|
2522ab7ee4
|
refactoring the conversation views, wip
|
2011-03-03 10:39:32 -08:00 |
|
MrZYX
|
8ab54076f8
|
updated locales
|
2011-03-02 22:45:31 +01:00 |
|
Raphael Sofaer
|
1afc83f356
|
Revert "memprof"
This reverts commit 8ee81314d6.
|
2011-03-02 13:34:29 -08:00 |
|
Raphael Sofaer
|
685130cbd4
|
Take out n-query on home page
|
2011-03-02 13:34:06 -08:00 |
|
zhitomirskiyi
|
9d7611f8d8
|
addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling
|
2011-03-02 12:27:57 -08:00 |
|
Raphael Sofaer
|
770091e82b
|
Don't retrieve all the user's contacts again unnecessarily
|
2011-03-02 12:11:25 -08:00 |
|
Raphael Sofaer
|
8ee81314d6
|
memprof
|
2011-03-02 11:47:13 -08:00 |
|
Raphael Sofaer
|
9d92161430
|
Make migrations compatible with postgres
|
2011-03-02 11:05:16 -08:00 |
|
zhitomirskiyi
|
f58c477673
|
added the forgotten files
|
2011-03-01 23:55:11 -08:00 |
|
Sarah Mei
|
ba6afa50e8
|
Removing extra csrf tag. Thx feanor12.
|
2011-03-01 22:25:05 -08:00 |
|
Sarah Mei
|
1590b69569
|
WTF. Seriously. It works with 1.9 now though.
|
2011-03-01 21:43:49 -08:00 |
|
Sarah Mei
|
d183150fa9
|
Upgrade launchy.
|
2011-03-01 21:41:28 -08:00 |
|
zhitomirskiyi
|
3812612c86
|
added a validation of participant, as well as messages controller spec wip
|
2011-03-01 19:24:07 -08:00 |
|
Raphael Sofaer
|
68f0f7ec21
|
Add rcov task
|
2011-03-01 18:12:42 -08:00 |
|
danielvincent
|
21fd546cd0
|
posts now have authors instead of people
|
2011-03-01 18:05:05 -08:00 |
|
Raphael Sofaer
|
0cb218bba0
|
Delete statistic and data point models
|
2011-03-01 16:54:12 -08:00 |
|
danielvincent
|
11309574cf
|
messages are now relayable, a comment has an author as opposed to a person.
|
2011-03-01 12:39:42 -08:00 |
|
danielvincent
|
c62e9db397
|
private messages wip
|
2011-03-01 12:28:34 -08:00 |
|
danielvincent
|
f4e6d0d82b
|
broke out some comment logic to a replayable module
|
2011-03-01 12:28:33 -08:00 |
|
zhitomirskiyi
|
bd908a9b95
|
conversations federate
|
2011-03-01 12:25:55 -08:00 |
|
danielvincent
|
1072806d8f
|
PrivateMessage -> Conversation, Message.
|
2011-03-01 12:25:55 -08:00 |
|
danielvincent
|
a179bac689
|
fixed migrations, added unread to PrivateMessageVisibilities
|
2011-03-01 12:25:54 -08:00 |
|
danielvincent
|
979d9d7fb4
|
added delete actions for private messages
|
2011-03-01 12:14:31 -08:00 |
|
danielvincent
|
090c412690
|
touched up AspectMembership resource
|
2011-03-01 12:14:31 -08:00 |
|
danielvincent
|
c5801ffb37
|
basic views / controller actions for private messages
|
2011-03-01 12:14:31 -08:00 |
|
danielvincent
|
9fe0320881
|
added PrivateMessage and PrivateMessageVisibility models and migrations
|
2011-03-01 12:14:31 -08:00 |
|
Raphael Sofaer
|
a7f149e399
|
Possible performance gain from not hitting posts relation
|
2011-03-01 11:42:57 -08:00 |
|
Raphael Sofaer
|
00cca370ad
|
Add translation key method, should be replaced with separate partials.
|
2011-03-01 11:03:58 -08:00 |
|
Raphael Sofaer
|
1c1fba63e7
|
Refactor notification to have subclasses, just a start
|
2011-03-01 10:30:29 -08:00 |
|
Raphael Sofaer
|
809ee8a678
|
Started notifications refactor
|
2011-03-01 10:30:29 -08:00 |
|
MrZYX
|
00ebf6469b
|
it can happen that the http referer is nil when we expect it to be set (for example if the user has a privacy extension enabled
|
2011-03-01 18:38:40 +01:00 |
|
MrZYX
|
31f5500b11
|
removed RAILS_ENV=test example from config/server.sh
|
2011-03-01 17:28:35 +01:00 |
|
Michael Nutt
|
ac2c50b33f
|
denote that fileuploader has been modified
|
2011-02-28 20:37:41 -05:00 |
|
Raphael Sofaer
|
ebfebb16d7
|
Fix integration spec
|
2011-02-28 17:22:40 -08:00 |
|