summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
...
* | | | fix getDirectTeammate so that if teammate is the second id it doesn't return ...JoramWilander2015-07-021-11/+13
|/ / /
* | | Merge pull request #118 from nickago/MM-1363Joram Wilander2015-07-021-3/+10
|\ \ \
| * | | Changed ordering of steps for upload to imporve astheticnickago2015-07-011-2/+4
| * | | Restricted profile picture uploads to just JPEGsnickago2015-07-011-1/+6
| |/ /
* | | Merge pull request #115 from nickago/MM-1425Corey Hulen2015-07-015-8/+8
|\ \ \
| * | | Facelifted "direct message" to "private message"nickago2015-07-015-8/+8
| |/ /
* | | Merge pull request #114 from asaadmahmoodspin/masterCorey Hulen2015-07-0112-5/+21
|\ \ \
| * | | Improving targeting for row contentAsaad Mahmood2015-07-011-5/+5
| * | | Just arranging the css more properlyAsaad Mahmood2015-07-011-1/+4
| * | | Fixing height for contentAsaad Mahmood2015-07-012-3/+5
| * | | Fixing css issues in IE, adding doctype to html filesAsaad Mahmood2015-07-0111-0/+11
| |/ /
* | | Merge pull request #92 from nickago/MM-1151Corey Hulen2015-07-014-14/+27
|\ \ \
| * | | Finally fixed the git weirdnessnickago2015-07-014-14/+27
| |/ /
* | | Merge pull request #90 from ralder/patch-1Corey Hulen2015-07-011-1/+1
|\ \ \ | |/ / |/| |
| * | fix pr #82 mention list inside modalralder2015-06-291-1/+1
* | | 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
|\ \ \