-
Notifications
You must be signed in to change notification settings - Fork 62
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
Attachments in compose and reply #23
Conversation
Added the two introductory pages, “Introduction” & “Get Started” and their controllers/design. Fixed the flow to redirect to the first page when setting up, and from them to the Welcome page.
Added the case in which the user is Logged in but does not have authorizations. Fixed the flow accordingly. Fixed the design of the rest.
@@ -457,9 +457,12 @@ ThreadsCtrl.prototype.isInviteInProgress = function() { | |||
|
|||
|
|||
/** | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
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; |
There was a problem hiding this comment.
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.
…' of https://github.com/KamilaHasanbega/e2email into show-attachments
…/e2email into show-attachments
}; | ||
|
||
|
||
/** |
There was a problem hiding this comment.
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, |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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; |
There was a problem hiding this comment.
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.
LGTM, safe to merge. |
Rebased via 86185ae |
Fixed the page for replying with attachments, and added tests for the new onFileUpload function. Fixed other tests to include attachments.