Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing merge | =Corey Hulen | 2015-12-17 | 1 | -27/+26 |
|\ | |||||
| * | Merge pull request #1747 from mattermost/RHEL-tweaks | Corey Hulen | 2015-12-17 | 1 | -27/+26 |
| |\ | | | | | | | Minor updates to RHEL instructions | ||||
| | * | Minor updates to RHEL instructions | it33 | 2015-12-17 | 1 | -27/+26 |
| |/ | |||||
* / | fixing some steps | =Corey Hulen | 2015-12-17 | 1 | -2/+3 |
|/ | |||||
* | rhel-install | =Corey Hulen | 2015-12-17 | 3 | -9/+256 |
| | |||||
* | Some refactoring | Christopher Speller | 2015-12-16 | 114 | -170/+6761 |
| | |||||
* | Clarifying single machine install works as well | it33 | 2015-12-16 | 1 | -1/+2 |
| | |||||
* | Merge pull request #1742 from mattermost/update-golang-deps | Corey Hulen | 2015-12-16 | 82 | -20712/+172 |
|\ | | | | | Updating go dependancies | ||||
| * | Updating go dependancies | Christopher Speller | 2015-12-16 | 82 | -20712/+172 |
|/ | |||||
* | Merge pull request #1739 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-16 | 2 | -3/+12 |
|\ | | | | | UI Improvements for online icon and permalink | ||||
| * | UI Improvements for online icon and permalink | Asaad Mahmood | 2015-12-16 | 2 | -3/+12 |
| | | |||||
* | | Merge pull request #1733 from hmhealey/plt1437 | Christopher Speller | 2015-12-16 | 12 | -38/+87 |
|\ \ | | | | | | | PLT-1437 PreferenceStore api changes and fixing CreatePost warning | ||||
| * | | Stopped CreatePost from responding to PreferenceStore changes before it gets ↵ | hmhealey | 2015-12-15 | 1 | -5/+11 |
| | | | | | | | | | | | | mounted | ||||
| * | | Improved PreferenceStore api when getting values | hmhealey | 2015-12-15 | 12 | -36/+79 |
| | | | |||||
* | | | Merge pull request #1710 from mattermost/plt-1498 | Christopher Speller | 2015-12-16 | 4 | -4/+48 |
|\ \ \ | |_|/ |/| | | PLT-1498 Add hashtag testing and allow special german characters | ||||
| * | | Add hashtag testing and allow special german characters | JoramWilander | 2015-12-11 | 4 | -4/+48 |
| | | | |||||
* | | | Merge pull request #1737 from mattermost/revert-1735-patch-43 | Corey Hulen | 2015-12-15 | 5 | -17/+22 |
|\ \ \ | | | | | | | | | Revert "Break test-emoticons into separate tests" | ||||
| * | | | Revert "Break test-emoticons into separate tests" | Corey Hulen | 2015-12-15 | 5 | -17/+22 |
|/ / / | |||||
* | | | Merge pull request #1736 from esethna/patch-46 | Corey Hulen | 2015-12-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update help text in privacy_settings.jsx | ||||
| * | | | Update help text in privacy_settings.jsx | Eric Sethna | 2015-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | help text for "show full name" updated. | ||||
* | | | | Merge pull request #1735 from esethna/patch-43 | Corey Hulen | 2015-12-15 | 5 | -22/+17 |
|\ \ \ \ | |/ / / |/| | | | Break test-emoticons into separate tests | ||||
| * | | | Create test-emoticons-4.md | Eric Sethna | 2015-12-15 | 1 | -0/+2 |
| | | | | | | | | | | | | Part 4 of 4 | ||||
| * | | | Create test-emoticons-3.md | Eric Sethna | 2015-12-15 | 1 | -0/+2 |
| | | | | | | | | | | | | Part 3 of 4 | ||||
| * | | | Create test-emoticons-2.md | Eric Sethna | 2015-12-15 | 1 | -0/+5 |
| | | | | | | | | | | | | Part 2 of 4 | ||||
| * | | | Break test-emoticons into separate tests | Eric Sethna | 2015-12-15 | 2 | -22/+8 |
|/ / / | | | | | | | Part 1 of 4 | ||||
* | | | Merge pull request #1732 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-12-15 | 19 | -2/+4110 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-15 | 19 | -2/+4110 |
| | | | | |||||
* | | | | Merge pull request #1734 from mattermost/channel-limit | Harrison Healey | 2015-12-15 | 2 | -8/+10 |
|\ \ \ \ | |/ / / |/| | | | Fixing channel limit | ||||
| * | | | Fixing channel limit | =Corey Hulen | 2015-12-15 | 2 | -8/+10 |
|/ / / | |||||
* | | | Merge pull request #1729 from hmhealey/plt886 | Joram Wilander | 2015-12-15 | 2 | -0/+10 |
|\ \ \ | |_|/ |/| | | PLT-886 Add additional max file size checks | ||||
| * | | Added serverside file size check for post attachments | hmhealey | 2015-12-15 | 2 | -1/+6 |
| | | | |||||
| * | | Added clientside check for profile image size | hmhealey | 2015-12-14 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #1727 from mattermost/plt-1481 | Christopher Speller | 2015-12-15 | 1 | -2/+11 |
|\ \ \ | | | | | | | | | PLT-1481 Force all colorpickers to update after theme pasted in | ||||
| * | | | Force all colorpickers to update after theme pasted in | JoramWilander | 2015-12-14 | 1 | -2/+11 |
| |/ / | |||||
* | | | Merge pull request #1730 from mattermost/PLT-1404 | Joram Wilander | 2015-12-15 | 3 | -0/+28 |
|\ \ \ | | | | | | | | | PLT-1404 signal login to other tabs | ||||
| * | | | PLT-1404 signal login to other tags | =Corey Hulen | 2015-12-14 | 3 | -0/+28 |
| |/ / | |||||
* | | | Merge pull request #1726 from mattermost/PLT-1447 | Christopher Speller | 2015-12-15 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | PLT-1447 fixing sending name in push notifications | ||||
| * | | | PLT-1447 fixing sending name in push notifications | =Corey Hulen | 2015-12-14 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #1725 from mattermost/fix-console-err | Christopher Speller | 2015-12-15 | 8 | -0/+50 |
|\ \ \ | | | | | | | | | Adding error bar message when console error detected | ||||
| * | | | Setting default to false | =Corey Hulen | 2015-12-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Adding error bar message when console error detected | =Corey Hulen | 2015-12-14 | 8 | -0/+50 |
| |/ / | |||||
* | | | Merge pull request #1709 from erikthered/arch-dev-setup | Christopher Speller | 2015-12-15 | 1 | -2/+49 |
|\ \ \ | | | | | | | | | Add development setup instructions for Archlinux | ||||
| * | | | Correct PATH line and remove GOROOT line per feedback from @crspeller | Erik Nelson | 2015-12-14 | 1 | -2/+1 |
| | | | | |||||
| * | | | Add development setup instructions for Archlinux | Erik Nelson | 2015-12-11 | 1 | -0/+48 |
| | |/ | |/| | |||||
* | | | Merge branch 'release-1.3' | Christopher Speller | 2015-12-14 | 11 | -25/+41 |
|\ \ \ | |||||
| * | | | Updating dockerfile for release v1.3.0 | Christopher Speller | 2015-12-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1724 from asaadmahmoodspin/sidebarFix | Christopher Speller | 2015-12-14 | 4 | -7/+8 |
| |\ \ \ | | | | | | | | | | | Fixing IE scrolling issue and also fixing horizontal scrollbar | ||||
| | * | | | Fixing pageup issue | Asaad Mahmood | 2015-12-15 | 2 | -7/+1 |
| | | | | | |||||
| | * | | | Updating container fluid css | Asaad Mahmood | 2015-12-14 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | Adding sidebar animation back | Asaad Mahmood | 2015-12-14 | 1 | -0/+5 |
| | | | | |