Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #647 from asaadmahmoodspin/ui-changes | Corey Hulen | 2015-09-10 | 2 | -3/+9 |
|\ | | | | | PM-183 and PM-162 - Updating UI for more modal and unread notification bar | ||||
| * | Removing border from first tr tds in more modal | Asaad Mahmood | 2015-09-10 | 1 | -0/+5 |
| | | |||||
| * | PM-183 and PM-162 - Updating UI for more modal and unread notification bar | Asaad Mahmood | 2015-09-10 | 2 | -7/+8 |
|/ | |||||
* | Merge release branch 'release-0.7.0' | Christopher Speller | 2015-09-10 | 2 | -1/+2 |
|\ | |||||
| * | Updating dockerfile for release v0.7.1 | Christopher Speller | 2015-09-10 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #641 from mattermost/fix-sso-email-verify | Christopher Speller | 2015-09-10 | 1 | -0/+1 |
| |\ | | | | | | | HOTFIX for 0.7.0 - Set EmailVerified to true for users signing up with SSO. | ||||
| | * | Set EmailVerified to true for users signing up with SSO. | JoramWilander | 2015-09-10 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #639 from mattermost/sso-doc-update | Corey Hulen | 2015-09-10 | 1 | -1/+1 |
|\ \ | | | | | | | Update SSO documentation with new config file setting. | ||||
| * | | Update SSO documentation with new config file setting. | JoramWilander | 2015-09-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #638 from asaadmahmoodspin/ui-changes | Joram Wilander | 2015-09-10 | 1 | -7/+12 |
|\ \ \ | | | | | | | | | Fixing attachment button in RHS | ||||
| * | | | Fixing attachment button in RHS | Asaad Mahmood | 2015-09-10 | 1 | -7/+12 |
|/ / / | |||||
* | | | Merge pull request #636 from hmhealey/validusername | Christopher Speller | 2015-09-10 | 2 | -9/+1 |
|\ \ \ | | | | | | | | | Removed pointless attempt to verify a new user's username | ||||
| * | | | Removed pointless attempt to verify a new user's username | hmhealey | 2015-09-09 | 2 | -9/+1 |
| | | | | |||||
* | | | | Merge pull request #635 from hmhealey/plt159 | Christopher Speller | 2015-09-10 | 1 | -3/+5 |
|\ \ \ \ | | | | | | | | | | | PLT-159/MM-2074 Changed unread posts indicator to not be shown for the current channel | ||||
| * | | | | PLT-159 Changed unread posts indicator to not be shown for the current channel | hmhealey | 2015-09-09 | 1 | -3/+5 |
| |/ / / | |||||
* | | | | Merge pull request #633 from asaadmahmoodspin/ui-changes | Joram Wilander | 2015-09-10 | 3 | -3/+11 |
|\ \ \ \ | | | | | | | | | | | PLT-188 - Moving attachment button to the left on mobile UI | ||||
| * | | | | PLT-188 - Moving attachment button to the left and fixing buttons in modal ↵ | Asaad Mahmood | 2015-09-09 | 3 | -3/+11 |
| |/ / / | | | | | | | | | | | | | header | ||||
* | | | | Merge pull request #631 from asaadmahmoodspin/mm-1866 | Christopher Speller | 2015-09-10 | 6 | -29/+66 |
|\ \ \ \ | | | | | | | | | | | MM-1866 - Adding download icon and adding download links | ||||
| * | | | | Adding minor hover changes for settings | Asaad Mahmood | 2015-09-09 | 2 | -1/+14 |
| | | | | | |||||
| * | | | | MM-1825 - Improving UI for settings | Asaad Mahmood | 2015-09-09 | 4 | -24/+28 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1866 | Asaad Mahmood | 2015-09-09 | 8 | -25/+42 |
| |\| | | | |||||
| * | | | | MM-1866 - Adding download icon and adding download link for both file title ↵ | Asaad Mahmood | 2015-09-09 | 2 | -4/+24 |
| | | | | | | | | | | | | | | | | | | | | and download icon | ||||
* | | | | | Merge pull request #634 from mattermost/it33-patch-1 | Joram Wilander | 2015-09-10 | 1 | -3/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Cosmetic adjustment to title of README | ||||
| * | | | | Cosmetic adjustment to title of README | it33 | 2015-09-09 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #632 from mattermost/new-msg-scroll-fix | Joram Wilander | 2015-09-09 | 1 | -3/+7 |
|\ \ \ \ | |_|/ / |/| | | | Fix race condition where switching between two channels that both had… | ||||
| * | | | Fix race condition where switching between two channels that both had new ↵ | JoramWilander | 2015-09-09 | 1 | -3/+7 |
|/ / / | | | | | | | | | | messages sometimes caused improper scrolling. | ||||
* | | | Merge pull request #625 from asaadmahmoodspin/ui-changes | Christopher Speller | 2015-09-09 | 7 | -22/+35 |
|\ \ \ | |/ / |/| | | UI changes for various tickets | ||||
| * | | Adding symbol instead of × for close icon | Asaad Mahmood | 2015-09-09 | 1 | -1/+1 |
| | | | |||||
| * | | Removing jsx container from × in team_import_tab.jsx | Asaad Mahmood | 2015-09-09 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-changes | Asaad Mahmood | 2015-09-09 | 20 | -3/+633 |
| |\ \ | |||||
| * | | | Improving formatting in team_import_tab.jsx | Asaad Mahmood | 2015-09-08 | 1 | -5/+7 |
| | | | | |||||
| * | | | UI changes for various tickets | Asaad Mahmood | 2015-09-08 | 7 | -18/+29 |
| | | | | |||||
* | | | | Merge pull request #629 from JessBot/patch-1 | Joram Wilander | 2015-09-09 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Punctuation and flow | ||||
| * | | | | Punctuation and flow | JessBot | 2015-09-08 | 1 | -4/+4 |
| | |/ / | |/| | | | | | | Added some punctuation and changes to some wording to make it flow better. | ||||
* | | | | Merge pull request #628 from mattermost/mm-2127 | Christopher Speller | 2015-09-09 | 3 | -20/+60 |
|\ \ \ \ | | | | | | | | | | | MM-2127 Added send icon button to create post control for mobile view. | ||||
| * | | | | Added send icon button to create post control for mobile view. | JoramWilander | 2015-09-08 | 3 | -20/+60 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #623 from mattermost/plt-35 | Christopher Speller | 2015-09-09 | 8 | -106/+250 |
|\ \ \ \ | |_|/ / |/| | | | PLT-35 Add post list container to hold mounted post lists for faster rendering/channel switching. | ||||
| * | | | Add post list container to hold mounted post lists for faster ↵ | JoramWilander | 2015-09-08 | 8 | -106/+250 |
| |/ / | | | | | | | | | | rendering/channel switching. | ||||
* | | | Merge pull request #626 from mattermost/mm-2125 | Christopher Speller | 2015-09-08 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | MM-2125 Resize create post control when file previews are added. | ||||
| * | | | Resize create post control when file previews are added. | JoramWilander | 2015-09-08 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge pull request #602 from mattermost/mm-1409 | Joram Wilander | 2015-09-08 | 16 | -0/+589 |
|\ \ \ | | | | | | | | | MM-1409 Adding ability to export data from mattermost | ||||
| * | | | Adding ability to export data from mattermost | Christopher Speller | 2015-09-04 | 16 | -0/+589 |
| | | | | |||||
* | | | | Merge pull request #622 from LAndreas/patch-1 | Corey Hulen | 2015-09-08 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix deadlink to AWS file in doc | ||||
| * | | | | Fix deadlink to AWS file | Andreas Litt | 2015-09-07 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #593 from nickago/MM-1892 | Corey Hulen | 2015-09-08 | 2 | -1/+37 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | MM-1892 Added help text to username, nickname, and fullname | ||||
| * | | | | Added refactoring to pass style check | nickago | 2015-09-04 | 1 | -5/+6 |
| | | | | | |||||
| * | | | | Added help text to username, nickname, and fullname | nickago | 2015-09-04 | 2 | -1/+36 |
| | | | | | |||||
* | | | | | Merge pull request #621 from asaadmahmoodspin/ui-changes | Joram Wilander | 2015-09-08 | 1 | -8/+25 |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-2123 and MM-2124 - UI changes | ||||
| * | | | | MM-2123 and MM-2124 - UI changes | Asaad Mahmood | 2015-09-07 | 1 | -8/+25 |
|/ / / / | |||||
* | | | | Merge pull request #618 from mattermost/it33-patch-2 | Joram Wilander | 2015-09-07 | 4 | -10/+28 |
|\ \ \ \ | | | | | | | | | | | Multiple documentation improvements |