3036 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
hmhealey	ae0d4dce7b	Updated More Direct Channels modal and converted it to ReactBootstrap	2015-10-14 16:57:08 -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 v1.1.0	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
JoramWilander	05c4a889c1	Minor updates to incoming webhook documenatation	2015-10-13 15:15:01 -04:00
hmhealey	17d37816d4	Revert "Modified markdown lexer to not break up words written in snake_case" ... This reverts commit 787d2ef7bc.	2015-10-13 14:36:58 -04:00
Asaad Mahmood	4cfe8ce699	Multiple Ui Improvements	2015-10-13 23:28:00 +05:00
Corey Hulen	a2979924a4	Merge pull request #1027 from mattermost/check-https ... Updating SSO help on HTTP/HTTPS	2015-10-13 09:51:55 -07:00
Corey Hulen	1dbc6c5d0e	Merge pull request #1033 from mattermost/trouble-shooting ... Create Troubleshooting.md	2015-10-13 09:50:01 -07:00
=Corey Hulen	0187e702ea	PLT-602 combining welcome and verify email	2015-10-13 09:47:31 -07:00
Joram Wilander	d08b3e9d38	Merge pull request #1035 from mattermost/incoming-doc ... Minor changes to incoming webhook doc	2015-10-13 12:46:12 -04:00
JoramWilander	fbeb7b33db	Minor changes to incoming webhook doc	2015-10-13 12:45:19 -04:00
hmhealey	2a39e8dbfa	Removed Preference.AltId	2015-10-13 12:29:31 -04:00
Joram Wilander	5828a296c2	Merge pull request #1032 from mattermost/incoming-doc ... Update incoming webhook documentation	2015-10-13 12:26:01 -04:00
it33	ee85f6512f	Update Code-Contribution-Guidelines.md	2015-10-13 09:06:27 -07:00
it33	fabff38463	Clarifying PRs should go to master	2015-10-13 09:04:04 -07:00
it33	09acf949c3	Create Troubleshooting.md	2015-10-13 08:55:57 -07:00
JoramWilander	b42d7a03c7	Minor doc updates	2015-10-13 11:39:56 -04:00
JoramWilander	151b929c91	Update incoming webhook doc	2015-10-13 11:37:10 -04:00
Christopher Speller	e60fb1dfd7	Fixing user settings dialog so it desn't ask you to check your email unless you changed it	2015-10-13 11:31:57 -04:00
it33	62bbf11224	Slack Import changing "Preview" label to "Beta"	2015-10-13 08:22:22 -07:00
it33	89dca4eacc	Update help text for Slack Import	2015-10-13 08:06:53 -07:00
Joram Wilander	f641f83ff9	Merge pull request #1026 from asaadmahmoodspin/master ... Fixing code block markdown	2015-10-13 10:11:03 -04:00
hmhealey	5cecf1afcd	Made structural changes to server-side Preference code based on feedback	2015-10-13 09:42:27 -04:00
hmhealey	8a7aa7f66f	Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transaction	2015-10-13 09:42:26 -04:00
hmhealey	a2517ee991	Cleaned up JSX errors	2015-10-13 09:42:26 -04:00
hmhealey	097d236f43	Fixed edge cases with leaving a direct channel while viewing that channel	2015-10-13 09:42:26 -04:00
hmhealey	ed6b2cd164	Removed setting direct channels for a new user at creation time	2015-10-13 09:42:26 -04:00
hmhealey	a6cd2a7961	Moved saving multiple user preferences into a database transaction	2015-10-13 09:42:26 -04:00