Commit Graph
1391 Commits
Author SHA1 Message Date
Joram Wilander c85a852146 Merge pull request #304 from hmhealey/mm1706
MM-1706 Changed mention highlighting code to split words on all non-word characters
2015-07-31 09:06:23 -04:00
Christopher Speller 7b968a7572 Merge pull request #293 from rgarmsen2295/mm-1725
MM-1725 Added text to inform the user a session id is not available for a login attempt
2015-07-31 08:57:51 -04:00
Christopher Speller b7869cdb3c Merge pull request #283 from mattermost/mm-1787
MM-1787 Fixing links for signup from team invite link.
2015-07-31 08:56:24 -04:00
Joram Wilander 0ecc1dba81 Merge pull request #294 from asaadmahmoodspin/master
Improving smoothness of RHS search
2015-07-31 08:50:05 -04:00
Asaad Mahmood eae619e170 MM-1473 - Updating text for close buttons 2015-07-31 15:59:37 +05:00
Asaad Mahmood ad0231f275 Merge branch 'master' of https://github.com/mattermost/platform 2015-07-31 15:59:11 +05:00
Reed Garmsen aaad5add26 Added text to inform the user a session id is not available for a login attempt (no session created yet) 2015-07-30 15:03:28 -07:00
hmhealey 2e6c41f7d7 Changed mention highlighting code to split words on all non-word characters 2015-07-30 17:01:07 -04:00
nickago a41c42c4d4 Updated error message for an incorrect password 2015-07-30 13:54:00 -07:00
hmhealey e2d77c28f1 Removed ^replying in preparation for 0.6.0 2015-07-30 15:21:35 -04:00
lfbrock ba06300402 MM-1841 Corrected help text 2015-07-30 14:13:34 -04:00
Christopher Speller 9cc369b6b6 Removing nickname parameter from FireAndForgetVerifyEmail 2015-07-30 13:42:27 -04:00
Joram Wilander 8265e5ed82 Merge pull request #292 from mattermost/mm-1782
MM-1782 makes the LHS dropdown close when clicking on the LHS header
2015-07-30 13:01:38 -04:00
JoramWilander b1993dc02c update readme with basic config settings setup information 2015-07-30 12:59:29 -04:00
nickago cd2e035b25 Changed language in error message to reflect better English and did cosmetic refactoring 2015-07-30 09:57:02 -07:00
JoramWilander 4b531ef8c4 added .off() for dropdown hide event on LHS header 2015-07-30 12:11:01 -04:00
Joram Wilander c09beaa655 Merge pull request #295 from mattermost/it33-patch-2
Removing unnecessary "the"
2015-07-30 11:41:10 -04:00
it33 3f781fdaf9 Removing unnecessary "the" 2015-07-30 08:36:13 -07:00
Joram Wilander 9105b02cc4 Merge pull request #285 from hmhealey/mm1738
MM-1787 Fixed team API to properly provide team names for the Find My Team email
2015-07-30 11:31:51 -04:00
Asaad Mahmood b6018c390f Improving smoothness of RHS search 2015-07-30 20:21:09 +05:00
JoramWilander e5c79cd193 makes the LHS dropdown close when clicking on the LHS header 2015-07-30 10:54:41 -04:00
JoramWilander bcee238666 partially fixed postgres search so that multiple search terms work 2015-07-30 09:55:03 -04:00
Joram Wilander e699acb808 Merge pull request #284 from nickago/MM-1768
MM-1768 Updated Upload to Select in profile uploader and did cosmetic refactoring
2015-07-30 08:58:56 -04:00
Christopher Speller 6222d2cb30 Fixing links for signup from team invite link. Enter now advances signup_user_complete screen. Signin now link now redirects properly. 2015-07-30 08:53:20 -04:00
Christopher Speller 51e244ab5a Merge pull request #282 from nickago/MM-1642
MM-1642 Updated the password error message to not contain extraneous information
2015-07-30 08:51:00 -04:00
Christopher Speller 4646c22ef1 Merge pull request #281 from nickago/MM-1600
MM-1600 Improve quality of error returned upon a duplicate username request
2015-07-30 08:49:36 -04:00
Christopher Speller b2b6bddadc Merge pull request #272 from rgarmsen2295/mm-1463
MM-1463 Adds back username initials being included in user's default profile picture
2015-07-30 08:34:37 -04:00
JoramWilander 0c627913f7 removed ternary operator to make if statement clearer 2015-07-30 08:33:52 -04:00
Christopher Speller c7a8112c17 Moving the handing of extra_info etag before the extra info is retrieved from the database 2015-07-30 08:24:06 -04:00
Corey Hulen 659bd97b63 Merge pull request #289 from mattermost/it33-patch-4
MM-1816 Make Off-Topic description more clear
2015-07-30 01:17:53 -08:00
Corey Hulen eaa59d54b3 Merge pull request #288 from mattermost/it33-patch-3
Corrected "lower case" to "lowercase"
2015-07-30 01:17:43 -08:00
Corey Hulen b97329cd0a Merge pull request #287 from mattermost/it33-patch-2
Correcting proper use of "set up" vs. "setup"
2015-07-30 01:17:34 -08:00
Corey Hulen a1e53c64f6 Merge pull request #280 from mattermost/mm-1746
MM-1746 channel handle now populates properly on opening of channel rename modal
2015-07-30 01:10:43 -08:00
=Corey Hulen d93bf60248 Merge branch 'master' into mm-1355 2015-07-30 01:06:50 -08:00
=Corey Hulen b4877c5d36 Fixing code review feedback 2015-07-30 00:46:17 -08:00
Corey Hulen deb4fac1f6 Merge pull request #290 from mattermost/mm-1564
Fixes mm-1564 adds release to travis and git
2015-07-30 00:17:19 -08:00
=Corey Hulen 80b6f34f9a fixing travis file 2015-07-30 00:06:15 -08:00
=Corey Hulen e8f0ca7a29 removing flaky unit test 2015-07-30 00:02:48 -08:00
=Corey Hulen 5954a83a14 Fixes mm-1564 adds release to travis and git 2015-07-29 23:55:45 -08:00
it33 4071e6d472 MM-1816 Make Off-Topic description more clear 2015-07-29 22:12:28 -07:00
it33 e787cb7a3c Corrected "lower case" to "lowercase" 2015-07-29 18:58:07 -07:00
it33 231e967f15 Correcting proper use of "set up" vs. "setup" 2015-07-29 18:56:08 -07:00
hmhealey 1055d8f4a1 Fixed team API to properly provide team names for the Find My Team email 2015-07-29 18:35:33 -04:00
nickago 49b7f98709 Changed Update to Select, removed illegal spaces, and changed double quotes to single 2015-07-29 14:41:44 -07:00
Reed Garmsen f0a60181fe Made font type a field in the config file 2015-07-29 14:06:15 -07:00
Reed Garmsen 876a9f642a Changed text initial size and positioning to better handle different image sizes and removed dead code 2015-07-29 13:47:37 -07:00
nickago aac2567116 Stripped obfuscating information from password change error and synchronized error slots so that only one will show at once. 2015-07-29 12:18:28 -07:00
Reed Garmsen 965833a737 Added godeps and the source for the go freetype library 2015-07-29 11:58:51 -07:00
Joram Wilander 3dee6ebb03 Merge pull request #279 from asaadmahmoodspin/master
Fixing LHS Header css
2015-07-29 14:55:13 -04:00
Christopher Speller 3f97e06bf8 Adding etag to channel extra_info api call. 2015-07-29 14:35:25 -04:00