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

  • 247708d924 Merge branch 'master' into mm-1619 =Corey Hulen 2015-08-02 09:41:12 -08:00
  • 718d670d69 Fixing upgrade =Corey Hulen 2015-08-02 09:30:18 -08:00
  • 38e44e8f61 Merge pull request #278 from mattermost/mm-1702 Corey Hulen 2015-08-02 09:17:52 -08:00
  • 4d1562c5de Merge pull request #273 from mattermost/mm-1355 Corey Hulen 2015-08-02 09:17:37 -08:00
  • adc8def9e0 Merge pull request #312 from mattermost/mm-1784 Corey Hulen 2015-08-02 09:01:06 -08:00
  • faa9bbdf97 Merge pull request #305 from nickago/MM-1681 Corey Hulen 2015-08-02 09:00:30 -08:00
  • 2aba63df8e Merge pull request #302 from hmhealey/mm1788 Corey Hulen 2015-08-02 09:00:13 -08:00
  • 0b6c6b94cb Merge pull request #301 from lfbrock/patch-1 Corey Hulen 2015-08-02 09:00:01 -08:00
  • f0993ff65f Merge pull request #300 from hmhealey/ubuntudev Corey Hulen 2015-08-02 08:59:47 -08:00
  • 1ec597df59 Merge pull request #291 from mattermost/mm-1758 Corey Hulen 2015-08-02 08:59:27 -08:00
  • 1f417368ad Merge pull request #276 from mattermost/mm-1688 Corey Hulen 2015-08-02 08:59:07 -08:00
  • 41f96636d6 Merge pull request #274 from mattermost/mm-1497 Corey Hulen 2015-08-02 08:58:33 -08:00
  • 810c527fcb Merge pull request #313 from mattermost/it33-patch-3 Joram Wilander 2015-08-01 18:12:09 -04:00
  • d39e10c16b Update to give credit to MongoDB on licensing it33 2015-07-31 21:49:10 -07:00
  • 633c39499b switching to a new PM channel now works in the more modal JoramWilander 2015-07-31 16:09:29 -04:00
  • e76fc37b6d Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned directories. Christopher Speller 2015-07-27 09:48:35 -04:00
  • 7f1dd85255 Merge pull request #298 from mattermost/mm-1789 Joram Wilander 2015-07-31 13:23:49 -04:00
  • 70669c5110 replaced 'fiddle' with 'adjust' to be more clear JoramWilander 2015-07-31 13:22:32 -04:00
  • ac53536385 User Settings modal resets to General tab with nothing open on close nickago 2015-07-31 09:51:37 -07:00
  • b1cc1ef0bc Merge pull request #299 from nickago/MM-1734 Christopher Speller 2015-07-31 12:08:42 -04:00
  • ec6d408e29 Merge pull request #303 from nickago/MM-1642 Christopher Speller 2015-07-31 11:39:00 -04:00
  • 6819f85a22 Merge pull request #306 from nickago/MM-1660 Christopher Speller 2015-07-31 11:38:30 -04:00
  • f7e5ac1db0 Added singlequotes around 'Edit' and did cosmetic refactoring nickago 2015-07-30 14:51:31 -07:00
  • 4f235669e7 Updated actual text of error message nickago 2015-07-31 08:07:11 -07:00
  • bc48281f7a Changed all templates to use site url instead of team url for finding the 'static' directory nickago 2015-07-28 13:28:18 -07:00
  • 9aebbe058e Updated developer setup instructions to include Ubuntu setup Harrison Healey 2015-07-30 13:30:49 -04:00
  • 144caab578 Merge pull request #307 from mattermost/revert-304-mm1706 Joram Wilander 2015-07-31 10:04:24 -04:00
  • 56724980f8 Revert "MM-1706 Changed mention highlighting code to split words on all non-word characters" Joram Wilander 2015-07-31 10:02:21 -04:00
  • dad7851423 center small thumbnails and top left larger thumbnails JoramWilander 2015-07-31 09:52:18 -04:00
  • 8542fbd1ac removed uneccessary utils loadThumbnails function JoramWilander 2015-07-31 09:39:53 -04:00
  • 36748f523a updated docker config thumbnail width/height JoramWilander 2015-07-29 12:24:47 -04:00
  • a541f09380 image thumbnails now scale appropriately so there is no whitespace, also generalized some thumbnail loading code JoramWilander 2015-07-29 10:09:11 -04:00
  • d0865b78b7 Merge pull request #271 from hmhealey/mm1656 Joram Wilander 2015-07-31 09:16:07 -04:00
  • c85a852146 Merge pull request #304 from hmhealey/mm1706 Joram Wilander 2015-07-31 09:06:23 -04:00
  • 7b968a7572 Merge pull request #293 from rgarmsen2295/mm-1725 Christopher Speller 2015-07-31 08:57:51 -04:00
  • b7869cdb3c Merge pull request #283 from mattermost/mm-1787 Christopher Speller 2015-07-31 08:56:24 -04:00
  • 0ecc1dba81 Merge pull request #294 from asaadmahmoodspin/master Joram Wilander 2015-07-31 08:50:05 -04:00
  • eae619e170 MM-1473 - Updating text for close buttons Asaad Mahmood 2015-07-31 15:59:37 +05:00
  • ad0231f275 Merge branch 'master' of https://github.com/mattermost/platform Asaad Mahmood 2015-07-31 15:59:11 +05:00
  • aaad5add26 Added text to inform the user a session id is not available for a login attempt (no session created yet) Reed Garmsen 2015-07-29 15:11:07 -07:00
  • 2e6c41f7d7 Changed mention highlighting code to split words on all non-word characters hmhealey 2015-07-30 17:01:07 -04:00
  • a41c42c4d4 Updated error message for an incorrect password nickago 2015-07-30 13:54:00 -07:00
  • e2d77c28f1 Removed ^replying in preparation for 0.6.0 hmhealey 2015-07-30 15:21:35 -04:00
  • ba06300402 MM-1841 Corrected help text lfbrock 2015-07-30 14:13:34 -04:00
  • 9cc369b6b6 Removing nickname parameter from FireAndForgetVerifyEmail Christopher Speller 2015-07-30 13:42:27 -04:00
  • 8265e5ed82 Merge pull request #292 from mattermost/mm-1782 Joram Wilander 2015-07-30 13:01:38 -04:00
  • b1993dc02c update readme with basic config settings setup information JoramWilander 2015-07-30 12:59:29 -04:00
  • cd2e035b25 Changed language in error message to reflect better English and did cosmetic refactoring nickago 2015-07-30 09:57:02 -07:00
  • 4b531ef8c4 added .off() for dropdown hide event on LHS header JoramWilander 2015-07-30 12:11:01 -04:00
  • c09beaa655 Merge pull request #295 from mattermost/it33-patch-2 Joram Wilander 2015-07-30 11:41:10 -04:00
  • 3f781fdaf9 Removing unnecessary "the" it33 2015-07-30 08:36:13 -07:00
  • 9105b02cc4 Merge pull request #285 from hmhealey/mm1738 Joram Wilander 2015-07-30 11:31:51 -04:00
  • b6018c390f Improving smoothness of RHS search Asaad Mahmood 2015-07-30 20:21:09 +05:00
  • e5c79cd193 makes the LHS dropdown close when clicking on the LHS header JoramWilander 2015-07-30 10:54:41 -04:00
  • bcee238666 partially fixed postgres search so that multiple search terms work JoramWilander 2015-07-30 09:55:03 -04:00
  • e699acb808 Merge pull request #284 from nickago/MM-1768 Joram Wilander 2015-07-30 08:58:56 -04:00
  • 6222d2cb30 Fixing links for signup from team invite link. Enter now advances signup_user_complete screen. Signin now link now redirects properly. Christopher Speller 2015-07-29 16:17:20 -04:00
  • 51e244ab5a Merge pull request #282 from nickago/MM-1642 Christopher Speller 2015-07-30 08:51:00 -04:00
  • 4646c22ef1 Merge pull request #281 from nickago/MM-1600 Christopher Speller 2015-07-30 08:49:36 -04:00
  • b2b6bddadc Merge pull request #272 from rgarmsen2295/mm-1463 Christopher Speller 2015-07-30 08:34:37 -04:00
  • 0c627913f7 removed ternary operator to make if statement clearer JoramWilander 2015-07-30 08:33:52 -04:00
  • c7a8112c17 Moving the handing of extra_info etag before the extra info is retrieved from the database Christopher Speller 2015-07-30 08:24:06 -04:00
  • 659bd97b63 Merge pull request #289 from mattermost/it33-patch-4 Corey Hulen 2015-07-30 01:17:53 -08:00
  • eaa59d54b3 Merge pull request #288 from mattermost/it33-patch-3 Corey Hulen 2015-07-30 01:17:43 -08:00
  • b97329cd0a Merge pull request #287 from mattermost/it33-patch-2 Corey Hulen 2015-07-30 01:17:34 -08:00
  • a1e53c64f6 Merge pull request #280 from mattermost/mm-1746 Corey Hulen 2015-07-30 01:10:43 -08:00
  • d93bf60248 Merge branch 'master' into mm-1355 =Corey Hulen 2015-07-30 01:06:50 -08:00
  • b4877c5d36 Fixing code review feedback =Corey Hulen 2015-07-30 00:46:17 -08:00
  • deb4fac1f6 Merge pull request #290 from mattermost/mm-1564 Corey Hulen 2015-07-30 00:17:19 -08:00
  • 80b6f34f9a fixing travis file =Corey Hulen 2015-07-30 00:06:15 -08:00
  • e8f0ca7a29 removing flaky unit test =Corey Hulen 2015-07-30 00:02:48 -08:00
  • 5954a83a14 Fixes mm-1564 adds release to travis and git =Corey Hulen 2015-07-29 23:55:45 -08:00
  • 4071e6d472 MM-1816 Make Off-Topic description more clear it33 2015-07-29 22:12:28 -07:00
  • e787cb7a3c Corrected "lower case" to "lowercase" it33 2015-07-29 18:58:07 -07:00
  • 231e967f15 Correcting proper use of "set up" vs. "setup" it33 2015-07-29 18:56:08 -07:00
  • 1055d8f4a1 Fixed team API to properly provide team names for the Find My Team email hmhealey 2015-07-29 18:35:33 -04:00
  • 49b7f98709 Changed Update to Select, removed illegal spaces, and changed double quotes to single nickago 2015-07-29 14:40:55 -07:00
  • f0a60181fe Made font type a field in the config file Reed Garmsen 2015-07-29 14:06:15 -07:00
  • 876a9f642a Changed text initial size and positioning to better handle different image sizes and removed dead code Reed Garmsen 2015-07-29 13:40:24 -07:00
  • aac2567116 Stripped obfuscating information from password change error and synchronized error slots so that only one will show at once. nickago 2015-07-29 12:18:28 -07:00
  • 965833a737 Added godeps and the source for the go freetype library Reed Garmsen 2015-07-28 17:31:27 -07:00
  • 3dee6ebb03 Merge pull request #279 from asaadmahmoodspin/master Joram Wilander 2015-07-29 14:55:13 -04:00
  • 3f97e06bf8 Adding etag to channel extra_info api call. Christopher Speller 2015-07-29 11:30:56 -04:00
  • 7cdd91687c Added error safety and a unique message for duplicate emails nickago 2015-07-29 10:45:33 -07:00
  • 3866358c0a Minor Ui updates regarding the search and the center channel header on mobile. Asaad Mahmood 2015-07-29 22:09:08 +05:00
  • 0f54233f66 Merge pull request #277 from mattermost/mm-1741 Christopher Speller 2015-07-29 12:57:43 -04:00
  • d5c5ae0939 Merge pull request #269 from rgarmsen2295/mm-1686 Christopher Speller 2015-07-29 12:55:57 -04:00
  • 9913895423 Merge pull request #259 from nickago/MM-1683 Christopher Speller 2015-07-29 12:55:31 -04:00
  • a07ab924d3 Added a unique error message for bad username and simplified error outputed to user nickago 2015-07-29 09:42:13 -07:00
  • a9da77908a Updating color of hover on LHS Header Asaad Mahmood 2015-07-29 21:36:24 +05:00
  • 2800d5e9ca channel handle now populates properly on opening of channel rename modal JoramWilander 2015-07-29 12:35:01 -04:00
  • 8c14a16d01 Access History and Active Sessions are now lazy-loaded upon opening instead of loaded at start; added loading screens to Access History and Active Sessions Reed Garmsen 2015-07-28 09:28:00 -07:00
  • 5fa374e4eb Fixing LHS Header css Asaad Mahmood 2015-07-29 21:18:49 +05:00
  • be5470c422 Merge pull request #256 from nickago/MM-1183 Joram Wilander 2015-07-29 12:14:21 -04:00
  • beef8f776f updated channel error messages to reflect proper naming JoramWilander 2015-07-29 12:01:23 -04:00
  • 1c186121fe Merge branch 'master' of https://github.com/mattermost/platform Asaad Mahmood 2015-07-29 20:55:56 +05:00
  • 27dbcd8767 Merge pull request #275 from asaadmahmoodspin/mm-1762 Joram Wilander 2015-07-29 11:48:07 -04:00
  • bf1ef5bbfe Merge pull request #261 from mattermost/it33-freetype-license-addition Joram Wilander 2015-07-29 11:42:25 -04:00
  • 2775225e0d Added IE friendly window origin function in place of unwrapped call nickago 2015-07-29 08:32:26 -07:00
  • 7bc5f4e863 reset number of posts to fetch on channel switch and fresh page load JoramWilander 2015-07-29 11:30:54 -04:00