summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md246
-rw-r--r--LICENSE.txt2
-rw-r--r--doc/README.md4
-rw-r--r--doc/install/release-numbering.md17
-rw-r--r--doc/install/single-container-install.md7
-rw-r--r--docker/0.7/Dockerfile2
-rw-r--r--web/react/utils/utils.jsx2
-rw-r--r--web/sass-files/sass/partials/_responsive.scss33
8 files changed, 297 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..5876dc894
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,246 @@
+# Mattermost Changelog
+
+## UNDER DEVELOPMENT - Release v0.8.0 (Beta2)
+
+The "UNDER DEVELOPMENT" section of the Mattermost changelog appears in the product's `master` branch to note key changes committed to master and are on their way to the next stable release. When a stable release is pushed the "UNDER DEVELOPMENT" heading is removed from the final changelog of the release.
+
+- **Release candidate anticipated:** September 28, 2015
+- **Final release anticipated:** October 2, 2015
+
+### Release Highlights
+
+- [See Product Roadmap for anticipated features](https://mattermost.atlassian.net/issues/?filter=10002)
+
+### New Features
+
+- [See Product Roadmap for anticipated features](https://mattermost.atlassian.net/issues/?filter=10002)
+
+### Improvements
+
+Documentation
+
+- Updated software and hardware requirements documentation
+- Re-organized install instructions out of README and into separate files
+- Consolidated licensing information into LICENSE.txt and NOTICE.txt
+
+Performance
+
+- Enabled Javascript optimizations
+
+Code Quality
+
+- Reformatted Javascript per Mattermost Style Guide
+
+### Bug Fixes
+
+- Fixed performance issue with slow typing on iOS
+
+### Contributors
+
+Many thanks to our external contributors. In no particular order:
+
+- TBA
+
+## Release v0.7.0 (Beta1)
+
+Released 2015-09-05
+
+### Release Highlights
+
+#### Improved GitLab Mattermost support
+
+Following the release of Mattermost v0.6.0 Alpha, GitLab 7.14 offered an automated install of Mattermost with GitLab Single-Sign-On (co-branded as "GitLab Mattermost") in its omnibus installer.
+
+New features, improvements, and bug fixes recommended by the GitLab community were incorporated into Mattermost v0.7.0 Beta1--in particular, extending support of GitLab SSO to team creation, and restricting team creation to users with verified emails from a configurable list of domains.
+
+#### Slack Import (Preview)
+
+Preview of Slack import functionality supports the processing of an "Export" file from Slack containing account information and public channel archives from a Slack team.
+
+- In the feature preview, emails and usernames from Slack are used to create new Mattermost accounts, which users can activate by going to the Password Reset screen in Mattermost to set new credentials.
+- Once logged in, users will have access to previous Slack messages shared in public channels, now imported to Mattermost.
+
+Limitations:
+
+- Slack does not export files or images your team has stored in Slack's database. Mattermost will provide links to the location of your assets in Slack's web UI.
+- Slack does not export any content from private groups or direct messages that your team has stored in Slack's database.
+- The Preview release of Slack Import does not offer pre-checks or roll-back and will not import Slack accounts with username or email address collisions with existing Mattermost accounts. Also, Slack channel names with underscores will not import. Also, mentions do not yet resolve as Mattermost usernames (still show Slack ID). These issues are being addressed in [Mattermost v0.8.0 Migration Support](https://mattermost.atlassian.net/browse/PLT-22?filter=10002).
+
+### New Features
+
+GitLab Mattermost
+
+- Ability to create teams using GitLab SSO (previously GitLab SSO only supported account creation and sign-in)
+- Ability to restrict team creation to GitLab SSO and/or users with email verified from a specific list of domains.
+
+File and Image Sharing
+
+- New drag-and-drop file sharing to messages and comments
+- Ability to paste images from clipboard to messages and comments
+
+Messaging, Comments and Notifications
+
+- Send messages faster with from optimistic posting and retry on failure
+
+Documentation
+
+- New style guidelines for Go, React and Javascript
+
+### Improvements
+
+Messaging, Comments and Notifications
+
+- Performance improvements to channel rendering
+- Added "Unread posts" in left hand sidebar when notification indicator is off-screen
+
+Documentation
+
+- Install documentation improved based on early adopter feedback
+
+### Bug Fixes
+
+- Fixed multiple issues with GitLab SSO, installation and on-boarding
+- Fixed multiple IE 10 issues
+- Fixed broken link in verify email function
+- Fixed public links not working on mobile
+
+### Contributors
+
+Many thanks to our external contributors. In no particular order:
+
+- [asubset](https://github.com/asubset)
+- [felixbuenemann](https://github.com/felixbuenemann)
+- [CtrlZvi](https://github.com/CtrlZvi)
+- [BastienDurel](https://github.com/BastienDurel)
+- [manusajith](https://github.com/manusajith)
+- [doosp](https://github.com/doosp)
+- [zackify](https://github.com/zackify)
+- [willstacey](https://github.com/willstacey)
+
+Special thanks to the GitLab Mattermost early adopter community who influenced this release, and who play a pivotal role in bringing Mattermost to over 100,000 organizations using GitLab today. In no particular order:
+
+- [cifvts](http://forum.mattermost.org/users/cifvts/activity)
+- [Chryb](https://gitlab.com/u/Chryb)
+- [cookacounty](https://gitlab.com/u/cookacounty)
+- [bweston92](https://gitlab.com/u/bweston92)
+- [mablae](https://gitlab.com/u/mablae)
+- [picharmer](https://gitlab.com/u/picharmer)
+- [cmtonkinson](https://gitlab.com/u/cmtonkinson)
+- [cmthomps](https://gitlab.com/u/cmthomps)
+- [m.gamperl](https://gitlab.com/u/m.gamperl)
+- [StanMarsh](https://gitlab.com/u/StanMarsh)
+- [alx1](https://gitlab.com/u/alx1)
+- [jeanmarc-leroux](https://gitlab.com/u/jeanmarc-leroux)
+- [dnoe](https://gitlab.com/u/dnoe)
+- [dblessing](https://gitlab.com/u/dblessing)
+- [mechanicjay](https://gitlab.com/u/mechanicjay)
+- [larsemil](https://gitlab.com/u/larsemil)
+- [vga](https://gitlab.com/u/vga)
+- [stanhu](https://gitlab.com/u/stanhu)
+- [kohenkatz](https://gitlab.com/u/kohenkatz)
+- [RavenB1](https://gitlab.com/u/RavenB1)
+- [booksprint](http://forum.mattermost.org/users/booksprint/activity)
+- [scottcorscadden](http://forum.mattermost.org/users/scottcorscadden/activity)
+- [sskmani](http://forum.mattermost.org/users/sskmani/activity)
+- [gosure](http://forum.mattermost.org/users/gosure/activity)
+- [jigarshah](http://forum.mattermost.org/users/jigarshah/activity)
+
+Extra special thanks to GitLab community leaders for successful release of GitLab Mattermost Alpha:
+
+- [marin](https://gitlab.com/u/marin)
+- [sytse](https://gitlab.com/u/sytse)
+
+
+## Release v0.6.0 (Alpha)
+
+Released 2015-08-07
+
+### Release Highlights
+
+- Simplified on-prem install
+- Support for GitLab Mattermost (GitLab SSO, Postgres support, IE 10+ support)
+
+### Compatibility
+
+*Note: While use of Mattermost Preview (v0.5.0) and Mattermost Alpha (v0.6.0) in production is not recommended, we document compatibility considerations for a small number of organizations running Mattermost in production, supported directly by Mattermost product team.*
+
+- Switched Team URLs from team.domain.com to domain.com/team
+
+### New Features
+
+GitLab Mattermost
+
+- OAuth2 support for GitLab Single-Sign-On
+- PostgreSQL support for GitLab Mattermost users
+- Support for Internet Explorer 10+ for GitLab Mattermost users
+
+File and Image Sharing
+
+- New thumbnails and formatting for files and images
+
+Messaging, Comments and Notifications
+
+- Users now see posts they sent highlighted in a different color
+- Mentions can now also trigger on user-defined words
+
+Security and Administration
+
+- Enable users to view and log out of active sessions
+- Team Admin can now delete posts from any user
+
+On-boarding
+
+- “Off-Topic” now available as default channel, in addition to “Town Square”
+
+### Improvements
+
+Installation
+
+- New "ByPassEmail" setting enables Mattermost to operate without having to set up email
+- New option to use local storage instead of S3
+- Removed use of Redis to simplify on-premise installation
+
+On-boarding
+
+- Team setup wizard updated with usability improvements
+
+Documentation
+
+- Install documentation improved based on early adopter feedback
+
+### Contributors
+
+Many thanks to our external contributors. In no particular order:
+
+- [ralder](https://github.com/ralder)
+- [jedisct1](https://github.com/jedisct1)
+- [faebser](https://github.com/faebser)
+- [firstrow](https://github.com/firstrow)
+- [haikoschol](https://github.com/haikoschol)
+- [adamenger](https://github.com/adamenger)
+
+## Release v0.5.0 (Preview)
+
+Released 2015-06-24
+
+### Release Highlights
+
+- First release of Mattermost as a team communication service for sharing messagse and files across PCs and phones, with archiving and instant search.
+
+### New Features
+
+Messaging and File Sharing
+
+- Send messages, comments, files and images across public, private and 1-1 channels
+- Personalize notifications for unreads and mentions by channel
+- Use #hashtags to tag and find messages, discussions and files
+
+Archiving and Search
+
+- Search public and private channels for historical messages and comments
+- View recent mentions of your name, username, nickname, and custom search terms
+
+Anywhere Access
+
+- Use Mattermost from web-enabled PCs and phones
+- Define team-specific branding and color themes across your devices
diff --git a/LICENSE.txt b/LICENSE.txt
index aba905e79..f7e182eac 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -7,7 +7,7 @@ Mattermost server is made available under two separate licensing options:
- Free Software Foundation’s GNU AGPL v.3.0, subject to the exceptions outlined in this policy; or
- Commercial licenses available from SpinPunch, Inc. by contacting commercial@mattermost.com
-Admin Tools and Configuration Files (model/, web/static/, web/templates/, web/react/utils/, api/templates/ and all
+Admin Tools and Configuration Files (api/templates/, config/, model/, web/react/utils/, web/static/, web/templates/ and all
subdirectories thereof) are made available under:
- Apache License v2.0
diff --git a/doc/README.md b/doc/README.md
index ac00dc976..36d16b744 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,5 +1,9 @@
# Mattermost Documentation
+## General Information
+
+- [Mattermost Release Numbering Scheme](install/release-numbering.md)
+
## Administrator Documentation
### Installation
diff --git a/doc/install/release-numbering.md b/doc/install/release-numbering.md
new file mode 100644
index 000000000..71374f7ef
--- /dev/null
+++ b/doc/install/release-numbering.md
@@ -0,0 +1,17 @@
+### Mattermost Release Numbering
+
+Mattermost numbers its stable releases based on the following format:
+
+ `[Version Number].[Major Build Number].[Minor Build Number]`
+
+Version Number:
+
+- Indicates a major system release (e.g. 1.x.x, 2.x.x)
+
+Major Build Number:
+
+- Indicates significant new functionality, (e.g. 0.5.x, 0.6.x, 0.7.x)
+
+Minor Build Number:
+
+- Indicates bugfix/security releases (e.g. 1.2.5, 1.2.6)
diff --git a/doc/install/single-container-install.md b/doc/install/single-container-install.md
index 3e307ca74..772f3becf 100644
--- a/doc/install/single-container-install.md
+++ b/doc/install/single-container-install.md
@@ -1,10 +1,7 @@
-# Single Container Installation and Upgrade
+# Local Machine Setup and Upgrade
The following install instructions are for single-container installs of Mattermost using Docker for exploring product functionality and upgrading to newer versions.
-Local Machine Setup (Docker)
------------------------------
-
### Mac OSX ###
1. Install Boot2Docker using instructions at: http://docs.docker.com/installation/mac/
@@ -89,7 +86,7 @@ There are a few configuration settings you might want to adjust when setting up
The default single-container Docker instance for Mattermost is designed for product evaluation, and sets `ByPassEmail=true` so the product can run without enabling email, when doing so maybe difficult.
-To see the product's full functionality, [enabling SMTP email is recommended](doc/config/smtp-email-setup.md).
+To see the product's full functionality, [enabling SMTP email is recommended](/doc/config/smtp-email-setup.md).
## Upgrading Mattermost
diff --git a/docker/0.7/Dockerfile b/docker/0.7/Dockerfile
index 66aac0fa3..4a8623d33 100644
--- a/docker/0.7/Dockerfile
+++ b/docker/0.7/Dockerfile
@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
WORKDIR /mattermost
# Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v0.7.0-rc1/mattermost.tar.gz /
+ADD https://github.com/mattermost/platform/releases/download/v0.7.0/mattermost.tar.gz /
RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
ADD config_docker.json /
ADD docker-entry.sh /
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index ea42256aa..71cd1d344 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -498,7 +498,7 @@ export function textToJsx(textin, options) {
// do both a non-case sensitive and case senstive check
let mClass = '';
- if (('@' + name.toLowerCase()) !== -1 || implicitKeywords.indexOf('@' + name) !== -1) {
+ if (implicitKeywords.indexOf('@' + name.toLowerCase()) !== -1 || implicitKeywords.indexOf('@' + name) !== -1) {
mClass = mentionClass;
}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 682809f02..c56625b88 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -243,6 +243,23 @@
}
}
@media screen and (max-width: 768px) {
+ .file-details__container {
+ display: block;
+ .file-details__preview {
+ display: block;
+ width: 100%;
+ height: 150px;
+ border-right: none;
+ border-bottom: 1px solid #ddd;
+ img {
+ width: 64px;
+ height: 64px;
+ }
+ }
+ .file-details {
+ height: auto;
+ }
+ }
.center-file-overlay {
font-size: 1.3em;
}
@@ -405,23 +422,23 @@
margin-top: 0;
}
.remove-preview {
- width: 50px;
- height: 50px;
- left: 50%;
- top: 50%;
+ width: 28px;
+ height: 28px;
+ left: auto;
+ right: 0;
+ top: 0;
background: #444;
- margin: -25px 0 0 -25px;
- @include border-radius(50px);
+ background: rgba(#000, 0.5);
text-align: center;
&:after {
display: none;
}
i {
- line-height: 50px;
+ line-height: 29px;
top: auto;
right: auto;
position: relative;
- font-size: 28px;
+ font-size: 16px;
}
}
}