Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform into mm-1426 | Asaad Mahmood | 2015-07-17 | 1 | -11/+13 |
|\ | |||||
| * | 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 |
| | | | | | | | | null | ||||
* | | Improving modal UI | Asaad Mahmood | 2015-07-17 | 2 | -4/+3 |
| | | |||||
* | | Improving channel notifications | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | | |||||
* | | Improving image modals | Asaad Mahmood | 2015-07-17 | 2 | -1/+2 |
| | | |||||
* | | Adding border radius | Asaad Mahmood | 2015-07-17 | 1 | -0/+1 |
| | | |||||
* | | MM-1426 - Updating UI | Asaad Mahmood | 2015-07-17 | 8 | -18/+36 |
|/ | |||||
* | Merge pull request #118 from nickago/MM-1363 | Joram Wilander | 2015-07-02 | 1 | -3/+10 |
|\ | | | | | Mm 1363 Limit uploads to only JPEGs for profile pictures | ||||
| * | 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 #115 from nickago/MM-1425 | Corey Hulen | 2015-07-01 | 5 | -8/+8 |
|\ \ | | | | | | | MM-1425 Facelifted "direct message" to "private message" | ||||
| * | | Facelifted "direct message" to "private message" | nickago | 2015-07-01 | 5 | -8/+8 |
| |/ | |||||
* | | Merge pull request #114 from asaadmahmoodspin/master | Corey Hulen | 2015-07-01 | 12 | -5/+21 |
|\ \ | | | | | | | Fixing css issues in IE, adding doctype to html files | ||||
| * | | 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 |
|\ \ | | | | | | | MM-1151 clickable search results | ||||
| * | | 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 bug mention list inside modal | ||||
| * | fix pr #82 mention list inside modal | ralder | 2015-06-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #110 from nickago/MM-1430 | Corey Hulen | 2015-06-30 | 1 | -2/+2 |
|\ \ | | | | | | | MM-1430 Added the ability to have hashtags with dashes in them | ||||
| * | | Added the ability to have hashtags with dashes in them | nickago | 2015-06-30 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #102 from nickago/MM-1328 | Corey Hulen | 2015-06-30 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | MM-1328 Now limits domain to just alphanumeric | ||||
| * | | | Aligned front end and back end domain requirements | nickago | 2015-06-30 | 1 | -1/+3 |
| |/ / | |||||
* | | | Removed unnecessary loop copying | Reed Garmsen | 2015-06-30 | 1 | -5/+1 |
| | | | |||||
* | | | Changed keyword logic to use arrays rather than maps to remove highlighting ↵ | Reed Garmsen | 2015-06-30 | 1 | -5/+5 |
|/ / | | | | | | | of js object properties like constructor and __proto__ | ||||
* | | Merge pull request #109 from nickago/MM-1289 | Christopher Speller | 2015-06-30 | 1 | -3/+10 |
|\ \ | | | | | | | Mm 1289 Now sorts extra channel members lexigraphically | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | MM-1309 Fixed grammmatical issue in error message | ||||
| * | | | 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 | 8 | -11/+79 |
|\ \ \ | |/ / |/| | | fixes mm-1119 adds @all and @channel mention capabilites | ||||
| * | | @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 | 1 | -5/+42 |
| | | | |||||
* | | | 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 |
|\ \ \ | | | | | | | | | MM-983 Fixed file preview removal in IE10 | ||||
| * | | | Changed file preview removal from using dataset which is unsupported in ie10 ↵ | Reed Garmsen | 2015-06-29 | 1 | -1/+1 |
| |/ / | | | | | | | | | | to using the getAttribute method which is backwards and forwards compatible | ||||
* | | | Merge pull request #91 from nickago/MM-1289 | Christopher Speller | 2015-06-30 | 1 | -1/+6 |
|\ \ \ | | | | | | | | | MM-1289 Sorted the channel members popover lexigraphically | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | MM-1293 Updated file display key to avoid child flattening | ||||
| * | | | 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 |
| |/ / | |||||
* | | | add intro text specific to off-topic channel | JoramWilander | 2015-06-29 | 2 | -1/+13 |
| | | | |||||
* | | | move default channel creation to seperate func and add off-topic | JoramWilander | 2015-06-29 | 1 | -1/+1 |
|/ / | |||||
* | | rebase touch-ups | JoramWilander | 2015-06-29 | 3 | -2/+3 |
| | |