MrZYX
|
5631e45b6d
|
--amend
|
2011-03-09 15:49:16 +01:00 |
|
MrZYX
|
0d1133cd51
|
fixed some translations
do not escape html in private_message text only email
|
2011-03-09 15:33:46 +01:00 |
|
zhitomirskiyi
|
c697df4b5a
|
markdownafy the private message text
|
2011-03-08 23:12:04 -08:00 |
|
danielgrippi
|
dda477410d
|
use conversations_url() with a param in private message emails
|
2011-03-08 22:11:34 -08:00 |
|
danielgrippi
|
1f5edb1d92
|
Merge branch 'private_messages'
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
|
2011-03-08 21:23:41 -08:00 |
|
danielgrippi
|
ac738df8f5
|
added missing translation
|
2011-03-08 19:22:49 -08:00 |
|
zhitomirskiyi
|
c252cfa025
|
added the email notification, the notification is not persisted, fixed the receive callback spec
|
2011-03-08 18:24:56 -08:00 |
|
danielgrippi
|
d38e3a6b29
|
added translations to all conversation/message views. tweaked css
|
2011-03-08 15:51:46 -08:00 |
|
zhitomirskiyi
|
84198e4750
|
Merge branch 'private_messages' of github.com:diaspora/diaspora into private_messages
|
2011-03-08 11:57:49 -08:00 |
|
MrZYX
|
5f841b9add
|
do not escape html in text only emails
|
2011-03-08 20:45:02 +01:00 |
|
danielgrippi
|
78e30ff459
|
update unread count in conversation visibility when hitting conversationscontroller#show
|
2011-03-08 11:43:58 -08:00 |
|
MrZYX
|
7b5b980095
|
link to public feed of the person on the profile person show page instead of to the one of current_user
fixed #700
fixed #864
fixed #774
|
2011-03-08 20:30:48 +01:00 |
|
zhitomirskiyi
|
8bcf1b49c7
|
notifier for the messages, we're so close
|
2011-03-08 10:53:49 -08:00 |
|
danielgrippi
|
fb5e5cc341
|
cleaned up new message facebox
|
2011-03-07 20:14:22 -08:00 |
|
danielgrippi
|
fca5310c77
|
dispatch the conversation in ConversationsController
|
2011-03-07 17:54:25 -08:00 |
|
Raphael Sofaer
|
b7c3f93d25
|
Use delegation in PostFake, use render => :collection in stream
|
2011-03-07 12:20:46 -08:00 |
|
danielgrippi
|
97aff09140
|
added autocomplete on message 'to' field, minor css tweaks to inbox
|
2011-03-07 11:22:59 -08:00 |
|
Raphael Sofaer
|
a45f46828a
|
re-enable commenting box on show page without comments, but it looks kind of ugly
|
2011-03-07 10:18:50 -08:00 |
|
Raphael Sofaer
|
909a198380
|
Post photos without text
|
2011-03-07 10:03:43 -08:00 |
|
zhitomirskiyi
|
80a3a3446a
|
pulling in
|
2011-03-06 21:37:27 -08:00 |
|
Raphael Sofaer
|
e00a033e9e
|
Update rspec-instafail, test git headers
|
2011-03-06 10:18:37 -08: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
zhitomirskiyi
|
3812612c86
|
added a validation of participant, as well as messages controller spec wip
|
2011-03-01 19:24:07 -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 |
|