Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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 | |||||
| * | | | | | | | | Update test-markdown-basics.md | lfbrock | 2016-01-12 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #1852 from mattermost/PLT-1608 | Joram Wilander | 2016-01-12 | 51 | -660/+159 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | PLT-1608 Upgrading logging package | |||||
| * | | | | | | | modifying config | =Corey Hulen | 2016-01-11 | 1 | -23/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Upgrading logging package | =Corey Hulen | 2016-01-11 | 20 | -625/+122 | |
| | | | | | | | | ||||||
| * | | | | | | | Upgrade logging package | =Corey Hulen | 2016-01-11 | 31 | -35/+60 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'release-1.4' | =Corey Hulen | 2016-01-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #1860 from mattermost/push-test-v1.4 | Corey Hulen | 2016-01-11 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Adding push-test.mattermost.com | |||||
| | * | | | | | | Adding push-test.mattermost.com | it33 | 2016-01-11 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
* | | / / / / | Merge pull request #1858 from mattermost/release-1.4 | Corey Hulen | 2016-01-11 | 8 | -0/+322 | |
|\| | | | | | | |_|/ / / / |/| | | | | | Release 1.4 rc1 | |||||
| * | | | | | Release 1.4 rc1 | =Corey Hulen | 2016-01-11 | 8 | -0/+322 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1856 from mattermost/react-rm-debug | Corey Hulen | 2016-01-11 | 1 | -7/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | Removing react debugging | |||||
| * | | | | | Removing react debugging | =Corey Hulen | 2016-01-11 | 1 | -7/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1854 from hmhealey/plt1608 | Joram Wilander | 2016-01-11 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-1608 Fixed developer errors storing invalid error objects | |||||
| * | | | | Fixed developer errors storing invalid error objects | hmhealey | 2016-01-11 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #1849 from hmhealey/plt1578 | Corey Hulen | 2016-01-11 | 2 | -8/+36 | |
|\ \ \ \ | |/ / / |/| | | | PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs | |||||
| * | | | Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs | hmhealey | 2016-01-11 | 2 | -8/+36 | |
| | | | | ||||||
* | | | | Merge pull request #1822 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-01-11 | 5 | -5/+13 | |
|\ \ \ \ | | | | | | | | | | | Multiple UI Improvements | |||||
| * | | | | Updating fix | Asaad Mahmood | 2016-01-08 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Multiple UI Improvements | Asaad Mahmood | 2016-01-07 | 5 | -5/+13 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 10 | -38/+144 | |
|\ \ \ \ | | | | | | | | | | | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel | |||||
| * | | | | Added a loading screen to ChannelMembersModal and made it pull all channel ↵ | hmhealey | 2016-01-07 | 1 | -13/+36 | |
| | | | | | | | | | | | | | | | | | | | | members before rendering | |||||
| * | | | | Made ChannelInviteModal pull all channel members before rendering | hmhealey | 2016-01-07 | 3 | -10/+35 | |
| | | | | | ||||||
| * | | | | Added the ability to get more channel members from getChannelExtraInfo | hmhealey | 2016-01-06 | 6 | -15/+73 | |
| | | | | | ||||||
* | | | | | Merge pull request #1828 from hmhealey/plt1397 | Joram Wilander | 2016-01-11 | 1 | -15/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1397/PLT-1580/PLT-1614 Fixed spacing around markdown lists and paragraphs | |||||
| * | | | | | Fixed spacing between paragraphs in a post | hmhealey | 2016-01-07 | 1 | -1/+4 | |
| | | | | | | ||||||
| * | | | | | Fixed vertical spacing between lists and paragraphs in post bodies | hmhealey | 2016-01-07 | 1 | -11/+3 | |
| | | | | | | ||||||
| * | | | | | Removed extra space below unordered lists | hmhealey | 2016-01-07 | 1 | -5/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Update Upgrade-Guide.md | it33 | 2016-01-10 | 1 | -1/+1 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #1839 from mattermost/lfbrock-patch-2 | Corey Hulen | 2016-01-09 | 1 | -0/+43 | |
|\ \ \ \ | | | | | | | | | | | Create test-search.md |