summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mm-1420=Corey Hulen2015-07-2244-446/+1080
|\
| * Merge pull request #241 from rgarmsen2295/mm-1556Joram Wilander2015-07-221-4/+14
| |\
| | * Channel descriptions entered that are larger than the max number of bytes now...Reed Garmsen2015-07-221-4/+14
| * | Merge pull request #228 from nickago/MM-1547Joram Wilander2015-07-223-15/+86
| |\ \
| | * | Added message persistance on closing RHS/switching to another commentnickago2015-07-223-15/+86
| * | | Merge pull request #238 from mattermost/mm-1639aCorey Hulen2015-07-221-0/+5
| |\ \ \
| | * | | Fixing godep restore=Corey Hulen2015-07-222-2/+5
| | * | | Fixing godep restore=Corey Hulen2015-07-221-1/+1
| | * | | adding godep restore to travis=Corey Hulen2015-07-221-0/+2
| * | | | Merge pull request #214 from hmhealey/mm1498Joram Wilander2015-07-221-0/+31
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use QueryUnescape function to convert to a human readable filename in email n...hmhealey2015-07-211-1/+7
| | * | | Added additional check when adding a message to an email notification for a b...hmhealey2015-07-201-2/+2
| | * | | Provide a replacement message for email notifications for posts only containi...hmhealey2015-07-201-4/+29
| * | | | Merge pull request #229 from rgarmsen2295/mm-1626Corey Hulen2015-07-221-1/+1
| |\ \ \ \
| | * | | | Changed the subject line for emails sent regarding mentions and other team no...Reed Garmsen2015-07-211-1/+1
| * | | | | Merge pull request #219 from nickago/scrollBugCorey Hulen2015-07-221-0/+2
| |\ \ \ \ \
| | * | | | | Upon changing to a new comment thread, fixes the the bug of the RHS scrolling...nickago2015-07-211-0/+2
| * | | | | | Merge pull request #201 from hmhealey/mm1539Corey Hulen2015-07-226-5/+130
| |\ \ \ \ \ \
| | * | | | | | Prevent users from sending empty ^ reply messageshmhealey2015-07-211-5/+5
| | * | | | | | Added handling for when the user is ^ responding to a post that gets deletedhmhealey2015-07-211-1/+7
| | * | | | | | Track caretCount as part of createPost's state so that we don't unnecessarily...hmhealey2015-07-211-22/+22
| | * | | | | | Changed the placeholder highlight for active thread to be more subtlehmhealey2015-07-211-2/+4
| | * | | | | | Trim the carets from the beginning of reply messages when they're postedhmhealey2015-07-211-0/+5
| | * | | | | | Change the create_post component to track the active thread using the event d...hmhealey2015-07-211-14/+24
| | * | | | | | Added function to reply to earlier messages by prefixing a message with caretshmhealey2015-07-214-4/+89
| | * | | | | | Added events for when the active thread (ie the message thread that a user is...hmhealey2015-07-212-0/+17
| * | | | | | | Merge pull request #236 from mattermost/it33-patch-1Corey Hulen2015-07-221-3/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Update to latest community URLsit332015-07-221-3/+8
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #235 from rgarmsen2295/mm-1596Corey Hulen2015-07-221-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | While in mobile mode notifications are no longer counted for channels set to ...Reed Garmsen2015-07-221-1/+1
| | |/ / / / / /
| * | | | | | | Merge pull request #234 from asaadmahmoodspin/masterCorey Hulen2015-07-225-12/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Improving formatting for Channel IntroAsaad Mahmood2015-07-223-11/+23
| | * | | | | | | Adjusting scroll in RHS to not show whitespaceAsaad Mahmood2015-07-221-0/+1
| | * | | | | | | Profile pic changes in LHS HeaderAsaad Mahmood2015-07-222-1/+5
| | |/ / / / / /
| * | | | | | | Merge pull request #233 from asaadmahmoodspin/mm-1616Corey Hulen2015-07-2210-168/+350
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Adding back Access History and Active DevicesReed Garmsen2015-07-2210-168/+350
| * | | | | | | Merge pull request #232 from mattermost/post-list-nullJoram Wilander2015-07-221-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Small patch for a null TypeError in post_list updating codeChristopher Speller2015-07-221-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #231 from mattermost/file-fixesChristopher Speller2015-07-222-27/+27
| |\ \ \ \ \ \
| | * | | | | | fix the ability to remove file previews once uploadedJoramWilander2015-07-221-2/+3
| | * | | | | | fixed thumbnails and files in RHSJoramWilander2015-07-221-25/+24
| * | | | | | | Merge pull request #230 from mattermost/download-link-fixChristopher Speller2015-07-221-3/+10
| |\ \ \ \ \ \ \
| | * | | | | | | fixed download link in image viewerJoramWilander2015-07-211-3/+10
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #224 from hmhealey/mm1625Christopher Speller2015-07-222-4/+11
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Changed post menu label to be ... and to make it visible at all times on smal...hmhealey2015-07-211-0/+10
| | * | | | | | Changed post menu label to just be [...] regardless of whether or not the use...hmhealey2015-07-211-4/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #222 from rgarmsen2295/mm-1574Joram Wilander2015-07-221-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fixed typo in the 'Sign up Complete' page: you email -> your emailReed Garmsen2015-07-211-1/+1
| | |/ / / /
| * | | | | Merge pull request #205 from mattermost/mm-1351Corey Hulen2015-07-2116-206/+383
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | removed unnecessary debug statementsJoramWilander2015-07-212-4/+0