summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/asaadmahmoodspin/platformAsaad Mahmood2015-07-083-21/+34
|\
| * Small changes and code clean-upReed Garmsen2015-07-071-2/+2
| * Changed loading logic for retrieving more channels to allow for loading anima...Reed Garmsen2015-07-073-22/+35
* | Merge pull request #148 from hmhealey/mm1488Christopher Speller2015-07-081-2/+3
|\ \
| * | Changed code to dismiss mention list to not trigger when you click on the lis...hmhealey2015-07-071-2/+3
| |/
* / Changed textarea resizeability from being a blanket statement to everything t...Reed Garmsen2015-07-073-3/+3
|/
* Merge pull request #134 from nickago/MM-1313Christopher Speller2015-07-071-0/+8
|\
| * Changed socket event to a props based changenickago2015-07-062-20/+9
| * Typing notification disappears when message is sentnickago2015-07-062-3/+4
| * Typing notifier resets on channel changenickago2015-07-062-4/+22
* | Merge pull request #135 from asaadmahmoodspin/masterCorey Hulen2015-07-062-2/+2
|\ \
| * | MM-1461 - Updating Mattermost UIAsaad Mahmood2015-07-062-2/+2
* | | Merge pull request #133 from nickago/MM-794Corey Hulen2015-07-061-0/+7
|\ \ \
| * | | Force the extra info to update asychnickago2015-07-061-0/+7
| | |/ | |/|
* | | Merge pull request #132 from mattermost/mm-1250Corey Hulen2015-07-062-2/+6
|\ \ \ | |_|/ |/| |
| * | fixes mm-1250 mention highlights should now align in textboxJoramWilander2015-06-172-2/+6
* | | 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
|\ \
| * | Added comment for later referenceReed Garmsen2015-07-021-1/+1
| * | Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) e...Reed Garmsen2015-07-021-4/+6
| * | Removed option that does not workReed Garmsen2015-07-021-2/+2
| * | Added two possible options for removing blue bar error, will choose one laterReed Garmsen2015-07-021-1/+1
| * | Added line that disables caching with a ajax client call that was causing err...Reed Garmsen2015-07-021-0/+1
* | | Merge pull request #116 from nickago/MM-1341Joram Wilander2015-07-031-0/+5
|\ \ \ | |/ / |/| |
| * | 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
* | | Restructured logic to flow more naturally and be cleanerReed Garmsen2015-07-021-42/+44
* | | Added logic for loading animation to appear when posts have yet to be loaded....Reed Garmsen2015-07-022-5/+15
* | | Added new files for adding new loading animationReed Garmsen2015-07-021-0/+3
* | | MM-1319 - Copy link and background changeAsaad Mahmood2015-07-181-1/+1
* | | Merge pull request #123 from asaadmahmoodspin/mm-1426Corey Hulen2015-07-023-14/+30
|\ \ \
| * | | Changing var currentUser in post_rightAsaad Mahmood2015-07-171-6/+6
| * | | Changing var name from currentUser to currentUserCssAsaad Mahmood2015-07-171-3/+3
| * | | 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-171-3/+3
| * | | | | Improving channel notificationsAsaad Mahmood2015-07-171-3/+3
| | |/ / / | |/| | |
* | | | | 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
| |/ / /
* | | | 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 #115 from nickago/MM-1425Corey Hulen2015-07-015-8/+8
|\ \ \
| * | | Facelifted "direct message" to "private message"nickago2015-07-015-8/+8
| |/ /
* / / Finally fixed the git weirdnessnickago2015-07-014-14/+27
|/ /
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-04 14:23:03 +0000