Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attachments in compose and reply #23

Closed

Conversation

KamilaHasanbega
Copy link
Contributor

Fixed the page for replying with attachments, and added tests for the new onFileUpload function. Fixed other tests to include attachments.

@@ -457,9 +457,12 @@ ThreadsCtrl.prototype.isInviteInProgress = function() {


/**
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the above are file conflict markers, you should resolve the conflicts by deleting the lines in those files that shouldn't be there (<<<<, ==== and >>> lines should not be committed).

.email-detail-from {

.email-detail-from {
text-align: left !important;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

text-align: left shouldn't be needed as the text-align: center was fixed in e19e0e3.

};


/**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function description is missing, same below.

goog.provide('e2email.models.mail.Mail');
goog.provide('e2email.models.mail.Mailbox');
goog.provide('e2email.models.mail.Thread');


/**
* This is the model for the attachments support.
* The filename is the attachment's name, size is it's size in Bytes,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some typos: Bytes -> bytes and the ocntent.

Copy link
Contributor

@koto koto Aug 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's size => its size, same for content

* size: number
* }}
*/
e2email.models.mail.Attachments;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be singular, as it defines a single attachment.

@koto
Copy link
Contributor

koto commented Aug 22, 2016

LGTM, safe to merge.

@kbsriram
Copy link
Contributor

Rebased via 86185ae

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants