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

4161 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
258cc3a7b5 Merge pull request #33 from mattermost/br-fix
HELIUM fixes br tags causing new lines
2015-06-18 23:08:01 -08:00
Corey Hulen
0f106e5352 Merge pull request #33 from mattermost/br-fix
HELIUM fixes br tags causing new lines
2015-06-18 23:08:01 -08:00
Corey Hulen
1ec7996e4c Merge pull request #33 from mattermost/br-fix
HELIUM fixes br tags causing new lines
2015-06-18 23:08:01 -08:00
Corey Hulen
98cc19c9dd Merge pull request #33 from mattermost/br-fix
HELIUM fixes br tags causing new lines
2015-06-18 23:08:01 -08:00
Reed Garmsen
c94d6a1c00 Removed extraneous conditional 2015-06-18 17:16:59 -07:00
Reed Garmsen
4e8e00e94f Fixed ability to be able to delete a specific invite field within the invite new member form instead of just removing the bottom one every time 2015-06-18 17:15:21 -07:00
JoramWilander
78bc7a326f fixes br tags causing new lines 2015-06-18 17:39:12 -04:00
JoramWilander
0802c55aad fixes br tags causing new lines 2015-06-18 17:39:12 -04:00
JoramWilander
9f86db9faa fixes br tags causing new lines 2015-06-18 17:39:12 -04:00
JoramWilander
31a265ddf5 fixes br tags causing new lines 2015-06-18 17:39:12 -04:00
Reed Garmsen
3cd793fcb9 Merge pull request #13 from rgarmsen2295/master
Remerge
2015-06-18 14:10:47 -07:00
Reed Garmsen
4f321383b3 Merge pull request #12 from mattermost/master
to me
2015-06-18 14:06:02 -07:00
Reed Garmsen
2082ee5bdc Added a util function that checks that local/session storage is enabled. Also added tests using this function to report an error to the user if it is not enabled 2015-06-18 13:37:39 -07:00
Corey Hulen
400f55105f Merge pull request #31 from mattermost/feedback-email-auto
HELIUM If feedback email is not specified then autodetect domain and use feedback@domain
2015-06-18 11:48:46 -08:00
Corey Hulen
423a862af9 Merge pull request #31 from mattermost/feedback-email-auto
HELIUM If feedback email is not specified then autodetect domain and use feedback@domain
2015-06-18 11:48:46 -08:00
Corey Hulen
d519f678e6 Merge pull request #31 from mattermost/feedback-email-auto
HELIUM If feedback email is not specified then autodetect domain and use feedback@domain
2015-06-18 11:48:46 -08:00
Corey Hulen
a1ae2abaf9 Merge pull request #31 from mattermost/feedback-email-auto
HELIUM If feedback email is not specified then autodetect domain and use feedback@domain
2015-06-18 11:48:46 -08:00
Christopher Speller
dcc09b6991 If feedback email is not specified then autodetect domain and use feedback@domain 2015-06-18 15:31:15 -04:00
Christopher Speller
2bc02d37f6 If feedback email is not specified then autodetect domain and use feedback@domain 2015-06-18 15:31:15 -04:00
Christopher Speller
0300c01e0b If feedback email is not specified then autodetect domain and use feedback@domain 2015-06-18 15:31:15 -04:00
Christopher Speller
16d7099527 If feedback email is not specified then autodetect domain and use feedback@domain 2015-06-18 15:31:15 -04:00
Reed Garmsen
19e9a41218 Merge pull request #11 from mattermost/master
to me
2015-06-18 12:23:02 -07:00
Joram Wilander
aee643e20c Merge pull request #30 from mattermost/dockerhost
fix for dockerhost HELIUM
2015-06-18 14:59:22 -04:00
Joram Wilander
471b8d40d1 Merge pull request #30 from mattermost/dockerhost
fix for dockerhost HELIUM
2015-06-18 14:59:22 -04:00
Joram Wilander
c64f5eae55 Merge pull request #30 from mattermost/dockerhost
fix for dockerhost HELIUM
2015-06-18 14:59:22 -04:00
Joram Wilander
bfdd467a3a Merge pull request #30 from mattermost/dockerhost
fix for dockerhost HELIUM
2015-06-18 14:59:22 -04:00
Corey Hulen
de874faa60 Merge pull request #29 from mattermost/mm-1297
FOR HELIUM RELEASE fixes mm-1297 can now scroll through more than 5 images
2015-06-18 10:58:37 -08:00
Corey Hulen
63114ad4ae Merge pull request #29 from mattermost/mm-1297
FOR HELIUM RELEASE fixes mm-1297 can now scroll through more than 5 images
2015-06-18 10:58:37 -08:00
Corey Hulen
f1dbf69c76 Merge pull request #29 from mattermost/mm-1297
FOR HELIUM RELEASE fixes mm-1297 can now scroll through more than 5 images
2015-06-18 10:58:37 -08:00
Corey Hulen
bcea40686a Merge pull request #29 from mattermost/mm-1297
FOR HELIUM RELEASE fixes mm-1297 can now scroll through more than 5 images
2015-06-18 10:58:37 -08:00
Reed Garmsen
9d582a5a7a Merge pull request #10 from mattermost/master
to me
2015-06-18 11:57:07 -07:00
=Corey Hulen
4cabe1baea fix for dockerhost HELIUM 2015-06-18 10:55:51 -08:00
=Corey Hulen
9c63923990 fix for dockerhost HELIUM 2015-06-18 10:55:51 -08:00
=Corey Hulen
a5ce5972ba fix for dockerhost HELIUM 2015-06-18 10:55:51 -08:00
=Corey Hulen
dbd781c018 fix for dockerhost HELIUM 2015-06-18 10:55:51 -08:00
Reed Garmsen
32025e4379 Removed extraneous post control from within new message separator 2015-06-18 11:46:40 -07:00
JoramWilander
bf2c8b3332 fixes mm-1297 can now scroll through more than 5 images 2015-06-18 14:40:11 -04:00
JoramWilander
7c0ce0ef96 fixes mm-1297 can now scroll through more than 5 images 2015-06-18 14:40:11 -04:00
JoramWilander
3a172e7658 fixes mm-1297 can now scroll through more than 5 images 2015-06-18 14:40:11 -04:00
JoramWilander
19ec09391c fixes mm-1297 can now scroll through more than 5 images 2015-06-18 14:40:11 -04:00
Reed Garmsen
94c727a9c2 Merge pull request #9 from rgarmsen2295/master
to me
2015-06-18 11:35:59 -07:00
Reed Garmsen
8ae7afa5cc Removed extraneous code 2015-06-18 15:38:03 -07:00
Reed Garmsen
65318de9ae Changed the new messages separator location in the markup to be at the same level as the date seperator 2015-06-18 15:34:23 -07:00
Reed Garmsen
7a10109682 Added logic to clear error messages that are not relevant to the current error (or to remove error messagesthat no longer apply) for user creation 2015-06-18 09:31:04 -07:00
JoramWilander
40b9fc5e39 revert debug config changes 2015-06-18 12:16:28 -04:00
JoramWilander
4af08121e6 fix command comparator and team store 2015-06-18 12:13:56 -04:00
it33
c4788e0473 Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00
it33
42b023a41d Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00
it33
0de2bd994b Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00
it33
27c29ed745 Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00