summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #124 from asaadmahmoodspin/masterCorey Hulen2015-07-023-4/+7
|\
| * Updating marginsAsaad Mahmood2015-07-181-3/+5
| * Minor fixes to mattermost UIAsaad Mahmood2015-07-182-1/+2
|/
* Merge pull request #123 from asaadmahmoodspin/mm-1426Corey Hulen2015-07-0213-36/+68
|\
| * Changing var currentUser in post_rightAsaad Mahmood2015-07-171-6/+6
| * Changing var name from currentUser to currentUserCssAsaad Mahmood2015-07-171-3/+3
| * Adding highlights and improving css for posts on responsive screensAsaad Mahmood2015-07-173-7/+4
| * Merge pull request #2 from rgarmsen2295/mm-1453asaadmahmoodspin2015-07-022-8/+24
| |\
| | * Added additional class to the markup indicating if the post came from the cur...Reed Garmsen2015-07-022-8/+24
| * | Merge branch 'master' of https://github.com/mattermost/platform into mm-1426Asaad Mahmood2015-07-171-11/+13
| |\ \
| * | | Improving modal UIAsaad Mahmood2015-07-172-4/+3
| * | | Improving channel notificationsAsaad Mahmood2015-07-171-3/+3
| * | | Improving image modalsAsaad Mahmood2015-07-172-1/+2
| * | | Adding border radiusAsaad Mahmood2015-07-171-0/+1
| * | | MM-1426 - Updating UIAsaad Mahmood2015-07-179-19/+37
| | |/ | |/|
* | | Merge pull request #121 from rgarmsen2295/mm-1445Corey Hulen2015-07-021-3/+4
|\ \ \ | |_|/ |/| |
| * | Changed valet title and description for clarityReed Garmsen2015-07-021-3/+4
| |/
* | Merge pull request #120 from mattermost/get-teammate-fixCorey Hulen2015-07-021-11/+13
|\ \ | |/ |/|
| * make loop simplerJoramWilander2015-07-021-1/+1
| * 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 #117 from nickago/MM-1308Christopher Speller2015-07-021-1/+1
|\ \
| * | Changed offline timeout to 1 mintuenickago2015-07-011-1/+1
| |/
* | 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
| |/ / /
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 01:08:25 +0000