Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 |
| | | | | |||||
| * | | | Changing var name from currentUser to currentUserCss | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge pull request #2 from rgarmsen2295/mm-1453 | asaadmahmoodspin | 2015-07-02 | 2 | -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 Garmsen | 2015-07-02 | 2 | -8/+24 |
| | | | | | | | | | | | | | | | | | | | | current user | ||||
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1426 | Asaad Mahmood | 2015-07-17 | 1 | -11/+13 |
| |\ \ \ \ | |||||
| * | | | | | Improving modal UI | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Improving channel notifications | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #121 from rgarmsen2295/mm-1445 | Corey Hulen | 2015-07-02 | 1 | -3/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-1445 Changed valet title and description for clarity | ||||
| * | | | | Changed valet title and description for clarity | Reed Garmsen | 2015-07-02 | 1 | -3/+4 |
| |/ / / | |||||
* | | | | make loop simpler | JoramWilander | 2015-07-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix getDirectTeammate so that if teammate is the second id it doesn't return ↵ | JoramWilander | 2015-07-02 | 1 | -11/+13 |
|/ / / | | | | | | | | | | null | ||||
* | | | Merge pull request #118 from nickago/MM-1363 | Joram Wilander | 2015-07-02 | 1 | -3/+10 |
|\ \ \ | | | | | | | | | Mm 1363 Limit uploads to only JPEGs for profile pictures | ||||
| * | | | Changed ordering of steps for upload to imporve asthetic | nickago | 2015-07-01 | 1 | -2/+4 |
| | | | | |||||
| * | | | Restricted profile picture uploads to just JPEGs | nickago | 2015-07-01 | 1 | -1/+6 |
| |/ / |