Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | make loop simpler | JoramWilander | 2015-07-02 | 1 | -1/+1 | |
| * | | | | fix getDirectTeammate so that if teammate is the second id it doesn't return ... | JoramWilander | 2015-07-02 | 1 | -11/+13 | |
|/ / / / | ||||||
* | | | | Merge pull request #118 from nickago/MM-1363 | Joram Wilander | 2015-07-02 | 1 | -3/+10 | |
|\ \ \ \ | ||||||
| * | | | | Changed ordering of steps for upload to imporve asthetic | nickago | 2015-07-01 | 1 | -2/+4 | |
| * | | | | Restricted profile picture uploads to just JPEGs | nickago | 2015-07-01 | 1 | -1/+6 | |
| |/ / / | ||||||
* | | | | Merge pull request #117 from nickago/MM-1308 | Christopher Speller | 2015-07-02 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Changed offline timeout to 1 mintue | nickago | 2015-07-01 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #115 from nickago/MM-1425 | Corey Hulen | 2015-07-01 | 6 | -9/+9 | |
|\ \ \ \ | ||||||
| * | | | | Facelifted "direct message" to "private message" | nickago | 2015-07-01 | 6 | -9/+9 | |
| |/ / / | ||||||
* | | | | Merge pull request #114 from asaadmahmoodspin/master | Corey Hulen | 2015-07-01 | 12 | -5/+21 | |
|\ \ \ \ | ||||||
| * | | | | Improving targeting for row content | Asaad Mahmood | 2015-07-01 | 1 | -5/+5 | |
| * | | | | Just arranging the css more properly | Asaad Mahmood | 2015-07-01 | 1 | -1/+4 | |
| * | | | | Fixing height for content | Asaad Mahmood | 2015-07-01 | 2 | -3/+5 | |
| * | | | | Fixing css issues in IE, adding doctype to html files | Asaad Mahmood | 2015-07-01 | 11 | -0/+11 | |
| |/ / / | ||||||
* | | | | Merge pull request #92 from nickago/MM-1151 | Corey Hulen | 2015-07-01 | 4 | -14/+27 | |
|\ \ \ \ | ||||||
| * | | | | Finally fixed the git weirdness | nickago | 2015-07-01 | 4 | -14/+27 | |
| |/ / / | ||||||
* | | | | Merge pull request #90 from ralder/patch-1 | Corey Hulen | 2015-07-01 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | fix pr #82 mention list inside modal | ralder | 2015-06-29 | 1 | -1/+1 | |
* | | | | Merge pull request #62 from jedisct1/authenticated-encryption | Corey Hulen | 2015-06-30 | 1 | -6/+32 | |
|\ \ \ \ | ||||||
| * | | | | SQL store: use authenticated encryption | Frank Denis | 2015-06-24 | 1 | -6/+32 | |
* | | | | | Merge pull request #110 from nickago/MM-1430 | Corey Hulen | 2015-06-30 | 3 | -3/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added the ability to have hashtags with dashes in them | nickago | 2015-06-30 | 3 | -3/+19 | |
* | | | | | | Merge pull request #102 from nickago/MM-1328 | Corey Hulen | 2015-06-30 | 1 | -1/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Aligned front end and back end domain requirements | nickago | 2015-06-30 | 1 | -1/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #111 from rgarmsen2295/mm-1305 | Joram Wilander | 2015-06-30 | 1 | -8/+4 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Removed unnecessary loop copying | Reed Garmsen | 2015-06-30 | 1 | -5/+1 | |
| * | | | | | Changed keyword logic to use arrays rather than maps to remove highlighting o... | Reed Garmsen | 2015-06-30 | 1 | -5/+5 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #109 from nickago/MM-1289 | Christopher Speller | 2015-06-30 | 1 | -3/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added extra precaution to avoid null error | nickago | 2015-06-30 | 1 | -7/+9 | |
| * | | | | | MM-1289 Now sorts users in lexigraphical order in extra members popover | nickago | 2015-06-30 | 1 | -1/+6 | |
* | | | | | | Merge pull request #108 from rgarmsen2295/mm-1309 | Christopher Speller | 2015-06-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixed grammmatical issue in error message | Reed Garmsen | 2015-06-30 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #106 from mattermost/mm-1119 | Joram Wilander | 2015-06-30 | 10 | -18/+99 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | added mentioned username to default mention keys | JoramWilander | 2015-06-30 | 1 | -1/+1 | |
| * | | | | | @all and @channel now highlight like other mentions | JoramWilander | 2015-06-30 | 2 | -2/+8 | |
| * | | | | | add default icon for non-user autocompletes | JoramWilander | 2015-06-30 | 2 | -2/+13 | |
| * | | | | | @all and @channel now auto-complete | JoramWilander | 2015-06-29 | 4 | -3/+17 | |
| * | | | | | added team-wide and channel-wide mentions | JoramWilander | 2015-06-29 | 3 | -11/+61 | |
* | | | | | | Merge pull request #107 from mattermost/revert-91-MM-1289 | Christopher Speller | 2015-06-30 | 1 | -6/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Revert "MM-1289 Sorted the channel members popover lexigraphically" | Christopher Speller | 2015-06-30 | 1 | -6/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #101 from rgarmsen2295/mm-983 | Christopher Speller | 2015-06-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Changed file preview removal from using dataset which is unsupported in ie10 ... | Reed Garmsen | 2015-06-29 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #91 from nickago/MM-1289 | Christopher Speller | 2015-06-30 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Added semicolons | nickago | 2015-06-29 | 1 | -2/+2 | |
| * | | | | | | | Sorted the channel members popover lexigraphically | nickago | 2015-06-29 | 1 | -1/+6 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #103 from nickago/MM-1293 | Joram Wilander | 2015-06-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Changed the style of key-assignment to allow for more assured variance | nickago | 2015-06-29 | 1 | -2/+1 | |
| * | | | | | | | Updated file display key to avoid child flattening | nickago | 2015-06-29 | 1 | -1/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #100 from asaadmahmoodspin/master | Corey Hulen | 2015-06-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | MM-1268 - Updating button in email template | Asaad Mahmood | 2015-06-30 | 1 | -1/+1 |