summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge pull request #115 from nickago/MM-1425Corey Hulen2015-07-016-9/+9
| |\ \
| | * | Facelifted "direct message" to "private message"nickago2015-07-016-9/+9
| | |/
| * | 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 #62 from jedisct1/authenticated-encryptionCorey Hulen2015-06-301-6/+32
| |\ \
| | * | SQL store: use authenticated encryptionFrank Denis2015-06-241-6/+32
| * | | Merge pull request #110 from nickago/MM-1430Corey Hulen2015-06-303-3/+19
| |\ \ \
| | * | | Added the ability to have hashtags with dashes in themnickago2015-06-303-3/+19
| * | | | 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
| | |/ / /
| * | | | Merge pull request #111 from rgarmsen2295/mm-1305Joram Wilander2015-06-301-8/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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-3010-18/+99
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | added mentioned username to default mention keysJoramWilander2015-06-301-1/+1
| | * | | @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-293-11/+61
| * | | | Merge pull request #107 from mattermost/revert-91-MM-1289Christopher Speller2015-06-301-6/+1
| |\ \ \ \
| | * | | | 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
| | |/ / / /
| * | | | | Merge pull request #100 from asaadmahmoodspin/masterCorey Hulen2015-06-291-1/+1
| |\ \ \ \ \
| | * | | | | MM-1268 - Updating button in email templateAsaad Mahmood2015-06-301-1/+1
| | * | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-303-2/+12
| | |\| | | |
| | * | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-2918-126/+247
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-282-2/+2
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge pull request #98 from mattermost/mm-1199Corey Hulen2015-06-2911-33/+102
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | update unit tests for default channelsJoramWilander2015-06-293-3/+26
| | * | | | | | add intro text specific to off-topic channelJoramWilander2015-06-292-1/+13
| | * | | | | | new users now join off-topic defaultlyJoramWilander2015-06-294-16/+43