summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-106-8/+29
|\ \
| * \ Merge pull request #154 from nickago/MM-831Joram Wilander2015-07-102-0/+11
| |\ \ | | | | | | | | MM-831 Post timestamp now updates in real time
| | * | Added comments for the force update functionsnickago2015-07-092-0/+2
| | | |
| | * | Placed event listeners on higher level components to avoid app dispatcher vomitnickago2015-07-093-9/+9
| | | |
| | * | Merge branch 'master' of https://github.com/mattermost/platform into MM-831nickago2015-07-095-25/+49
| | |\| | | | | | | | | | | | | merge
| | * | Time change ping riding on the status interupt for timestamp updatenickago2015-07-091-0/+9
| | | |
| * | | fix bugs for pr #150 MM-895ralder2015-07-103-8/+14
| | | |
| * | | Merge pull request #155 from nickago/MM-1296Joram Wilander2015-07-091-0/+4
| |\ \ \ | | |_|/ | |/| | MM-1296 Server now notifies users they have been added to a new channel
| | * | Added curly bracenickago2015-07-091-1/+2
| | | |
| | * | Server now notifies users they have been added to a new channelnickago2015-07-091-0/+3
| | |/
* | / Improving mentions list and other UI improvementsAsaad Mahmood2015-07-102-9/+15
|/ /
* | Updating Ui for postsAsaad Mahmood2015-07-091-1/+12
| |
* | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-0919-232/+332
|\|
| * Merge pull request #145 from ralder/fix-tabIndex-channel_invite_modalJoram Wilander2015-07-092-93/+66
| |\ | | | | | | [webui] add missing tabIndex for channel members modal
| | * add missing tabIndex for channel members modalralder2015-07-072-93/+66
| | |
| * | Merge pull request #149 from rgarmsen2295/mm-1260Christopher Speller2015-07-081-1/+6
| |\ \ | | | | | | | | MM-1260 Member Invites can no longer be sent to emails already used to signup
| | * | Small tweaks and cleanupReed Garmsen2015-07-071-10/+1
| | | |
| | * | Added a server side check to see if members who are trying to be invited ↵Reed Garmsen2015-07-071-2/+16
| | |/ | | | | | | | | | have already been invited by checking the email. Client handles it as if it was an email error.
| * | Merge pull request #150 from mattermost/mm-895Joram Wilander2015-07-0815-124/+233
| |\ \ | | | | | | | | MM-895 Reorganization of browser storage.
| | * | Adding comments to change versions in syncChristopher Speller2015-07-081-0/+2
| | | |
| | * | Finishing centralization of BrowserStoreChristopher Speller2015-07-086-31/+46
| | | |
| | * | Modifying all storage to use session storage. Also adding an abstraction ↵Christopher Speller2015-07-0811-100/+192
| | |/ | | | | | | | | | layer to add current user id as a prefix to most keys.
| * | Semicolons and a bug fixnickago2015-07-081-5/+5
| | |
| * | Changed linkify to autolinker and wrote gap-bridging codenickago2015-07-082-12/+25
| | |
* | | MM-1444 - Fixing text selection issueAsaad Mahmood2015-07-091-2/+1
| | |
* | | MM-1469 - Loading message in more channel modalAsaad Mahmood2015-07-081-3/+4
| | |
* | | 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 ↵Reed Garmsen2015-07-073-22/+35
| |/ | | | | | | 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-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 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 #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-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 ↵Reed Garmsen2015-07-021-0/+1
| | | | | | | | | | | | errors to be thrown in IE10