Commit Graph

17683 Commits

Author SHA1 Message Date
Reed Garmsen
9c2379a711 Merge pull request #6 from rgarmsen2295/master
Remerging
2015-06-17 11:29:13 -07:00
Reed Garmsen
50c97f4155 Merge pull request #6 from rgarmsen2295/master
Remerging
2015-06-17 11:29:13 -07:00
Reed Garmsen
e7f4a7b5ab 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
31d795b459 Fixing compatibility 2015-06-17 11:16:03 -07:00
Reed Garmsen
e142a8cb24 Fixing compatibility 2015-06-17 11:16:03 -07:00
Reed Garmsen
d8ebad2658 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
5c48d19d26 Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064 2015-06-17 11:11:34 -07:00
Reed Garmsen
b7c9ceb363 Merge branch 'mm-1064' of https://github.com/rgarmsen2295/platform into mm-1064 2015-06-17 11:11:34 -07:00
Reed Garmsen
2012070a95 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
4c44d0465b Removed unnecessary comma 2015-06-17 11:11:13 -07:00
Reed Garmsen
c2507f4533 Removed unnecessary comma 2015-06-17 11:11:13 -07:00
Reed Garmsen
19c6270695 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
829f1f1808 Simplified code changes 2015-06-17 11:11:13 -07:00
Reed Garmsen
7fbc852236 Simplified code changes 2015-06-17 11:11:13 -07:00
Reed Garmsen
bf69f66878 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
85adca9d7a 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
1c0400a121 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
533d3ca512 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
Reed Garmsen
12f0559e28 Merge pull request #5 from mattermost/master
to me
2015-06-17 11:09:50 -07:00
Reed Garmsen
f34074a455 Merge pull request #5 from mattermost/master
to me
2015-06-17 11:09:50 -07:00
Reed Garmsen
79f59bbade 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
876c606997 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
6016a98ea3 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
fad1069649 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
7eca61c2f0 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
425402f2c4 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
fbf60e109a 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
Corey Hulen
bdde452c31 Merge pull request #20 from mattermost/docker-tweaks
MM-1157 Various tweaks to docker requested. HELIUM
2015-06-17 10:02:29 -08:00
Corey Hulen
7455f2621a Merge pull request #20 from mattermost/docker-tweaks
MM-1157 Various tweaks to docker requested. HELIUM
2015-06-17 10:02:29 -08:00
Corey Hulen
0ba5e0e403 Merge pull request #20 from mattermost/docker-tweaks
MM-1157 Various tweaks to docker requested. HELIUM
2015-06-17 10:02:29 -08:00
Reed Garmsen
3d1975dea4 Removed unnecessary comma 2015-06-17 09:54:06 -07:00
Reed Garmsen
29a68da90a Removed unnecessary comma 2015-06-17 09:54:06 -07:00
Reed Garmsen
5af94ff0db Removed unnecessary comma 2015-06-17 09:54:06 -07:00
Reed Garmsen
7bd2c10e0a Removed unnecessary comma 2015-06-17 09:54:06 -07:00
Reed Garmsen
bf1e35bc19 Simplified code changes 2015-06-17 09:53:15 -07:00
Reed Garmsen
4b1d834514 Simplified code changes 2015-06-17 09:53:15 -07:00
Reed Garmsen
b57796f97f Simplified code changes 2015-06-17 09:53:15 -07:00
Reed Garmsen
133c4d8de1 Simplified code changes 2015-06-17 09:53:15 -07:00
JoramWilander
20ead3585d fix an auto-complete bug for mentions 2015-06-17 12:25:41 -04:00
JoramWilander
5a0389bc21 fix an auto-complete bug for mentions 2015-06-17 12:25:41 -04:00
JoramWilander
b7e516ff2e fix an auto-complete bug for mentions 2015-06-17 12:25:41 -04:00