summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #242 from asaadmahmoodspin/masterChristopher Speller2015-07-239-11/+24
|\
| * UI changes for search bar in the RHS for Mobile WebAsaad Mahmood2015-07-231-3/+4
| * Adjusting padding for LHS header infoAsaad Mahmood2015-07-231-1/+1
| * Adding hover effect for LHS menu iconAsaad Mahmood2015-07-231-1/+5
| * Placing SVGs into constants.jsxAsaad Mahmood2015-07-235-5/+11
| * UI FixesAsaad Mahmood2015-07-234-4/+6
* | Merge pull request #243 from hmhealey/mm1678Christopher Speller2015-07-231-1/+1
|\ \
| * | Fixed reference to non-existant local variable that prevented the sidebar fro...hmhealey2015-07-231-1/+1
| |/
* | Merge pull request #244 from rgarmsen2295/mm-1610Christopher Speller2015-07-233-3/+3
|\ \
| * | Fixed issue with error message for uploading more than 5 files not appearing ...Reed Garmsen2015-07-233-3/+3
| |/
* | Merge pull request #237 from mattermost/mm-1570Corey Hulen2015-07-2321-131/+789
|\ \ | |/ |/|
| * added store unit test for user.GetByAuth and added password length checking i...JoramWilander2015-07-232-0/+25
| * added SSOSettings to docker config fileJoramWilander2015-07-221-0/+10
| * add check on server to prevent password updating for users who log in through...JoramWilander2015-07-221-0/+7
| * only show gitlab signup/login links if gitlab oauth is turned onJoramWilander2015-07-229-14/+46
| * add changes from team reviewJoramWilander2015-07-225-12/+13
| * added error case for login and removed authdata + authservice unique constrai...JoramWilander2015-07-222-10/+23
| * added signup link verification to oauth signup flowJoramWilander2015-07-223-49/+88
| * add error for trying to sign up with the same oauth account twiceJoramWilander2015-07-222-1/+6
| * added error message when trying to sign up with gitlab using an email already...JoramWilander2015-07-221-0/+5
| * merged with new team domain changes and added signup/login links for gitlabJoramWilander2015-07-229-36/+50
| * made oauth architecture more generalizedJoramWilander2015-07-225-58/+141
| * removed change password UI for oauth accountsJoramWilander2015-07-223-30/+49
| * inital implementation of using GitLab OAuth2 provider for signup/loginJoramWilander2015-07-2211-58/+463
* | Merge pull request #194 from ralder/fix-command-box-cssCorey Hulen2015-07-2211-103/+101
|\ \
| * | [webui] fix command-list cssralder2015-07-2211-103/+101
* | | Merge pull request #240 from asaadmahmoodspin/masterCorey Hulen2015-07-2213-23/+32
|\ \ \
| * | | Updating dropdown icon in LHS headerAsaad Mahmood2015-07-231-2/+2
| * | | Minor UI ImprovementsAsaad Mahmood2015-07-2313-21/+30
| |/ /
* | | 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