Corey Hulen
|
94501476fa
|
Merge pull request #1061 from mattermost/release-1.1.0
Release 1.1.0 final merge
|
2015-10-14 19:20:10 -07:00 |
|
Corey Hulen
|
229d5c7dcc
|
Merge pull request #1056 from esethna/patch-7
Update SMTP instructions
|
2015-10-14 19:19:19 -07:00 |
|
it33
|
741eb8170f
|
Clarifying description
|
2015-10-14 15:45:05 -07:00 |
|
it33
|
70ddf3f73e
|
Update Slack-Import.md
|
2015-10-14 15:42:49 -07:00 |
|
it33
|
9cd35c46de
|
Clarifying instruction
|
2015-10-14 15:41:24 -07:00 |
|
it33
|
87d424ab99
|
Adjusting formatting
|
2015-10-14 15:36:45 -07:00 |
|
it33
|
489eab8609
|
Update Slack-Import.md
|
2015-10-14 15:36:13 -07:00 |
|
it33
|
57585d6d4f
|
Update Slack-Import.md
|
2015-10-14 15:35:14 -07:00 |
|
it33
|
ffda0839b6
|
Update Slack-Import.md
|
2015-10-14 15:26:35 -07:00 |
|
Reed Garmsen
|
04ddb3e1b3
|
Properly handle missing session IDs regardless of case
|
2015-10-14 15:10:50 -07:00 |
|
Reed Garmsen
|
48c69b86d8
|
Added all remaining audit descriptions to supported audits
|
2015-10-14 15:00:03 -07:00 |
|
Stas Vovk
|
440faabc60
|
fixed style guide error
|
2015-10-15 00:06:51 +03:00 |
|
hmhealey
|
ae0d4dce7b
|
Updated More Direct Channels modal and converted it to ReactBootstrap
|
2015-10-14 16:57:08 -04:00 |
|
esethna
|
7523c6f2e6
|
Update SMTP instructions
Needs dev review.
|
2015-10-14 14:36:19 -06:00 |
|
Reed Garmsen
|
e7e83b44d8
|
Added more individual audit handling, primarily involving the user
|
2015-10-14 12:50:45 -07:00 |
|
Reed Garmsen
|
63b0ca8e4b
|
Added more supported audits to audit log
|
2015-10-14 12:50:45 -07:00 |
|
Reed Garmsen
|
487c47e803
|
Finished structure for formatting audits and began writing individual formatting for each audit
|
2015-10-14 12:50:45 -07:00 |
|
Reed Garmsen
|
536c55dc5f
|
Initial changes to audit log along with structure for handling different audit types
|
2015-10-14 12:50:45 -07:00 |
|
Florian Orben
|
f0a3c59834
|
PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading
|
2015-10-14 21:48:32 +02:00 |
|
Florian Orben
|
b8c80c6d95
|
Don't auto-add http:// to mailto: and ftp: markdown links
|
2015-10-14 21:44:09 +02:00 |
|
Stas Vovk
|
29a0c182ef
|
added file with display settings
|
2015-10-14 21:39:33 +03:00 |
|
Stas Vovk
|
76e278a13d
|
added display tab under account settings. added 24h time option
|
2015-10-14 20:36:12 +03:00 |
|
Antti Ahti
|
8f96db4d0b
|
Sanitize team data
We don't want to expose sensitive data that might pose a security risk.
|
2015-10-14 19:27:19 +03:00 |
|
Antti Ahti
|
731595c1a9
|
Fix typo (isTreamCreationAllowed -> isTeamCreationAllowed)
|
2015-10-14 18:31:58 +03:00 |
|
Antti Ahti
|
1ab7034574
|
Use team display name in team switcher menu
- /teams/find_teams returns team objects instead of just team names
- use display_name in UI instead of name in the team switch menu
|
2015-10-14 18:27:03 +03:00 |
|
Joram Wilander
|
830e8b04d9
|
Merge pull request #1047 from hmhealey/sidebar
Fixed overwritten CSS class in the sidebar
|
2015-10-14 09:30:00 -04:00 |
|
hmhealey
|
6c4022337c
|
Fixed overwritten CSS class in the sidebar
|
2015-10-14 09:11:35 -04:00 |
|
Harrison Healey
|
962a5d8beb
|
Merge pull request #1046 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
|
2015-10-14 09:02:05 -04:00 |
|
Christopher Speller
|
cdbe6342bb
|
Merge release branch 'release-1.1.0'
|
2015-10-14 08:27:34 -04:00 |
|
Asaad Mahmood
|
99f243b444
|
Multiple UI Improvements
|
2015-10-14 17:04:13 +05:00 |
|
Christopher Speller
|
4ad9e0673c
|
Updating dockerfile for release v1.1.0-rc3
|
2015-10-14 07:56:48 -04:00 |
|
Christopher Speller
|
5e14ef6084
|
Merge pull request #1041 from mattermost/plt-603
RC3 - PLT-603 Fix webhook name not overriding in RHS and update webhook help text.
|
2015-10-14 07:46:35 -04:00 |
|
Christopher Speller
|
cbefd88951
|
Merge pull request #993 from apaatsio/bootstrap-help-block
Use help-block class from Bootstrap
|
2015-10-14 07:39:53 -04:00 |
|
it33
|
6095bf4a45
|
Update SMTP-Email-Setup.md
|
2015-10-13 21:52:06 -07:00 |
|
Joram Wilander
|
888ab49e23
|
Merge pull request #1042 from hmhealey/plt322-followup
PLT-322 Fixed leave direct channel button for users with a long username
|
2015-10-13 22:53:36 -04:00 |
|
Joram Wilander
|
52a87446ce
|
Merge pull request #1017 from stasvovk/PLT-589
PLT-589: changed Admin to Team Admin in Manage Team members
|
2015-10-13 22:53:01 -04:00 |
|
Joram Wilander
|
a4adc9b95e
|
Merge pull request #1038 from asaadmahmoodspin/ui-improvements
Multiple Ui Improvements
|
2015-10-13 22:52:28 -04:00 |
|
hmhealey
|
3f2b6bfa27
|
Fixed leave direct channel button for users with a long username
|
2015-10-13 18:31:17 -04:00 |
|
Harrison Healey
|
56b02f2eba
|
Merge pull request #968 from hmhealey/plt322
PLT-322 Updated Direct Messages menu
|
2015-10-13 18:23:53 -04:00 |
|
JoramWilander
|
ac0f8f6bcf
|
Fix webhook name not overriding in LHS and update webhook help text.
|
2015-10-13 18:01:11 -04:00 |
|
Corey Hulen
|
998b5f7e11
|
Merge pull request #1034 from mattermost/PRs-to-master
Clarifying PRs should go to master
|
2015-10-13 14:03:58 -07:00 |
|
it33
|
8f5a73705c
|
Update Code-Contribution-Guidelines.md
|
2015-10-13 13:32:57 -07:00 |
|
Christopher Speller
|
2bbe8f48f7
|
Merge pull request #1040 from mattermost/plt-601
PLT-601 Fixing user settings modal general tab.
|
2015-10-13 16:30:07 -04:00 |
|
Christopher Speller
|
d0d00d9dbe
|
Merge branch 'release-1.1.0' into plt-601
|
2015-10-13 15:37:53 -04:00 |
|
hmhealey
|
97b2f6ffe7
|
Made further changes based on feedback
|
2015-10-13 15:36:58 -04:00 |
|
Christopher Speller
|
2be9d5a183
|
Merge pull request #1036 from mattermost/PLT-602
PLT-602 combining welcome and verify email
|
2015-10-13 15:33:30 -04:00 |
|
Christopher Speller
|
1dfffacc31
|
Merge pull request #1030 from mattermost/Slack-import-UI-update
Slack Import changing "Preview" label to "Beta"
|
2015-10-13 15:23:16 -04:00 |
|
Christopher Speller
|
669a14520f
|
Merge pull request #1029 from mattermost/Slack-import-help-update
Update help text for Slack Import
|
2015-10-13 15:22:23 -04:00 |
|
Joram Wilander
|
09a5599375
|
Merge pull request #1037 from hmhealey/revert987
Revert #987
|
2015-10-13 15:17:13 -04:00 |
|
Joram Wilander
|
4935112a47
|
Merge pull request #1039 from mattermost/incoming-doc
Minor updates to incoming webhook documenatation
|
2015-10-13 15:16:55 -04:00 |
|