Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1057 from hmhealey/plt520 | Christopher Speller | 2015-10-15 | 5 | -137/+346 |
|\ | | | | | PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap | ||||
| * | Updated More Direct Channels modal and converted it to ReactBootstrap | hmhealey | 2015-10-14 | 5 | -137/+346 |
| | | |||||
* | | Merge pull request #1055 from florianorben/PLT-42 | Christopher Speller | 2015-10-15 | 2 | -0/+17 |
|\ \ | | | | | | | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading | ||||
| * | | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading | Florian Orben | 2015-10-14 | 2 | -0/+17 |
| | | | |||||
* | | | Merge pull request #1065 from apaatsio/clarify-system-menu | Harrison Healey | 2015-10-15 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | Add titles to clarify icons in system console | ||||
| * | | | Add titles to clarify icons in system console | Antti Ahti | 2015-10-15 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | The + and x icons in the team section can easily be misinterpreted as "Create team" and "Delete team". Added clarifying title text that the user can see when hovering on the icon. | ||||
* | | | | Merge pull request #1063 from mattermost/SMTP-update | Corey Hulen | 2015-10-15 | 1 | -45/+36 |
|\ \ \ \ | | | | | | | | | | | Updated to use System Console | ||||
| * | | | | Updated to use System Console | it33 | 2015-10-14 | 1 | -45/+36 |
| |/ / / | |||||
* | | | | Merge pull request #1058 from rgarmsen2295/plt-434 | Joram Wilander | 2015-10-15 | 1 | -20/+279 |
|\ \ \ \ | | | | | | | | | | | PLT-434 Improve Audit History Format | ||||
| * | | | | Properly handle missing session IDs regardless of case | Reed Garmsen | 2015-10-14 | 1 | -5/+9 |
| | | | | | |||||
| * | | | | Added all remaining audit descriptions to supported audits | Reed Garmsen | 2015-10-14 | 1 | -47/+59 |
| | | | | | |||||
| * | | | | Added more individual audit handling, primarily involving the user | Reed Garmsen | 2015-10-14 | 1 | -5/+51 |
| | | | | | |||||
| * | | | | Added more supported audits to audit log | Reed Garmsen | 2015-10-14 | 1 | -73/+140 |
| | | | | | |||||
| * | | | | Finished structure for formatting audits and began writing individual ↵ | Reed Garmsen | 2015-10-14 | 1 | -61/+132 |
| | | | | | | | | | | | | | | | | | | | | formatting for each audit | ||||
| * | | | | Initial changes to audit log along with structure for handling different ↵ | Reed Garmsen | 2015-10-14 | 1 | -16/+75 |
| | |/ / | |/| | | | | | | | | | | audit types | ||||
* | | | | Update Production-Ubuntu.md | it33 | 2015-10-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Updating /docs TOC | it33 | 2015-10-14 | 1 | -1/+3 |
| |/ / |/| | | |||||
* | | | Merge pull request #1062 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixing doc | ||||
| * | | | Fixing doc | =Corey Hulen | 2015-10-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1053 from florianorben/markown_fix | Corey Hulen | 2015-10-14 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Don't auto-add http:// to mailto: and ftp: markdown links | ||||
| * | | | | Don't auto-add http:// to mailto: and ftp: markdown links | Florian Orben | 2015-10-14 | 2 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1061 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-14 | 1 | -18/+23 |
|\ \ \ \ | | |/ / | |/| | | Release 1.1.0 final merge | ||||
| * | | | Merge pull request #1056 from esethna/patch-7 | Corey Hulen | 2015-10-14 | 1 | -18/+23 |
| |\ \ \ | | | | | | | | | | | Update SMTP instructions | ||||
| | * | | | Update SMTP instructions | esethna | 2015-10-14 | 1 | -18/+23 |
| |/ / / | | | | | | | | | Needs dev review. | ||||
* | | | | Clarifying description | it33 | 2015-10-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Clarifying instruction | it33 | 2015-10-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Adjusting formatting | it33 | 2015-10-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -6/+11 |
| | | | | |||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -8/+10 |
| | | | | |||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1047 from hmhealey/sidebar | Joram Wilander | 2015-10-14 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | Fixed overwritten CSS class in the sidebar | ||||
| * | | Fixed overwritten CSS class in the sidebar | hmhealey | 2015-10-14 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1046 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-14 | 15 | -42/+74 |
|\ \ | | | | | | | Multiple UI Improvements | ||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-10-14 | 15 | -42/+74 |
| | | | |||||
* | | | Merge release branch 'release-1.1.0' | Christopher Speller | 2015-10-14 | 6 | -24/+70 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Updating dockerfile for release v1.1.0-rc3 | Christopher Speller | 2015-10-14 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1041 from mattermost/plt-603 | Christopher Speller | 2015-10-14 | 2 | -8/+40 |
| |\ | | | | | | | RC3 - PLT-603 Fix webhook name not overriding in RHS and update webhook help text. | ||||
| | * | Fix webhook name not overriding in LHS and update webhook help text. | JoramWilander | 2015-10-13 | 2 | -8/+40 |
| |/ | |||||
| * | Merge pull request #1040 from mattermost/plt-601 | Christopher Speller | 2015-10-13 | 1 | -10/+10 |
| |\ | | | | | | | PLT-601 Fixing user settings modal general tab. | ||||
| | * | Merge branch 'release-1.1.0' into plt-601 | Christopher Speller | 2015-10-13 | 2 | -5/+19 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1036 from mattermost/PLT-602 | Christopher Speller | 2015-10-13 | 2 | -5/+19 |
| |\ \ | | | | | | | | | PLT-602 combining welcome and verify email | ||||
| | * | | PLT-602 combining welcome and verify email | =Corey Hulen | 2015-10-13 | 2 | -5/+19 |
| |/ / | |||||
| | * | Fixing user settings dialog so it desn't ask you to check your email unless ↵ | Christopher Speller | 2015-10-13 | 1 | -10/+10 |
| |/ | | | | | | | you changed it | ||||
* | | Merge pull request #993 from apaatsio/bootstrap-help-block | Christopher Speller | 2015-10-14 | 5 | -9/+8 |
|\ \ | | | | | | | Use help-block class from Bootstrap | ||||
| * | | Use help-block class from Bootstrap | Antti Ahti | 2015-10-09 | 5 | -9/+8 |
| | | | | | | | | | | | | | | | | | | Use help-block class provided by Bootstrap instead of using a custom form__hint class. We still override some styles from the Bootstrap class, though. | ||||
* | | | Update SMTP-Email-Setup.md | it33 | 2015-10-13 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1042 from hmhealey/plt322-followup | Joram Wilander | 2015-10-13 | 3 | -6/+17 |
|\ \ \ | | | | | | | | | PLT-322 Fixed leave direct channel button for users with a long username | ||||
| * | | | Fixed leave direct channel button for users with a long username | hmhealey | 2015-10-13 | 3 | -6/+17 |
| | | | | |||||
* | | | | Merge pull request #1017 from stasvovk/PLT-589 | Joram Wilander | 2015-10-13 | 2 | -4/+8 |
|\ \ \ \ | | | | | | | | | | | PLT-589: changed Admin to Team Admin in Manage Team members |