Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updating form-control focus | Asaad Mahmood | 2015-10-06 | 2 | -2/+6 |
| | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-06 | 3 | -5/+5 |
|\ | | | | | | | ui-improvements | ||||
| * | Merge branch 'sexybern-patch-1' | Christopher Speller | 2015-10-06 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'patch-1' of https://github.com/sexybern/platform into ↵ | Christopher Speller | 2015-10-06 | 1 | -2/+2 |
| | |\ | | | | | | | | | | | | | sexybern-patch-1 | ||||
| | | * | Update prod-ubuntu.md | sexybern | 2015-10-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #929 from hmhealey/plt439 | Joram Wilander | 2015-10-06 | 2 | -3/+3 |
| |\ \ \ | | |/ / | |/| | | PLT-439 Fixed Get Public Link button | ||||
| | * | | Fixed Get Public Link button | hmhealey | 2015-10-05 | 2 | -3/+3 |
| | | | | |||||
* | | | | Adding mention highlight setting and improving search highlight too | Asaad Mahmood | 2015-10-06 | 4 | -9/+32 |
| | | | | |||||
* | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-06 | 5 | -12/+15 |
|/ / / | |||||
* | | | Merge pull request #933 from mattermost/readme-fix | Christopher Speller | 2015-10-05 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | Fixing broken links in README.md | ||||
| * | | | Fixing broken links in README.md | Christopher Speller | 2015-10-05 | 1 | -5/+5 |
|/ / / | |||||
* | | | Merge pull request #927 from mattermost/lfbrock-patch-1 | Christopher Speller | 2015-10-05 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Added when to use https vs http to GitLab SSO instructions | ||||
| * | | Added when to use https vs http to GitLab SSO instructions | lfbrock | 2015-10-05 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #925 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-05 | 8 | -24/+20 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-05 | 8 | -24/+20 |
| | | | | |||||
* | | | | Merge pull request #922 from mattermost/plt-360 | Harrison Healey | 2015-10-05 | 33 | -308/+350 |
|\ \ \ \ | |_|/ / |/| | | | PLT-360 Upgrade and changes to ESLint | ||||
| * | | | Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵ | Christopher Speller | 2015-10-05 | 33 | -308/+350 |
| | | | | | | | | | | | | | | | | Adding new ESLint rules. Fixing new ESLint errors. | ||||
* | | | | Merge branch 'release-1.0.0' | Christopher Speller | 2015-10-05 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Updating Dockerfile for release v1.0.0 | Christopher Speller | 2015-10-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #923 from mattermost/fix-load-scroll | Corey Hulen | 2015-10-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix missed binding for youtube data callback. | ||||
| * | | | | Fix missed binding for youtube data callback. | JoramWilander | 2015-10-05 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #917 from mattermost/plt-420 | Corey Hulen | 2015-10-05 | 18 | -28/+59 |
|\ \ \ \ | | | | | | | | | | | Adding doc system to build. Updated docs, fixed links. | ||||
| * | | | | Adding doc system to build. Updated docs, fixed links. | Christopher Speller | 2015-10-05 | 18 | -28/+59 |
| | | | | | |||||
* | | | | | Merge pull request #914 from mattermost/plt-297 | Joram Wilander | 2015-10-05 | 12 | -10/+158 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-297 Add ability to override username and icon for posts from incoming webhooks. | ||||
| * | | | | | Update help text to mention the BOT tag for webhook posts. | JoramWilander | 2015-10-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add config options for overriding username and icon, and add BOT indicator ↵ | JoramWilander | 2015-10-05 | 11 | -17/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | next to webhook posts. | ||||
| * | | | | | Add ability to override username and icon for posts from incoming webhooks. | JoramWilander | 2015-10-02 | 5 | -8/+54 |
| | | | | | | |||||
* | | | | | | Adding note on command line tool | it33 | 2015-10-05 | 1 | -1/+3 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #915 from mattermost/plt-300 | Christopher Speller | 2015-10-05 | 5 | -28/+63 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word. | ||||
| * | | | | | Update allow/deny oauth page UI, and add ouath as reserved word. | JoramWilander | 2015-10-02 | 5 | -28/+63 |
| | | | | | | |||||
* | | | | | | Merge pull request #903 from mattermost/PLT-44 | Christopher Speller | 2015-10-05 | 9 | -25/+127 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-44 allow team switching without the need to login | ||||
| * | | | | | | Fixing redirect issue | =Corey Hulen | 2015-10-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fixing issues | =Corey Hulen | 2015-10-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fixing issues | =Corey Hulen | 2015-10-02 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Fixing issue with being logged into other team | =Corey Hulen | 2015-10-01 | 1 | -9/+17 |
| | | | | | | | |||||
| * | | | | | | PLT-44 allow team switching without the need to login | =Corey Hulen | 2015-10-01 | 9 | -15/+109 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #887 from asaadmahmoodspin/plt-375 | Joram Wilander | 2015-10-05 | 17 | -89/+69 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | plt-375 - Making modals compatible with themes | ||||
| * | | | | | | Increasing spacing for bottom unread notification | Asaad Mahmood | 2015-10-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Updating theme colours for popovers, drop downs etc | Asaad Mahmood | 2015-10-05 | 6 | -52/+33 |
| | | | | | | | |||||
| * | | | | | | Updating search colours | Asaad Mahmood | 2015-10-05 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Updating jpg to png for theme names | Asaad Mahmood | 2015-10-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375 | Asaad Mahmood | 2015-10-05 | 2 | -12/+38 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Changing jpeg images back to png | Asaad Mahmood | 2015-10-02 | 8 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375 | Asaad Mahmood | 2015-10-02 | 31 | -281/+572 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx | ||||
| * | | | | | | | pot-375 - Making modals compatible with themes | Asaad Mahmood | 2015-10-01 | 18 | -52/+51 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #900 from mattermost/PLT-462 | Harrison Healey | 2015-10-05 | 8 | -3/+141 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | PLT-462 Adding diagnostic info | ||||
| * | | | | | | | Fixing break | =Corey Hulen | 2015-10-02 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Adding offical build function | =Corey Hulen | 2015-10-02 | 3 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into PLT-462 | =Corey Hulen | 2015-10-02 | 27 | -268/+498 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | PLT-462 Adding diagnostic info | =Corey Hulen | 2015-10-01 | 7 | -3/+137 |
| | | | | | | | |