Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Notes to myself | Reed Garmsen | 2015-07-09 | 1 | -1/+6 |
| | |||||
* | Updating Ui for posts | Asaad Mahmood | 2015-07-09 | 1 | -1/+12 |
| | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-09 | 19 | -232/+332 |
|\ | |||||
| * | Merge pull request #145 from ralder/fix-tabIndex-channel_invite_modal | Joram Wilander | 2015-07-09 | 2 | -93/+66 |
| |\ | | | | | | | [webui] add missing tabIndex for channel members modal | ||||
| | * | add missing tabIndex for channel members modal | ralder | 2015-07-07 | 2 | -93/+66 |
| | | | |||||
| * | | Merge pull request #149 from rgarmsen2295/mm-1260 | Christopher Speller | 2015-07-08 | 1 | -1/+6 |
| |\ \ | | | | | | | | | MM-1260 Member Invites can no longer be sent to emails already used to signup | ||||
| | * | | Small tweaks and cleanup | Reed Garmsen | 2015-07-07 | 1 | -10/+1 |
| | | | | |||||
| | * | | Added a server side check to see if members who are trying to be invited ↵ | Reed Garmsen | 2015-07-07 | 1 | -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-895 | Joram Wilander | 2015-07-08 | 15 | -124/+233 |
| |\ \ | | | | | | | | | MM-895 Reorganization of browser storage. | ||||
| | * | | Adding comments to change versions in sync | Christopher Speller | 2015-07-08 | 1 | -0/+2 |
| | | | | |||||
| | * | | Finishing centralization of BrowserStore | Christopher Speller | 2015-07-08 | 6 | -31/+46 |
| | | | | |||||
| | * | | Modifying all storage to use session storage. Also adding an abstraction ↵ | Christopher Speller | 2015-07-08 | 11 | -100/+192 |
| | |/ | | | | | | | | | | layer to add current user id as a prefix to most keys. | ||||
| * | | Semicolons and a bug fix | nickago | 2015-07-08 | 1 | -5/+5 |
| | | | |||||
| * | | Changed linkify to autolinker and wrote gap-bridging code | nickago | 2015-07-08 | 2 | -12/+25 |
| | | | |||||
* | | | MM-1444 - Fixing text selection issue | Asaad Mahmood | 2015-07-09 | 1 | -2/+1 |
| | | | |||||
* | | | MM-1469 - Loading message in more channel modal | Asaad Mahmood | 2015-07-08 | 1 | -3/+4 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/asaadmahmoodspin/platform | Asaad Mahmood | 2015-07-08 | 3 | -21/+34 |
|\ \ \ | |/ / |/| | | |||||
| * | | Small changes and code clean-up | Reed Garmsen | 2015-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | Changed loading logic for retrieving more channels to allow for loading ↵ | Reed Garmsen | 2015-07-07 | 3 | -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/mm1488 | Christopher Speller | 2015-07-08 | 1 | -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 ↵ | hmhealey | 2015-07-07 | 1 | -2/+3 |
| |/ | | | | | | | list itself | ||||
* / | Changed textarea resizeability from being a blanket statement to everything ↵ | Reed Garmsen | 2015-07-07 | 3 | -3/+3 |
|/ | | | | to only the ones with issues | ||||
* | Merge pull request #134 from nickago/MM-1313 | Christopher Speller | 2015-07-07 | 1 | -0/+8 |
|\ | | | | | Mm 1313 Made the typing notification more responsive/accurate | ||||
| * | Changed socket event to a props based change | nickago | 2015-07-06 | 2 | -20/+9 |
| | | |||||
| * | Typing notification disappears when message is sent | nickago | 2015-07-06 | 2 | -3/+4 |
| | | |||||
| * | Typing notifier resets on channel change | nickago | 2015-07-06 | 2 | -4/+22 |
| | | |||||
* | | Merge pull request #135 from asaadmahmoodspin/master | Corey Hulen | 2015-07-06 | 2 | -2/+2 |
|\ \ | | | | | | | MM-1461 - Updating Mattermost UI | ||||
| * | | MM-1461 - Updating Mattermost UI | Asaad Mahmood | 2015-07-06 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #133 from nickago/MM-794 | Corey Hulen | 2015-07-06 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | MM-794 Force the extra info to update asych on user creation | ||||
| * | | | Force the extra info to update asych | nickago | 2015-07-06 | 1 | -0/+7 |
| | |/ | |/| | |||||
* | | | Merge pull request #132 from mattermost/mm-1250 | Corey Hulen | 2015-07-06 | 2 | -2/+6 |
|\ \ \ | |_|/ |/| | | fixes mm-1250 mention highlights should now align in textbox | ||||
| * | | fixes mm-1250 mention highlights should now align in textbox | JoramWilander | 2015-06-17 | 2 | -2/+6 |
| | | | |||||
* | | | Fixed copy-paste error in code | Reed Garmsen | 2015-07-06 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed not being able to open channel notifications settings menu in IE10 | Reed Garmsen | 2015-07-06 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #127 from rgarmsen2295/mm-1047 | Joram Wilander | 2015-07-06 | 1 | -3/+6 |
|\ \ | | | | | | | MM-1047 Error code 200 IE 10 & 11 suppression within getMeSynchronous method | ||||
| * | | Added comment for later reference | Reed Garmsen | 2015-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) ↵ | Reed Garmsen | 2015-07-02 | 1 | -4/+6 |
| | | | | | | | | | | | | error is thrown | ||||
| * | | Removed option that does not work | Reed Garmsen | 2015-07-02 | 1 | -2/+2 |
| | | | |||||
| * | | Added two possible options for removing blue bar error, will choose one later | Reed Garmsen | 2015-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | Added line that disables caching with a ajax client call that was causing ↵ | Reed Garmsen | 2015-07-02 | 1 | -0/+1 |
| | | | | | | | | | | | | errors to be thrown in IE10 | ||||
* | | | Merge pull request #116 from nickago/MM-1341 | Joram Wilander | 2015-07-03 | 1 | -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 tactic | nickago | 2015-07-01 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed click response | nickago | 2015-07-01 | 1 | -3/+2 |
| | | | |||||
| * | | Inital attempt at active element checking | nickago | 2015-07-01 | 1 | -1/+7 |
| | | | |||||
* | | | Restructured logic to flow more naturally and be cleaner | Reed Garmsen | 2015-07-02 | 1 | -42/+44 |
| | | | |||||
* | | | Added logic for loading animation to appear when posts have yet to be ↵ | Reed Garmsen | 2015-07-02 | 2 | -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 animation | Reed Garmsen | 2015-07-02 | 1 | -0/+3 |
| | | | |||||
* | | | MM-1319 - Copy link and background change | Asaad Mahmood | 2015-07-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #123 from asaadmahmoodspin/mm-1426 | Corey Hulen | 2015-07-02 | 3 | -14/+30 |
|\ \ \ | | | | | | | | | MM-1426 - Updating UI | ||||
| * | | | Changing var currentUser in post_right | Asaad Mahmood | 2015-07-17 | 1 | -6/+6 |
| | | | |