summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #1058 from rgarmsen2295/plt-434Joram Wilander2015-10-151-20/+279
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-434 Improve Audit History Format
| * | | | | | Properly handle missing session IDs regardless of caseReed Garmsen2015-10-141-5/+9
| | | | | | |
| * | | | | | Added all remaining audit descriptions to supported auditsReed Garmsen2015-10-141-47/+59
| | | | | | |
| * | | | | | Added more individual audit handling, primarily involving the userReed Garmsen2015-10-141-5/+51
| | | | | | |
| * | | | | | Added more supported audits to audit logReed Garmsen2015-10-141-73/+140
| | | | | | |
| * | | | | | Finished structure for formatting audits and began writing individual ↵Reed Garmsen2015-10-141-61/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | formatting for each audit
| * | | | | | Initial changes to audit log along with structure for handling different ↵Reed Garmsen2015-10-141-16/+75
| | |/ / / / | |/| | | | | | | | | | | | | | | | audit types
* | | | | | Update Production-Ubuntu.mdit332015-10-151-1/+1
| |_|_|/ / |/| | | |
* | | | | Updating /docs TOCit332015-10-141-1/+3
| |/ / / |/| | |
* | | | Merge pull request #1062 from mattermost/release-1.1.0Corey Hulen2015-10-141-1/+1
|\ \ \ \ | | |_|/ | |/| | Fixing doc
| * | | Fixing doc=Corey Hulen2015-10-141-1/+1
| | | |
* | | | Merge pull request #1053 from florianorben/markown_fixCorey Hulen2015-10-142-2/+2
|\ \ \ \ | | | | | | | | | | Don't auto-add http:// to mailto: and ftp: markdown links
| * | | | Don't auto-add http:// to mailto: and ftp: markdown linksFlorian Orben2015-10-142-2/+2
| | |/ / | |/| |
* | | | Merge pull request #1061 from mattermost/release-1.1.0Corey Hulen2015-10-141-18/+23
|\ \ \ \ | | |/ / | |/| | Release 1.1.0 final merge
| * | | Merge pull request #1056 from esethna/patch-7Corey Hulen2015-10-141-18/+23
| |\ \ \ | | | | | | | | | | Update SMTP instructions
| | * | | Update SMTP instructionsesethna2015-10-141-18/+23
| |/ / / | | | | | | | | Needs dev review.
* | | | Clarifying descriptionit332015-10-141-1/+1
| | | |
* | | | Update Slack-Import.mdit332015-10-141-1/+1
| | | |
* | | | Clarifying instructionit332015-10-141-1/+1
| | | |
* | | | Adjusting formattingit332015-10-141-1/+1
| | | |
* | | | Update Slack-Import.mdit332015-10-141-6/+11
| | | |
* | | | Update Slack-Import.mdit332015-10-141-8/+10
| | | |
* | | | Update Slack-Import.mdit332015-10-141-1/+1
| |/ / |/| |
* | | Merge pull request #1047 from hmhealey/sidebarJoram Wilander2015-10-141-1/+1
|\ \ \ | | |/ | |/| Fixed overwritten CSS class in the sidebar
| * | Fixed overwritten CSS class in the sidebarhmhealey2015-10-141-1/+1
|/ /
* | Merge pull request #1046 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-1415-42/+74
|\ \ | | | | | | Multiple UI Improvements
| * | Multiple UI ImprovementsAsaad Mahmood2015-10-1415-42/+74
| | |
* | | Merge release branch 'release-1.1.0'Christopher Speller2015-10-146-24/+70
|\ \ \ | |/ / |/| / | |/
| * Updating dockerfile for release v1.1.0-rc3Christopher Speller2015-10-141-1/+1
| |
| * Merge pull request #1041 from mattermost/plt-603Christopher Speller2015-10-142-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.JoramWilander2015-10-132-8/+40
| |/
| * Merge pull request #1040 from mattermost/plt-601Christopher Speller2015-10-131-10/+10
| |\ | | | | | | PLT-601 Fixing user settings modal general tab.
| | * Merge branch 'release-1.1.0' into plt-601Christopher Speller2015-10-132-5/+19
| | |\ | | |/ | |/|
| * | Merge pull request #1036 from mattermost/PLT-602Christopher Speller2015-10-132-5/+19
| |\ \ | | | | | | | | PLT-602 combining welcome and verify email
| | * | PLT-602 combining welcome and verify email=Corey Hulen2015-10-132-5/+19
| |/ /
| | * Fixing user settings dialog so it desn't ask you to check your email unless ↵Christopher Speller2015-10-131-10/+10
| |/ | | | | | | you changed it
* | Merge pull request #993 from apaatsio/bootstrap-help-blockChristopher Speller2015-10-145-9/+8
|\ \ | | | | | | Use help-block class from Bootstrap
| * | Use help-block class from BootstrapAntti Ahti2015-10-095-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.mdit332015-10-131-2/+2
| | |
* | | Merge pull request #1042 from hmhealey/plt322-followupJoram Wilander2015-10-133-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 usernamehmhealey2015-10-133-6/+17
| | | |
* | | | Merge pull request #1017 from stasvovk/PLT-589Joram Wilander2015-10-132-4/+8
|\ \ \ \ | | | | | | | | | | PLT-589: changed Admin to Team Admin in Manage Team members
| * \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-1327-102/+491
| |\ \ \ \
| * \ \ \ \ Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589Stas Vovk2015-10-136-6/+21
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-126-6/+21
| | |\ \ \ \ \
| * | | | | | | replaced constructions like user.roles === 'admin' by ↵Stas Vovk2015-10-132-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Utils.isAdmin(user.roles) in manage members
| * | | | | | changed Admin to Team Admin in admin consoleStas Vovk2015-10-121-1/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into PLT-589Stas Vovk2015-10-1210-22/+20
| |\ \ \ \ \ \
| * | | | | | | changed Admin to Team Admin in Manage Team membersStas Vovk2015-10-121-1/+3
| | | | | | | |
* | | | | | | | Merge pull request #1038 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-137-13/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Multiple Ui Improvements