summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge release branch 'release-1.0.0'Christopher Speller2015-09-3014-40/+178
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Updating dockerfile for release v1.0.0-rc2Christopher Speller2015-09-301-1/+1
| | | | |
| * | | | Merge pull request #884 from mattermost/permissions-fixChristopher Speller2015-09-307-25/+26
| |\ \ \ \ | | | | | | | | | | | | Permissions fixes. Fixes PLT-487
| | * | | | Fixing some locations to use the IsTeamAdmin function which properly checks ↵Christopher Speller2015-09-307-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | for system admin permissions.
| | * | | | Fixing permissions for system admin. Fixes slack import for system admins.Christopher Speller2015-09-301-14/+11
| | | | | |
| * | | | | Merge pull request #883 from mattermost/plt-496Joram Wilander2015-09-301-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | PLT-496 Adding MIT compiled licence to build
| | * | | | Adding MIT compiled licence to buildChristopher Speller2015-09-301-2/+2
| |/ / / /
| * | | | Merge pull request #882 from mattermost/PLT-499Harrison Healey2015-09-303-12/+12
| |\ \ \ \ | | | | | | | | | | | | PLT-499 fixing broken salts
| | * | | | PLT-499 fixing broken salts=Corey Hulen2015-09-303-12/+12
| |/ / / /
| * | | | Merge pull request #877 from mattermost/lfbrock-patch-2Christopher Speller2015-09-301-0/+123
| |\ \ \ \ | | | | | | | | | | | | Update NOTICE.txt to include goexif, react-bootstrap, graphics-go, bootstrap colorpicker
| | * | | | Updated to include goexif, react-bootstrap, graphics-go, and bootstrap ↵lfbrock2015-09-301-0/+123
| |/ / / / | | | | | | | | | | | | | | | colorpicker
| * | | | Merge pull request #874 from mattermost/it33-patch-1it332015-09-301-0/+14
| |\ \ \ \ | | | | | | | | | | | | Create MIT-COMPILED-LICENSE.md
| | * | | | Create MIT-COMPILED-LICENSE.mdit332015-09-301-0/+14
| |/ / / /
* | | | | Merge pull request #867 from chengweiv5/team-nameChristopher Speller2015-09-302-6/+8
|\ \ \ \ \ | | | | | | | | | | | | Team name
| * | | | | Check team name in correct sequence to avoid null pointerChengwei Yang2015-09-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
| * | | | | Change minimal length of team name to 3 characterChengwei Yang2015-09-302-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/echotestfixChristopher Speller2015-09-301-0/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | Added slight delay to TestEchoCommand to account for race condition
| * | | | Added slight delay to TestEchoCommand to account for race conditionhmhealey2015-09-301-0/+3
| | | | |
* | | | | Merge pull request #852 from asaadmahmoodspin/plt-383Joram Wilander2015-09-302-21/+26
|\ \ \ \ \ | |/ / / / |/| | | | plt-383 - Slack upload UI improvements
| * | | | Adding a quick fix for search bar bg related to themesAsaad Mahmood2015-09-301-1/+1
| | | | |
| * | | | Updating slack import UI with statesAsaad Mahmood2015-09-301-59/+33
| | | | |
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-383Asaad Mahmood2015-09-3051-534/+589
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #875 from mattermost/rhs-scroll-fixJoram Wilander2015-09-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix RHS scrolling center pane.
| * | | | | Fix RHS scrolling center pane.JoramWilander2015-09-301-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #863 from mattermost/PLT-475Christopher Speller2015-09-301-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | PLT-475 making sure session is properly removed
| * | | | PLT-475 making sure session is properly removed=Corey Hulen2015-09-291-1/+1
| | | | |
* | | | | Merge pull request #865 from mattermost/PLT-404Harrison Healey2015-09-298-32/+114
|\ \ \ \ \ | | | | | | | | | | | | PLT-404 adding basic error checking to config file.
| * | | | | PLT-404 adding basic error checking to config file.=Corey Hulen2015-09-298-32/+114
| |/ / / /
* | | | | Merge pull request #862 from mattermost/PLT-435Joram Wilander2015-09-293-1/+24
|\ \ \ \ \ | | | | | | | | | | | | PLT-435 adding system console link to RHS
| * | | | | PLT-435 adding system console link to RHS=Corey Hulen2015-09-293-1/+24
| |/ / / /
* | | | | Merge pull request #864 from esethna/patch-3Harrison Healey2015-09-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update email notification help text
| * | | | | Update email notification help textesethna2015-09-291-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-470Harrison Healey2015-09-292-1/+23
|\ \ \ \ \ | | | | | | | | | | | | PLT-470 Adding STMP server connection check
| * | | | | PLT-470 Adding STMP server connection check=Corey Hulen2015-09-292-1/+23
| | |_|_|/ | |/| | |
* | | | | Merge pull request #861 from mattermost/PLT-469Harrison Healey2015-09-291-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-469 skip redirect if verified email required.
| * | | | PLT-469 skip redirect if verified email required.=Corey Hulen2015-09-291-1/+4
| | | | |
* | | | | Merge release branch 'release-1.0.0'Christopher Speller2015-09-2921-406/+313
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #856 from asaadmahmoodspin/bugfixCorey Hulen2015-09-293-15/+6
| |\ \ \ \ | | | | | | | | | | | | PLT-465 - Fixing RHS header back button search icon etc
| | * | | | Removing command stylesAsaad Mahmood2015-09-291-5/+4
| | | | | |
| | * | | | Removing mentions changes since they're for a masterAsaad Mahmood2015-09-291-3/+0
| | | | | |
| | * | | | Updating placeholder text in responsiveAsaad Mahmood2015-09-293-19/+14
| |/ / / /
| * | | | Adding link to production installit332015-09-291-1/+3
| | | | |
| * | | | Merge pull request #853 from mattermost/PLT-28Corey Hulen2015-09-291-0/+187
| |\ \ \ \ | | | | | | | | | | | | Plt 28
| | * | | | Fixing typos=Corey Hulen2015-09-291-37/+37
| | | | | |
| | * | | | Fixing formatting=Corey Hulen2015-09-281-14/+17
| | | | | |
| | * | | | Finishing directions=Corey Hulen2015-09-281-53/+67
| | | | | |
| | * | | | PLT-28 working on production setup doc=Corey Hulen2015-09-281-0/+170
| | | | | |
| * | | | | Merge pull request #841 from hmhealey/plt456bCorey Hulen2015-09-281-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | PLT-456 Changed mobile search bar to use the colour of the sidebar header
| | * | | | | Changed mobile search bar to use the colour of the sidebar headerhmhealey2015-09-281-0/+1
| | |/ / / /
| * | | | | Merge pull request #838 from mattermost/email-image-fixJoram Wilander2015-09-281-2/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix images in welcome email.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 11:26:43 +0000