summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #110 from nickago/MM-1430Corey Hulen2015-06-301-2/+2
|\
| * Added the ability to have hashtags with dashes in themnickago2015-06-301-2/+2
* | Merge pull request #102 from nickago/MM-1328Corey Hulen2015-06-301-1/+3
|\ \
| * | Aligned front end and back end domain requirementsnickago2015-06-301-1/+3
| |/
* | Removed unnecessary loop copyingReed Garmsen2015-06-301-5/+1
* | Changed keyword logic to use arrays rather than maps to remove highlighting o...Reed Garmsen2015-06-301-5/+5
|/
* Merge pull request #109 from nickago/MM-1289Christopher Speller2015-06-301-3/+10
|\
| * Added extra precaution to avoid null errornickago2015-06-301-7/+9
| * MM-1289 Now sorts users in lexigraphical order in extra members popovernickago2015-06-301-1/+6
* | Merge pull request #108 from rgarmsen2295/mm-1309Christopher Speller2015-06-301-1/+1
|\ \
| * | Fixed grammmatical issue in error messageReed Garmsen2015-06-301-1/+1
| |/
* | Merge pull request #106 from mattermost/mm-1119Joram Wilander2015-06-308-11/+79
|\ \ | |/ |/|
| * @all and @channel now highlight like other mentionsJoramWilander2015-06-302-2/+8
| * add default icon for non-user autocompletesJoramWilander2015-06-302-2/+13
| * @all and @channel now auto-completeJoramWilander2015-06-294-3/+17
| * added team-wide and channel-wide mentionsJoramWilander2015-06-291-5/+42
* | Revert "MM-1289 Sorted the channel members popover lexigraphically"Christopher Speller2015-06-301-6/+1
* | Merge pull request #101 from rgarmsen2295/mm-983Christopher Speller2015-06-301-1/+1
|\ \
| * | Changed file preview removal from using dataset which is unsupported in ie10 ...Reed Garmsen2015-06-291-1/+1
| |/
* | Merge pull request #91 from nickago/MM-1289Christopher Speller2015-06-301-1/+6
|\ \
| * | Added semicolonsnickago2015-06-291-2/+2
| * | Sorted the channel members popover lexigraphicallynickago2015-06-291-1/+6
| |/
* | Merge pull request #103 from nickago/MM-1293Joram Wilander2015-06-301-1/+1
|\ \
| * | Changed the style of key-assignment to allow for more assured variancenickago2015-06-291-2/+1
| * | Updated file display key to avoid child flatteningnickago2015-06-291-1/+2
| |/
* | add intro text specific to off-topic channelJoramWilander2015-06-292-1/+13
* | move default channel creation to seperate func and add off-topicJoramWilander2015-06-291-1/+1
|/
* rebase touch-upsJoramWilander2015-06-293-2/+3
* fixed CSS indentingJoramWilander2015-06-291-11/+11
* make channel notifications modal visible in mobile modeJoramWilander2015-06-292-1/+5
* fixes mm-1316 improves channel notifications UI and updates channellist etagJoramWilander2015-06-292-73/+165
* Merge pull request #93 from rgarmsen2295/mm-1317Joram Wilander2015-06-291-1/+1
|\
| * Removed test codeReed Garmsen2015-06-281-2/+2
| * Fixed typo in team domain look-up pageReed Garmsen2015-06-282-3/+3
* | Merge pull request #87 from asaadmahmoodspin/settings-uiJoram Wilander2015-06-292-16/+16
|\ \
| * | Updating settings UIAsaad Mahmood2015-06-282-16/+16
* | | Merge pull request #79 from asaadmahmoodspin/masterJoram Wilander2015-06-293-19/+43
|\ \ \ | |_|/ |/| |
| * | Removing relative from spanAsaad Mahmood2015-06-271-2/+1
| * | mm-1256 - Improving view modal and close modal buttonAsaad Mahmood2015-06-263-12/+37
| * | MM-1184 - Updating image previewAsaad Mahmood2015-06-262-7/+7
| |/
* | Merge pull request #83 from ralder/fix-broken-mailto-user-popoverCorey Hulen2015-06-271-6/+4
|\ \
| * | gui: fix broken mailto link in user-popoverralder2015-06-261-6/+4
| |/
* / gui: fix mentions dropdowntest2015-06-262-13/+16
|/
* Merge pull request #46 from mattermost/mm-1318Joram Wilander2015-06-254-32/+49
|\
| * fixes mm-1318 only allow 5 files to be uploaded at a timeJoramWilander2015-06-224-32/+49
* | Merge pull request #45 from rgarmsen2295/mm-1309Corey Hulen2015-06-251-2/+7
|\ \
| * | Made it so the team creator can no longer use the same email used at signup t...Reed Garmsen2015-06-191-2/+7
| |/
| * fixes mm-1315 adds confirmation dialog when closing invite dialog with typed ...JoramWilander2015-06-192-38/+113
* | Merge pull request #43 from rgarmsen2295/mm-1202Corey Hulen2015-06-252-2/+3
|\ \
| * | Readded error checking for for first and last names but made the requirement ...Reed Garmsen2015-06-192-2/+20