Граф коммитов

2908 Коммитов

Автор SHA1 Сообщение Дата
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
JoramWilander
ac0f8f6bcf Fix webhook name not overriding in LHS and update webhook help text. 2015-10-13 18:01:11 -04: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
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
=Corey Hulen
0187e702ea PLT-602 combining welcome and verify email 2015-10-13 09:47:31 -07: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
Christopher Speller
6bf3383bce Updating dockerfile for release v1.1.0-rc2 2015-10-13 08:35:43 -04:00
Christopher Speller
f268c2aa21 Merge pull request #1025 from mattermost/PLT-596
PLT-596 - Update to email verification title
2015-10-13 08:21:17 -04:00
it33
525a48fe27 PLT-596 - Update to email verification title 2015-10-12 22:33:43 -07:00
Corey Hulen
9bd9af4f19 Merge pull request #1023 from mattermost/fix-config
Fixing document
2015-10-12 20:55:40 -07:00
=Corey Hulen
a492206e38 Fixing document 2015-10-12 20:42:58 -07:00
Corey Hulen
a6a3c351a8 Merge pull request #997 from mattermost/PLT-586
PLT-586 fixing issues with security alert
2015-10-12 13:56:21 -07:00
=Corey Hulen
9f83a72f73 Merge branch 'release-1.1.0' into PLT-586 2015-10-12 13:16:46 -07:00
Corey Hulen
7a469c8fc1 Merge pull request #999 from rgarmsen2295/plt-610
PLT-610 Fix broken image in change email verification email
2015-10-12 13:15:30 -07:00
=Corey Hulen
51f41bffec Merge branch 'release-1.1.0' into PLT-586 2015-10-12 11:58:48 -07:00
=Corey Hulen
dbb1018f20 Fixing break 2015-10-12 11:35:38 -07:00
Corey Hulen
95f9ee179c Merge pull request #1020 from mattermost/config-fix
Adding new config documentation
2015-10-12 11:27:02 -07:00
=Corey Hulen
ac1367a286 Removing offical build check 2015-10-12 10:57:39 -07:00
=Corey Hulen
3c42ae312d Merge branch 'release-1.1.0' into PLT-586 2015-10-12 10:55:43 -07:00
=Corey Hulen
15c64767de Adding new config documentation 2015-10-12 10:53:51 -07:00
it33
1da8ae36fa Merge pull request #1001 from mattermost/missed-pr
Missed PR - Help text update to webhooks
2015-10-11 15:56:15 -07:00
it33
ea3713561b Update manage_incoming_hooks.jsx 2015-10-09 18:39:34 -07:00
it33
b0d5b6a2e2 Update user_settings_integrations.jsx 2015-10-09 18:28:57 -07:00
it33
acde3ebf98 Update manage_incoming_hooks.jsx 2015-10-09 18:27:55 -07:00
Reed Garmsen
3a3b24e6be Replaced change email verification email logo image with a static link 2015-10-09 13:44:20 -07:00
=Corey Hulen
61f92517f3 PLT-586 fixing issues with security alert 2015-10-09 12:24:39 -07:00
Christopher Speller
12cd7c03d6 Fixing broken travis release build 2015-10-08 16:46:45 -04:00
Christopher Speller
66cc4fa08f Adding release 1.1.0 version 2015-10-08 16:16:53 -04:00
Christopher Speller
c0e4b1e797 Creating dockerfiles for release 1.1.0 2015-10-08 16:16:53 -04:00
Corey Hulen
5d4c0e3189 Merge pull request #984 from hmhealey/linkfix
Fixed html used for autolinking
2015-10-08 13:11:09 -07:00
hmhealey
3c489518e6 Fixed html used for autolinking 2015-10-08 15:59:21 -04:00
Harrison Healey
9a177d7aa8 Merge pull request #983 from mattermost/fix-db-upgrade
Fixing db upgrade for 1.1
2015-10-08 15:31:34 -04:00
Corey Hulen
20c766aed5 Merge pull request #977 from mattermost/lfbrock-patch-1
Updated to include v1.1.0
2015-10-08 11:36:20 -07:00
lfbrock
a4178c183e Update CHANGELOG.md 2015-10-08 14:24:01 -04:00
=Corey Hulen
b7a4b1a418 Fixing db upgrade for 1.1 2015-10-08 10:59:38 -07:00
it33
9049321a9d Renaming SpinPunch, Inc. to Mattermost, Inc. 2015-10-08 10:30:31 -07:00
Harrison Healey
7dde0211c5 Merge pull request #982 from hmhealey/plt547
PLT-547 Changed emoticons so that they must be surrounded by whitespace
2015-10-08 13:19:39 -04:00
Christopher Speller
806fd77ec9 Merge pull request #981 from mattermost/plt-517
PLT-517 Changing SpinPunch to Mattermost in copyright
2015-10-08 12:55:11 -04:00
Corey Hulen
e36227405b Merge pull request #978 from mattermost/plt-355
PLT-355 Fixing ability to dynamicly update members list.
2015-10-08 09:51:04 -07:00
Corey Hulen
26252ccebf Merge pull request #971 from mattermost/PLT-567
PLT-567 auto join open channels
2015-10-08 09:49:29 -07:00
hmhealey
fa8a1ca098 Fixed parsing of :'( emoticon 2015-10-08 12:43:25 -04:00
hmhealey
5bcba280c6 Changed emoticons so that they much be surrounded by whitespace 2015-10-08 12:43:25 -04:00
hmhealey
c25d2d1e99 Switched :p emoticon 2015-10-08 12:43:25 -04:00
Corey Hulen
d30a694d11 Merge pull request #979 from mattermost/it33-patch-1
Removing unneeded <br> in welcome text
2015-10-08 09:38:08 -07:00
=Corey Hulen
e640bf7b6c Fixing issue with lastIndexOf 2015-10-08 09:34:49 -07:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
=Corey Hulen
d412144f88 Adding removing blank target for browser links 2015-10-08 09:14:13 -07:00
it33
b7897ac331 Tweaking welcome text in Town-Square 2015-10-08 08:42:45 -07:00
Christopher Speller
7014496252 Fixing ability to dynamicly update members list. 2015-10-08 10:54:27 -04:00