Commit Graph

120 Commits

Author SHA1 Message Date
Corey Hulen
8291cb772c Merge pull request #40 from mattermost/image-fix
HELIUM profile image now generates on each call if S3 is not configured
2015-06-19 10:41:56 -08:00
Corey Hulen
98d9050d07 Merge pull request #39 from mattermost/mm-1315
HELIUM fixes mm-1315 adds confirmation dialog when closing invite dialog with typed in emails
2015-06-19 10:40:23 -08:00
Corey Hulen
ce0741c0b3 Merge pull request #36 from mattermost/notification-fix
HELIUM fix a bug where mentions wouldn't update for words after certain characters
2015-06-19 10:39:35 -08:00
Christopher Speller
213129255d Merge pull request #42 from mattermost/readme
Linebreaks HELIUM
2015-06-19 12:50:58 -04:00
Christopher Speller
88af193576 Linebreaks 2015-06-19 12:49:22 -04:00
JoramWilander
a76ee16480 update unit tests for new createProfileImage func 2015-06-19 11:34:48 -04:00
JoramWilander
3d6d71cc0b profile image now generates on each call if S3 is not configured 2015-06-19 11:19:51 -04:00
it33
8dab13c7de Update README.md 2015-06-19 07:50:39 -07:00
it33
71a945bc2e Update README.md 2015-06-19 07:47:24 -07:00
JoramWilander
1cbb10105b fixes mm-1315 adds confirmation dialog when closing invite dialog with typed in emails 2015-06-19 10:11:51 -04:00
Joram Wilander
11aebc3c72 Merge pull request #38 from mattermost/feedback-email-fix
Defaulting to domain of localhost when no domain is given HELIUM
2015-06-19 10:07:15 -04:00
it33
cb38322bcc Update README.md 2015-06-19 06:58:24 -07:00
Christopher Speller
634d29fead Defaulting to domain of localhost when no domain is given 2015-06-19 09:52:04 -04:00
Joram Wilander
62279fb880 Merge pull request #37 from mattermost/docker-tweaks
Adding linux setup instructions to readme. Adding Dockerrun.aws.json file. HELIUM
2015-06-19 09:34:59 -04:00
Christopher Speller
4f0563ddea Switching port 2015-06-19 09:23:27 -04:00
Christopher Speller
60ccc8fcfe Adding name and tag to commands 2015-06-19 09:21:16 -04:00
Christopher Speller
ce0b89a26e Adding linux setup instructions to readme. Adding Dockerrun.aws.json file 2015-06-19 09:01:00 -04:00
it33
5ca9397c3c Update README.md 2015-06-19 05:57:56 -07:00
it33
a15b421957 Adding "About Mattermost" to README.md 2015-06-19 05:52:31 -07:00
JoramWilander
5aef020ca2 added slashes to split map 2015-06-19 08:30:16 -04:00
JoramWilander
09c4089c95 improved split function 2015-06-19 08:25:47 -04:00
JoramWilander
6051b01cdf remove logging 2015-06-19 08:09:35 -04:00
JoramWilander
ac8e1fe97e fix a bug where mentions wouldn't update for words after a new line 2015-06-19 08:08:54 -04:00
=Corey Hulen
a6078ad7f8 tweaking readme 2015-06-18 23:18:54 -08:00
Corey Hulen
84111e42a8 Merge pull request #35 from mattermost/readme
Updating readme
2015-06-18 23:15:35 -08:00
=Corey Hulen
0377d68335 Updating readme 2015-06-18 23:14:43 -08:00
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
JoramWilander
78bc7a326f fixes br tags causing new lines 2015-06-18 17:39:12 -04: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
Christopher Speller
dcc09b6991 If feedback email is not specified then autodetect domain and use feedback@domain 2015-06-18 15:31:15 -04:00
Joram Wilander
aee643e20c 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
4cabe1baea fix for dockerhost HELIUM 2015-06-18 10:55:51 -08:00
JoramWilander
bf2c8b3332 fixes mm-1297 can now scroll through more than 5 images 2015-06-18 14:40:11 -04:00
it33
c4788e0473 Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00
it33
ce03ed6415 Update "Theme" to "Theme Color Options"
Needed to make marketing screen look nice.
2015-06-18 08:35:25 -07:00
it33
1f66c44632 Update NOTICE.txt 2015-06-18 07:05:42 -07:00
it33
e05f9bf15e Update NOTICE.txt 2015-06-18 07:04:52 -07:00
it33
cbc3f4c5c1 Update NOTICE.txt 2015-06-18 06:42:40 -07:00
Corey Hulen
11e7b56e78 Merge pull request #25 from rgarmsen2295/mm-1064
MM-1064
2015-06-17 10:31:33 -08:00
Reed Garmsen
bf3ca45dac Merge pull request #6 from rgarmsen2295/master
Remerging
2015-06-17 11:29:13 -07:00
Reed Garmsen
2a427254f4 Fixing compatibility 2015-06-17 11:16:03 -07:00
Reed Garmsen
70d4d3f3b2 Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064 2015-06-17 11:11:34 -07:00
Reed Garmsen
806eb40f5f Removed unnecessary comma 2015-06-17 11:11:13 -07:00
Reed Garmsen
519bebcaee Simplified code changes 2015-06-17 11:11:13 -07:00
Reed Garmsen
f74ced758f Added in basic changes necessary to fix some typos. Needs further tests and changes to other config files 2015-06-17 11:11:13 -07:00
Reed Garmsen
f99ad06c19 Merge pull request #5 from mattermost/master
to me
2015-06-17 11:09:50 -07:00
Corey Hulen
8265b32b8b Merge pull request #22 from mattermost/mention-fix
fix an auto-complete bug for mentions MERGE FOR HELIUM RELEASE
2015-06-17 10:04:47 -08:00
Corey Hulen
1d9400f18c Merge pull request #21 from mattermost/mm-1225
MM-1225 Adding check of email configuation settings when config file is loaded
2015-06-17 10:04:29 -08:00
Corey Hulen
e89d12fc8c Merge pull request #20 from mattermost/docker-tweaks
MM-1157 Various tweaks to docker requested. HELIUM
2015-06-17 10:02:29 -08:00