summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/asaadmahmoodspin/platformAsaad Mahmood2015-07-081-19/+32
|\
| * Small changes and code clean-upReed Garmsen2015-07-071-2/+2
| |
| * Changed loading logic for retrieving more channels to allow for loading ↵Reed Garmsen2015-07-071-20/+33
| | | | | | | | animation to be inserted into the More... menu that allows you to join more channels while waiting for the list of channels to load
* | Merge pull request #148 from hmhealey/mm1488Christopher Speller2015-07-081-2/+3
|\ \ | | | | | | MM-1488 Changed code to dismiss mention list to not trigger when you click on the list itself
| * | Changed code to dismiss mention list to not trigger when you click on the ↵hmhealey2015-07-071-2/+3
| |/ | | | | | | list itself
* / Changed textarea resizeability from being a blanket statement to everything ↵Reed Garmsen2015-07-073-3/+3
|/ | | | to only the ones with issues
* Merge pull request #134 from nickago/MM-1313Christopher Speller2015-07-071-0/+8
|\ | | | | Mm 1313 Made the typing notification more responsive/accurate
| * Changed socket event to a props based changenickago2015-07-061-9/+9
| |
| * Typing notification disappears when message is sentnickago2015-07-061-1/+4
| |
| * Typing notifier resets on channel changenickago2015-07-061-4/+9
| |
* | Merge pull request #135 from asaadmahmoodspin/masterCorey Hulen2015-07-062-2/+2
|\ \ | | | | | | MM-1461 - Updating Mattermost UI
| * | MM-1461 - Updating Mattermost UIAsaad Mahmood2015-07-062-2/+2
| | |
* | | Merge pull request #133 from nickago/MM-794Corey Hulen2015-07-061-0/+7
|\ \ \ | | | | | | | | MM-794 Force the extra info to update asych on user creation
| * | | 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 textbox
| * | 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 #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
| | |
* | | 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 ↵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-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
|\ \ \ | | | | | | | | 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
| | | |
| * | | 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
| * | | | Improving modal UIAsaad Mahmood2015-07-171-3/+3
| | | | |
| * | | | Improving channel notificationsAsaad Mahmood2015-07-171-3/+3
| |/ / /
* / / / Changed valet title and description for clarityReed Garmsen2015-07-021-3/+4
|/ / /
* | | 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 #115 from nickago/MM-1425Corey Hulen2015-07-015-8/+8
|\ \ \ | | | | | | | | MM-1425 Facelifted "direct message" to "private message"
| * | | Facelifted "direct message" to "private message"nickago2015-07-015-8/+8
| |/ /
* / / Finally fixed the git weirdnessnickago2015-07-013-14/+9
|/ /
* | Aligned front end and back end domain requirementsnickago2015-06-301-1/+3
| |
* | Merge pull request #109 from nickago/MM-1289Christopher Speller2015-06-301-3/+10
|\ \ | | | | | | Mm 1289 Now sorts extra channel members lexigraphically
| * | 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
|\ \ \ | | | | | | | | MM-1309 Fixed grammmatical issue in error message
| * | | Fixed grammmatical issue in error messageReed Garmsen2015-06-301-1/+1
| |/ /
* | | Merge pull request #106 from mattermost/mm-1119Joram Wilander2015-06-304-9/+65
|\ \ \ | |/ / |/| | fixes mm-1119 adds @all and @channel mention capabilites
| * | add default icon for non-user autocompletesJoramWilander2015-06-301-2/+8
| | |
| * | @all and @channel now auto-completeJoramWilander2015-06-293-3/+16
| | |
| * | added team-wide and channel-wide mentionsJoramWilander2015-06-291-5/+42
| | |