Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merging | =Corey Hulen | 2016-01-15 | 4 | -31/+15 |
|\ | |||||
| * | Remove extra config info | JoramWilander | 2016-01-14 | 1 | -24/+1 |
| | | |||||
| * | Merge pull request #1894 from mattermost/release-1.4 | Corey Hulen | 2016-01-14 | 2 | -4/+4 |
| |\ | | | | | | | Release 1.4 | ||||
| | * | Fixing dockerfile for release | =Corey Hulen | 2016-01-14 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #1892 from mattermost/sso-email-fix | Corey Hulen | 2016-01-14 | 1 | -3/+3 |
| | |\ | | | | | | | | | Encode url query properly for SSO switching | ||||
| | | * | Encode url query properly for SSO switching | JoramWilander | 2016-01-14 | 1 | -3/+3 |
| | |/ | |||||
| * | | Merge pull request #1888 from mattermost/fix-droid | Corey Hulen | 2016-01-14 | 1 | -3/+10 |
| |\ \ | | | | | | | | | Fixing android push | ||||
| | * \ | Merge branch 'master' into fix-droid | =Corey Hulen | 2016-01-14 | 2 | -2/+2 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | Fixing android push | =Corey Hulen | 2016-01-14 | 1 | -3/+10 |
| | | | | |||||
* | | | | finishing up commands UI | =Corey Hulen | 2016-01-14 | 4 | -70/+310 |
| | | | | |||||
* | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 104 | -847/+1940 |
|\| | | | |||||
| * | | | Fix old l4g references | JoramWilander | 2016-01-14 | 2 | -2/+2 |
| |/ / | |||||
| * | | Minor fix | JoramWilander | 2016-01-14 | 1 | -5/+0 |
| | | | |||||
| * | | Merge pull request #1887 from mattermost/editions | Joram Wilander | 2016-01-14 | 24 | -43/+900 |
| |\ \ | | | | | | | | | Editions | ||||
| | * | | Final updates | JoramWilander | 2016-01-14 | 7 | -27/+86 |
| | | | | |||||
| | * | | Fix error message | JoramWilander | 2016-01-14 | 1 | -5/+10 |
| | | | | |||||
| | * | | Minor update to about modal | JoramWilander | 2016-01-14 | 1 | -4/+1 |
| | | | | |||||
| | * | | Remove bin from gitignore | JoramWilander | 2016-01-14 | 2 | -2/+0 |
| | | | | |||||
| | * | | Add some unit tests | JoramWilander | 2016-01-14 | 4 | -10/+105 |
| | | | | |||||
| | * | | Added license validation and settings | JoramWilander | 2016-01-14 | 20 | -33/+736 |
| |/ / | |||||
| * | | Merge pull request #1855 from rgarmsen2295/plt-1006 | Corey Hulen | 2016-01-13 | 4 | -7/+45 |
| |\ \ | | | | | | | | | PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip | ||||
| | * | | Changed statistics to show usernames with an email tooltip | Reed Garmsen | 2016-01-11 | 4 | -7/+45 |
| | | | | |||||
| * | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-13 | 5 | -6/+20 |
| |\ \ \ | | | | | | | | | | | Adding away icon and changing online and offline icons | ||||
| | * | | | Adding away icon and changing online and offline icons | Asaad Mahmood | 2016-01-11 | 5 | -6/+20 |
| | | | | | |||||
| * | | | | Merge pull request #1850 from mattermost/preview-mode | Corey Hulen | 2016-01-13 | 2 | -2/+4 |
| |\ \ \ \ | | | | | | | | | | | | | Documenting how Preview Mode is disabled | ||||
| | * | | | | Update email_settings.jsx | it33 | 2016-01-09 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update Configuration-Settings.md | it33 | 2016-01-09 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Documenting how Preview Mode turns off | it33 | 2016-01-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #1878 from mattermost/release-1.4 | Corey Hulen | 2016-01-12 | 3 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | Fixing docker files for 1.4 RC2 | ||||
| | * | | | | Fixing config file | =Corey Hulen | 2016-01-12 | 1 | -2/+19 |
| | | | | | | |||||
| | * | | | | Fixing docker files for 1.4 RC2 | =Corey Hulen | 2016-01-12 | 4 | -21/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #1876 from mattermost/release-1.4 | Corey Hulen | 2016-01-12 | 6 | -5/+10 |
| |\| | | | | | | | | | | | | | | | | Release 1.4 RC2 | ||||
| | * | | | | Update docker to 1.4 RC2 | =Corey Hulen | 2016-01-12 | 3 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge pull request #1872 from mattermost/plt-1667 | Corey Hulen | 2016-01-12 | 2 | -2/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | | | PLT-1667 Support old OAuth routes | ||||
| | | * | | | | Add removal comments | JoramWilander | 2016-01-12 | 1 | -2/+2 |
| | | | | | | | |||||
| | | * | | | | Support old oauth routes | JoramWilander | 2016-01-12 | 2 | -2/+4 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #1862 from mattermost/lfbrock-patch-1 | Corey Hulen | 2016-01-12 | 1 | -0/+3 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | Update changelog.md | ||||
| | | * | | | | Update CHANGELOG.md | lfbrock | 2016-01-11 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | Update CHANGELOG.md | lfbrock | 2016-01-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Update CHANGELOG.md | lfbrock | 2016-01-11 | 1 | -1/+0 |
| | | | | | | | |||||
| | | * | | | | Update CHANGELOG.md | lfbrock | 2016-01-11 | 1 | -0/+3 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #1866 from mattermost/fix-docker-14 | Corey Hulen | 2016-01-11 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Fixing dockerfile | ||||
| | | * | | | | | Fixing dockerfile | =Corey Hulen | 2016-01-11 | 1 | -2/+2 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #1830 from rgarmsen2295/plt-1599 | Joram Wilander | 2016-01-12 | 1 | -2/+8 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-1599 Help text in invite member modal now reflects the default channel name | ||||
| | * | | | | | | Help text in invite member modal now updates according to town-square ↵ | Reed Garmsen | 2016-01-07 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display name | ||||
| * | | | | | | | Merge pull request #1857 from esethna/patch-51 | Joram Wilander | 2016-01-12 | 1 | -14/+13 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update test-attachments.md | ||||
| | * | | | | | | | Update test-attachments.md | Eric Sethna | 2016-01-11 | 1 | -14/+13 |
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | Update test doc after changes were made to how some audio and video files display and preview. | ||||
| * | | | | | | | Merge pull request #1863 from esethna/patch-53 | Joram Wilander | 2016-01-12 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update test-markdown-basics.md | ||||
| | * | | | | | | | Update test-markdown-basics.md | Eric Sethna | 2016-01-11 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add carriage return tests | ||||
| * | | | | | | | | Merge pull request #1873 from mattermost/lfbrock-patch-2 | Joram Wilander | 2016-01-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update test-markdown-basics.md |