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

60 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
9a81e76de0 Merge pull request #32 from rgarmsen2295/mm-1282
MM-1282
2015-06-25 11:36:47 -04:00
Corey Hulen
a8e078d367 Merge pull request #28 from rgarmsen2295/mm-1290
MM-1290
2015-06-25 11:36:28 -04:00
Corey Hulen
049a41f9be Merge pull request #27 from mattermost/mm-1240
fixes mm-1240 adds ability to turn valet feature on
2015-06-25 11:20:19 -04:00
Corey Hulen
bfe8d13cd1 Merge pull request #26 from rgarmsen2295/mm-454
MM-454
2015-06-25 10:59:59 -04:00
Corey Hulen
b41b75fb35 Merge pull request #13 from rgarmsen2295/mm-1215
MM-1215
2015-06-25 10:59:01 -04:00
Corey Hulen
b33ab3d3e1 Merge pull request #8 from rgarmsen2295/mm-1097
MM-1097
2015-06-25 10:58:31 -04:00
it33
3e07a7bcb4 Change "Create a comment..." to "Add a comment..." 2015-06-21 13:59:22 -07:00
it33
1cb6f0e066 Change "Create a post..." to "Write a message..." 2015-06-21 13:58:38 -07:00
JoramWilander
81d44c463e fixes mm-1315 adds confirmation dialog when closing invite dialog with typed in emails 2015-06-19 10:11:51 -04:00
JoramWilander
9f86db9faa fixes br tags causing new lines 2015-06-18 17:39:12 -04: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
JoramWilander
3a172e7658 fixes mm-1297 can now scroll through more than 5 images 2015-06-18 14:40:11 -04:00
JoramWilander
bf2c8b3332 fixes mm-1297 can now scroll through more than 5 images 2015-06-18 14:40:11 -04: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
4af08121e6 fix command comparator and team store 2015-06-18 12:13:56 -04:00
it33
0de2bd994b Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00
it33
c4788e0473 Changed "Theme Color Option" to "Theme Color" 2015-06-18 08:38:07 -07:00
it33
c835f2370c Update "Theme" to "Theme Color Options"
Needed to make marketing screen look nice.
2015-06-18 08:35:25 -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
JoramWilander
308c4f3ce9 added team store, team settings menu, and the ability to turn on valet feature from client 2015-06-18 10:40:46 -04:00
Reed Garmsen
e22c89ad6b Changed Invite Members to Add Members in channel options for mobile and browser 2015-06-17 12:31:09 -07:00
Reed Garmsen
50c97f4155 Merge pull request #6 from rgarmsen2295/master
Remerging
2015-06-17 11:29:13 -07:00
Reed Garmsen
bf3ca45dac Merge pull request #6 from rgarmsen2295/master
Remerging
2015-06-17 11:29:13 -07:00
Reed Garmsen
7fbc852236 Simplified code changes 2015-06-17 11:11:13 -07:00
Reed Garmsen
519bebcaee Simplified code changes 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
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
JoramWilander
b7e516ff2e fix an auto-complete bug for mentions 2015-06-17 12:25:41 -04:00
JoramWilander
20ead3585d fix an auto-complete bug for mentions 2015-06-17 12:25:41 -04:00
Christopher Speller
14b409220e Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
Christopher Speller
eedced16c3 Switching from config file to parsing homelink from url 2015-06-16 15:35:34 -04:00
Corey Hulen
f9bd51ed5a Merge pull request #12 from mattermost/mm-1285
fixes mm-1218 adds sentence describing username to sign up pages
2015-06-16 10:05:59 -08:00
Corey Hulen
225275680e Merge pull request #12 from mattermost/mm-1285
fixes mm-1218 adds sentence describing username to sign up pages
2015-06-16 10:05:59 -08:00
Reed Garmsen
375e268d00 Changed text when previewing an image from Downloading to Previewing 2015-06-16 10:50:42 -07:00
JoramWilander
5695a6a4b7 fixes mm-1218 adds sentence describing username to sign up pages 2015-06-16 12:24:51 -04:00
JoramWilander
4330537303 fixes mm-1218 adds sentence describing username to sign up pages 2015-06-16 12:24:51 -04:00
JoramWilander
081b22f7bb fixes mm-1251 updates sign up now link 2015-06-16 07:53:58 -04:00
JoramWilander
0655c8798f fixes mm-1251 updates sign up now link 2015-06-16 07:53:58 -04:00
Reed Garmsen
c06a384ff8 Simplified hour conversion logic 2015-06-15 14:31:43 -07:00
Reed Garmsen
0b78b4465a Changed format of the time in the security tab to a 12hr clock from a 24hr clock 2015-06-15 14:22:25 -07:00
Corey Hulen
08e02c3dad Merge pull request #7 from rgarmsen2295/mm-1004
MM-1004
2015-06-15 10:20:21 -08:00
Corey Hulen
6f10c401a4 Merge pull request #7 from rgarmsen2295/mm-1004
MM-1004
2015-06-15 10:20:21 -08:00
Reed Garmsen
3895599c8f Error messages revolving around comment creation appear clientside unless we have a better solution in place 2015-06-15 11:09:57 -07:00
Reed Garmsen
2048b9567f Error messages revolving around comment creation appear clientside unless we have a better solution in place 2015-06-15 11:09:57 -07:00
Corey Hulen
91f7d11435 Merge pull request #6 from rgarmsen2295/mm-1066
MM-1066
2015-06-15 10:03:10 -08:00
Corey Hulen
21a868728a Merge pull request #6 from rgarmsen2295/mm-1066
MM-1066
2015-06-15 10:03:10 -08:00
Corey Hulen
c7bdb8acdb Merge pull request #4 from mattermost/mm-1245
fixes mm-1245 filenames are now url escaped
2015-06-15 10:02:11 -08:00
Corey Hulen
916df98252 Merge pull request #4 from mattermost/mm-1245
fixes mm-1245 filenames are now url escaped
2015-06-15 10:02:11 -08:00
Reed Garmsen
d8ef4cc2f0 Changed text describing the find more teams function for clarity 2015-06-15 10:51:44 -07:00
Reed Garmsen
7edcb60112 Changed text describing the find more teams function for clarity 2015-06-15 10:51:44 -07:00