summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* team code review=Corey Hulen2015-07-064-8/+10
|
* Merge pull request #128 from rgarmsen2295/mm-832Christopher Speller2015-07-061-2/+2
|\ | | | | MM-832 Fixed not being able to open channel notifications settings menu in IE10
| * Fixed copy-paste error in codeReed Garmsen2015-07-061-1/+1
| |
| * Fixed not being able to open channel notifications settings menu in IE10Reed Garmsen2015-07-061-2/+2
|/
* Merge pull request #127 from rgarmsen2295/mm-1047Joram Wilander2015-07-061-3/+6
|\ | | | | MM-1047 Error code 200 IE 10 & 11 suppression within getMeSynchronous method
| * Added comment for later referenceReed Garmsen2015-07-021-1/+1
| |
| * Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) ↵Reed Garmsen2015-07-021-4/+6
| | | | | | | | error is thrown
| * Removed option that does not workReed Garmsen2015-07-022-3/+3
| |
| * Added two possible options for removing blue bar error, will choose one laterReed Garmsen2015-07-022-2/+2
| |
| * Added line that disables caching with a ajax client call that was causing ↵Reed Garmsen2015-07-021-0/+1
| | | | | | | | errors to be thrown in IE10
* | Merge pull request #116 from nickago/MM-1341Joram Wilander2015-07-031-0/+5
|\ \ | | | | | | MM-1341 mention auto-complete now goes away if you move off it's specific textbox
| * | Removed a change originally made for a prior fix tacticnickago2015-07-011-1/+1
| | |
| * | Fixed click responsenickago2015-07-011-3/+2
| | |
| * | Inital attempt at active element checkingnickago2015-07-011-1/+7
| | |
* | | Fixed and added links to process and forumsit332015-07-031-1/+9
| |/ |/|
* | Merge pull request #126 from rgarmsen2295/mm-1210Joram Wilander2015-07-023-41/+125
|\ \ | | | | | | MM-1210 Added loading animation that is used while posts in a channel load
| * | Restructured logic to flow more naturally and be cleanerReed Garmsen2015-07-021-42/+44
| | |
| * | Added import statement to styles.scssReed Garmsen2015-07-021-0/+1
| | |
| * | Added logic for loading animation to appear when posts have yet to be ↵Reed Garmsen2015-07-022-5/+15
| | | | | | | | | | | | loaded. Added markup necessary for loading animation css. Removed a file that was no longer needed for the design.
| * | Added new files for adding new loading animationReed Garmsen2015-07-022-0/+71
|/ /
* | Merge pull request #125 from asaadmahmoodspin/masterChristopher Speller2015-07-023-4/+2
|\ \ | | | | | | MM-1319 - Copy link and background change
| * | Fixing padding in sidebar dropdownAsaad Mahmood2015-07-181-1/+1
| | |
| * | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-180-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #124 from asaadmahmoodspin/masterCorey Hulen2015-07-023-4/+7
|\ \ \ | | | | | | | | Minor fixes to mattermost UI
| | * | MM-1319 - Copy link and background changeAsaad Mahmood2015-07-182-3/+1
| |/ /
| * | 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
|\ \ | | | | | | MM-1426 - Updating UI
| * | 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
| |\ \ | | | | | | | | MM-1453 Added additional class to the markup indicating if the post came from the current user
| | * | Added additional class to the markup indicating if the post came from the ↵Reed Garmsen2015-07-022-8/+24
| | | | | | | | | | | | | | | | current user
| * | | 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
|\ \ \ \ | |_|/ / |/| | | MM-1445 Changed valet title and description for clarity
| * | | 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
|\ \ \ | |/ / |/| | fix getDirectTeammate so that if teammate is the second id it doesn't return null
| * | 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
|/ / | | | | | | null
* | Merge pull request #118 from nickago/MM-1363Joram Wilander2015-07-021-3/+10
|\ \ | | | | | | Mm 1363 Limit uploads to only JPEGs for profile pictures
| * | 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
|\ \ | | | | | | MM-1308 Changed offline timeout to 1 mintue
| * | Changed offline timeout to 1 mintuenickago2015-07-011-1/+1
| |/
* | Merge pull request #115 from nickago/MM-1425Corey Hulen2015-07-016-9/+9
|\ \ | | | | | | MM-1425 Facelifted "direct message" to "private message"