Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | updating make | =Corey Hulen | 2015-06-25 | 17 | -4856/+10 | |
| | | | | | | ||||||
| * | | | | | inital travis file | =Corey Hulen | 2015-06-25 | 1 | -0/+5 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #128 from rgarmsen2295/mm-832 | Christopher Speller | 2015-07-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | MM-832 Fixed not being able to open channel notifications settings menu in IE10 | |||||
| * | | | | | 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 | 2 | -3/+3 | |
| | | | | | ||||||
| * | | | | Added two possible options for removing blue bar error, will choose one later | Reed Garmsen | 2015-07-02 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | 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 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Fixed and added links to process and forums | it33 | 2015-07-03 | 1 | -1/+9 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #126 from rgarmsen2295/mm-1210 | Joram Wilander | 2015-07-02 | 3 | -41/+125 | |
|\ \ \ \ | | | | | | | | | | | MM-1210 Added loading animation that is used while posts in a channel load | |||||
| * | | | | Restructured logic to flow more naturally and be cleaner | Reed Garmsen | 2015-07-02 | 1 | -42/+44 | |
| | | | | | ||||||
| * | | | | Added import statement to styles.scss | Reed Garmsen | 2015-07-02 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | 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 | 2 | -0/+71 | |
|/ / / / | ||||||
* | | | | Merge pull request #125 from asaadmahmoodspin/master | Christopher Speller | 2015-07-02 | 3 | -4/+2 | |
|\ \ \ \ | | | | | | | | | | | MM-1319 - Copy link and background change | |||||
| * | | | | Fixing padding in sidebar dropdown | Asaad Mahmood | 2015-07-18 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-18 | 0 | -0/+0 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #124 from asaadmahmoodspin/master | Corey Hulen | 2015-07-02 | 3 | -4/+7 | |
|\ \ \ \ \ | | | | | | | | | | | | | Minor fixes to mattermost UI | |||||
| | * | | | | MM-1319 - Copy link and background change | Asaad Mahmood | 2015-07-18 | 2 | -3/+1 | |
| |/ / / / | ||||||
| * | | | | Updating margins | Asaad Mahmood | 2015-07-18 | 1 | -3/+5 | |
| | | | | | ||||||
| * | | | | Minor fixes to mattermost UI | Asaad Mahmood | 2015-07-18 | 2 | -1/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #123 from asaadmahmoodspin/mm-1426 | Corey Hulen | 2015-07-02 | 13 | -36/+68 | |
|\ \ \ \ | | | | | | | | | | | 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 | |
| | | | | | ||||||
| * | | | | Adding highlights and improving css for posts on responsive screens | Asaad Mahmood | 2015-07-17 | 3 | -7/+4 | |
| | | | | | ||||||
| * | | | | 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 | 2 | -4/+3 | |
| | | | | | | | ||||||
| * | | | | | | Improving channel notifications | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | Improving image modals | Asaad Mahmood | 2015-07-17 | 2 | -1/+2 | |
| | | | | | | | ||||||
| * | | | | | | Adding border radius | Asaad Mahmood | 2015-07-17 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | MM-1426 - Updating UI | Asaad Mahmood | 2015-07-17 | 9 | -19/+37 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | 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 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #120 from mattermost/get-teammate-fix | Corey Hulen | 2015-07-02 | 1 | -11/+13 | |
|\ \ \ \ \ | |/ / / / |/| | | | | fix getDirectTeammate so that if teammate is the second id it doesn't return null | |||||
| * | | | | 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 | |
| |/ / / | ||||||
* | | | | Merge pull request #117 from nickago/MM-1308 | Christopher Speller | 2015-07-02 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | MM-1308 Changed offline timeout to 1 mintue | |||||
| * | | | | Changed offline timeout to 1 mintue | nickago | 2015-07-01 | 1 | -1/+1 | |
| |/ / / |