Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-2.0' | Christopher Speller | 2016-02-10 | 18 | -319/+32 |
|\ | |||||
| * | Merge pull request #2126 from ZBoxApp/new-locs | Christopher Speller | 2016-02-10 | 2 | -12/+37 |
| |\ | | | | | | | RC2 - A few cmds strings | ||||
| * | | Fixing version unit test | Christopher Speller | 2016-02-09 | 1 | -10/+5 |
| | | | |||||
| * | | Updating version.go for 2.0 | Christopher Speller | 2016-02-09 | 1 | -0/+1 |
| | | | |||||
| * | | Updating dockerfiles for 2.0 | Christopher Speller | 2016-02-09 | 16 | -309/+26 |
| | | | |||||
* | | | Merge pull request #2125 from ZBoxApp/new-locs | Corey Hulen | 2016-02-09 | 2 | -12/+37 |
|\ \ \ | |/ / |/| / | |/ | A few cmds strings | ||||
| * | A few cmds strings | Elias Nahum | 2016-02-09 | 2 | -12/+37 |
|/ | |||||
* | Merge pull request #2122 from hmhealey/plt1544 | Christopher Speller | 2016-02-09 | 8 | -80/+97 |
|\ | | | | | PLT-1544 Replaced Permalink popover with a Permalink modal | ||||
| * | Replaced Permalink popover with a Permalink modal | hmhealey | 2016-02-09 | 8 | -80/+97 |
| | | |||||
* | | Merge pull request #2121 from ZBoxApp/PLT-1925 | Christopher Speller | 2016-02-09 | 2 | -2/+2 |
|\ \ | | | | | | | PLT-1925: Fix delete_post_modal showing unnecessary $ sign | ||||
| * | | Fix delete_post_modal showing unnecessary $ sign | Elias Nahum | 2016-02-09 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2120 from mattermost/slash-help | Christopher Speller | 2016-02-09 | 4 | -172/+167 |
|\ \ \ | | | | | | | | | Fixing slash command help | ||||
| * | | | Fixing slash command help | =Corey Hulen | 2016-02-09 | 4 | -172/+167 |
| | | | | |||||
* | | | | Merge pull request #2119 from mattermost/esethna-patch-1 | Christopher Speller | 2016-02-09 | 1 | -0/+68 |
|\ \ \ \ | |_|/ / |/| | | | Update NOTICE.txt to add react-intl and go-i18n | ||||
| * | | | Update NOTICE.txt | Eric Sethna | 2016-02-09 | 1 | -0/+68 |
| |/ / | |||||
* | | | Merge pull request #2117 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-02-09 | 2 | -0/+11 |
|\ \ \ | | | | | | | | | Fixing single line code block on firefox | ||||
| * | | | Fixing single line code block on firefox | Asaad Mahmood | 2016-02-09 | 2 | -0/+11 |
| |/ / | |||||
* | | | Merge pull request #2118 from mattermost/reset-theme-fix | Christopher Speller | 2016-02-09 | 1 | -4/+9 |
|\ \ \ | |/ / |/| | | Reset theme on close of settings modal | ||||
| * | | Reset theme on close of settings modal | JoramWilander | 2016-02-09 | 1 | -4/+9 |
|/ / | |||||
* | | Merge pull request #2105 from mattermost/esethna-patch-1 | Corey Hulen | 2016-02-09 | 1 | -0/+181 |
|\ \ | | | | | | | Update CHANGELOG.md | ||||
| * | | Update CHANGELOG.md | it33 | 2016-02-09 | 1 | -0/+5 |
| | | | |||||
| * | | Update CHANGELOG.md | it33 | 2016-02-09 | 1 | -8/+5 |
| | | | |||||
| * | | Update CHANGELOG.md | it33 | 2016-02-09 | 1 | -17/+24 |
| | | | |||||
| * | | Update CHANGELOG.md | it33 | 2016-02-08 | 1 | -24/+38 |
| | | | |||||
| * | | Update CHANGELOG.md | Eric Sethna | 2016-02-08 | 1 | -2/+1 |
| | | | |||||
| * | | Update CHANGELOG.md | Eric Sethna | 2016-02-08 | 1 | -0/+159 |
| | | | | | | | | | Add v2.0.0 | ||||
* | | | Merge pull request #2116 from mattermost/plt-1714 | Corey Hulen | 2016-02-09 | 1 | -3/+8 |
|\ \ \ | | | | | | | | | PLT-1714 Adding hashing of binary to build process | ||||
| * | | | Adding hashing of binary to build process | Christopher Speller | 2016-02-09 | 1 | -3/+8 |
| | | | | |||||
* | | | | Merge pull request #2115 from mattermost/plt-1506 | Joram Wilander | 2016-02-09 | 2 | -3/+5 |
|\ \ \ \ | | | | | | | | | | | PLT-1506 Fixing mentions for inactive browser tabs. | ||||
| * | | | | Changing meation behaviour to show meantion when viewing channel but tab is ↵ | Christopher Speller | 2016-02-09 | 2 | -3/+5 |
| |/ / / | | | | | | | | | | | | | not focused | ||||
* | | | | Merge pull request #2099 from hmhealey/plt1883 | Corey Hulen | 2016-02-09 | 3 | -8/+50 |
|\ \ \ \ | | | | | | | | | | | PLT-1883 Update search result components when we receive channels | ||||
| * | | | | Changed SearchResults to update when the channel store receives data | hmhealey | 2016-02-08 | 2 | -8/+28 |
| | | | | | |||||
| * | | | | Added support for ES6 Maps to Utils.areObjectsEqual | hmhealey | 2016-02-08 | 1 | -0/+22 |
| | | | | | |||||
* | | | | | Merge pull request #2113 from mattermost/slash-command-fixes | Christopher Speller | 2016-02-09 | 2 | -2/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | Multiple minor slash command fixes | ||||
| * | | | | | Multiple minor slash command fixes | JoramWilander | 2016-02-09 | 2 | -2/+8 |
| | | | | | | |||||
* | | | | | | Merge pull request #2114 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-09 | 15 | -39/+61 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Multiple UI Improvements | ||||
| * | | | | | Improving mentions issue with long names | Asaad Mahmood | 2016-02-09 | 2 | -0/+18 |
| | | | | | | |||||
| * | | | | | Reverting config.json file | Asaad Mahmood | 2016-02-09 | 1 | -27/+2 |
| | | | | | | |||||
| * | | | | | Reverting config | Asaad Mahmood | 2016-02-09 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Multiple UI Improvements | Asaad Mahmood | 2016-02-09 | 15 | -43/+72 |
| |/ / / / | |||||
* | | | | | Merge pull request #2111 from ZBoxApp/locs | Joram Wilander | 2016-02-09 | 4 | -3/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add/Remove & Fix loc strings | ||||
| * | | | | Add/Remove & Fix loc strings | Elias Nahum | 2016-02-09 | 4 | -3/+4 |
|/ / / / | |||||
* | | | | Merge pull request #2107 from rgarmsen2295/plt-1715 | Joram Wilander | 2016-02-08 | 3 | -7/+0 |
|\ \ \ \ | | | | | | | | | | | PLT-1715 - Removed the ability to disable file storage from the admin console | ||||
| * | | | | Removed the ability to disable file storage from the admin console | Reed Garmsen | 2016-02-08 | 3 | -7/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #2108 from rgarmsen2295/plt-1718 | Joram Wilander | 2016-02-08 | 2 | -0/+12 |
|\ \ \ \ | | | | | | | | | | | PLT-1718 - Provides error message on user sign-up page when no sign-up methods are enabled | ||||
| * | | | | Provides error message on user sign-up page when no sign-up methods are enabled | Reed Garmsen | 2016-02-08 | 2 | -0/+12 |
| |/ / / | |||||
* | | | | Merge pull request #2109 from mattermost/fix-device | Corey Hulen | 2016-02-08 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fixing attaching device id | ||||
| * | | | Fixing attaching device id | =Corey Hulen | 2016-02-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2106 from mattermost/PLT-1900 | Joram Wilander | 2016-02-08 | 7 | -56/+43 |
|\ \ \ | | | | | | | | | PLT-1900 removing lang from preview and making spanish beta | ||||
| * | | | Fixing eslint error | =Corey Hulen | 2016-02-08 | 1 | -1/+0 |
| | | | |