Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Increase test timeouts to accommodate slow dev environments | Teviot Systems | 2015-10-02 | 1 | -5/+5 |
| | |||||
* | Merge pull request #898 from tmuwandi/patch-1 | it33 | 2015-10-01 | 1 | -2/+2 |
|\ | | | | | Fixed incorrect punctuation | ||||
| * | Update prod-ubuntu.md | tmuwandi | 2015-10-01 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #894 from thomas9987/patch-1 | it33 | 2015-10-01 | 1 | -2/+1 |
|\ \ | | | | | | | Fixed formatting | ||||
| * | | Fixed formatting | thomas9987 | 2015-10-01 | 1 | -2/+1 |
| | | | | | | | | | Removed empty bullet point | ||||
* | | | Merge pull request #897 from chuck5/patch-1 | it33 | 2015-10-01 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Changed comma to period to correct grammar error. | ||||
| * | | Changed comma to period to correct grammar error. | chuck5 | 2015-10-01 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #895 from drbaker/patch-1 | it33 | 2015-10-01 | 1 | -4/+4 |
|\ \ | |/ |/| | Grammar fix: "setup" -> "set up" in header lines | ||||
| * | Grammar fix: "setup" -> "set up" in header lines | drbaker | 2015-10-01 | 1 | -4/+4 |
|/ | |||||
* | Adding link to prod install | it33 | 2015-10-01 | 1 | -0/+1 |
| | |||||
* | Merge pull request #859 from mattermost/PLT-409 | Christopher Speller | 2015-10-01 | 1 | -0/+6 |
|\ | | | | | PLT-409 add warning to at rest salt gen | ||||
| * | PLT-409 add warning to at rest salt gen | =Corey Hulen | 2015-09-29 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #866 from mattermost/PLT-345 | Christopher Speller | 2015-10-01 | 3 | -1/+56 |
|\ \ | | | | | | | PLT-345 adding client side logging | ||||
| * | | PLT-345 adding client side logging | =Corey Hulen | 2015-09-29 | 3 | -1/+56 |
| | | | |||||
* | | | Update CHANGELOG.md | it33 | 2015-09-30 | 1 | -6/+11 |
| | | | |||||
* | | | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-30 | 14 | -40/+178 |
|\ \ \ | |||||
| * | | | Updating dockerfile for release v1.0.0-rc2 | Christopher Speller | 2015-09-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #884 from mattermost/permissions-fix | Christopher Speller | 2015-09-30 | 7 | -25/+26 |
| |\ \ \ | | | | | | | | | | | Permissions fixes. Fixes PLT-487 | ||||
| | * | | | Fixing some locations to use the IsTeamAdmin function which properly checks ↵ | Christopher Speller | 2015-09-30 | 7 | -11/+15 |
| | | | | | | | | | | | | | | | | | | | | for system admin permissions. | ||||
| | * | | | Fixing permissions for system admin. Fixes slack import for system admins. | Christopher Speller | 2015-09-30 | 1 | -14/+11 |
| | | | | | |||||
| * | | | | Merge pull request #883 from mattermost/plt-496 | Joram Wilander | 2015-09-30 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |/| | | | PLT-496 Adding MIT compiled licence to build | ||||
| | * | | | Adding MIT compiled licence to build | Christopher Speller | 2015-09-30 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #882 from mattermost/PLT-499 | Harrison Healey | 2015-09-30 | 3 | -12/+12 |
| |\ \ \ | | | | | | | | | | | PLT-499 fixing broken salts | ||||
| | * | | | PLT-499 fixing broken salts | =Corey Hulen | 2015-09-30 | 3 | -12/+12 |
| |/ / / | |||||
| * | | | Merge pull request #877 from mattermost/lfbrock-patch-2 | Christopher Speller | 2015-09-30 | 1 | -0/+123 |
| |\ \ \ | | | | | | | | | | | Update NOTICE.txt to include goexif, react-bootstrap, graphics-go, bootstrap colorpicker | ||||
| | * | | | Updated to include goexif, react-bootstrap, graphics-go, and bootstrap ↵ | lfbrock | 2015-09-30 | 1 | -0/+123 |
| |/ / / | | | | | | | | | | | | | colorpicker | ||||
| * | | | Merge pull request #874 from mattermost/it33-patch-1 | it33 | 2015-09-30 | 1 | -0/+14 |
| |\ \ \ | | | | | | | | | | | Create MIT-COMPILED-LICENSE.md | ||||
| | * | | | Create MIT-COMPILED-LICENSE.md | it33 | 2015-09-30 | 1 | -0/+14 |
| |/ / / | |||||
* | | | | Merge pull request #867 from chengweiv5/team-name | Christopher Speller | 2015-09-30 | 2 | -6/+8 |
|\ \ \ \ | | | | | | | | | | | Team name | ||||
| * | | | | Check team name in correct sequence to avoid null pointer | Chengwei Yang | 2015-09-30 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
| * | | | | Change minimal length of team name to 3 character | Chengwei Yang | 2015-09-30 | 2 | -4/+4 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | team named in 3 character in non-English language is very common, e.g. in Chinese. Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | | | Merge pull request #876 from hmhealey/echotestfix | Christopher Speller | 2015-09-30 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Added slight delay to TestEchoCommand to account for race condition | ||||
| * | | | | Added slight delay to TestEchoCommand to account for race condition | hmhealey | 2015-09-30 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Merge pull request #852 from asaadmahmoodspin/plt-383 | Joram Wilander | 2015-09-30 | 2 | -21/+26 |
|\ \ \ \ \ | |/ / / / |/| | | | | plt-383 - Slack upload UI improvements | ||||
| * | | | | Adding a quick fix for search bar bg related to themes | Asaad Mahmood | 2015-09-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Updating slack import UI with states | Asaad Mahmood | 2015-09-30 | 1 | -59/+33 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-383 | Asaad Mahmood | 2015-09-30 | 51 | -534/+589 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #875 from mattermost/rhs-scroll-fix | Joram Wilander | 2015-09-30 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix RHS scrolling center pane. | ||||
| * | | | | | Fix RHS scrolling center pane. | JoramWilander | 2015-09-30 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #863 from mattermost/PLT-475 | Christopher Speller | 2015-09-30 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | PLT-475 making sure session is properly removed | ||||
| * | | | | PLT-475 making sure session is properly removed | =Corey Hulen | 2015-09-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #865 from mattermost/PLT-404 | Harrison Healey | 2015-09-29 | 8 | -32/+114 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-404 adding basic error checking to config file. | ||||
| * | | | | | PLT-404 adding basic error checking to config file. | =Corey Hulen | 2015-09-29 | 8 | -32/+114 |
| |/ / / / | |||||
* | | | | | Merge pull request #862 from mattermost/PLT-435 | Joram Wilander | 2015-09-29 | 3 | -1/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-435 adding system console link to RHS | ||||
| * | | | | | PLT-435 adding system console link to RHS | =Corey Hulen | 2015-09-29 | 3 | -1/+24 |
| |/ / / / | |||||
* | | | | | Merge pull request #864 from esethna/patch-3 | Harrison Healey | 2015-09-29 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Update email notification help text | ||||
| * | | | | | Update email notification help text | esethna | 2015-09-29 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | Current: Email notifications are sent for mentions and direct messages after you have been away from Mattermost for 5 minutes. New: Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from Mattermost for more than 5 minutes. | ||||
* | | | | | Merge pull request #860 from mattermost/PLT-470 | Harrison Healey | 2015-09-29 | 2 | -1/+23 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-470 Adding STMP server connection check | ||||
| * | | | | | PLT-470 Adding STMP server connection check | =Corey Hulen | 2015-09-29 | 2 | -1/+23 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #861 from mattermost/PLT-469 | Harrison Healey | 2015-09-29 | 1 | -1/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-469 skip redirect if verified email required. |