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

  • ee5a77ec56 Merge pull request #734 from mattermost/plt-206 Christopher Speller 2015-09-21 12:19:57 -04:00
  • 977ab87d4a Merge pull request #736 from hmhealey/plt312 Joram Wilander 2015-09-21 12:13:44 -04:00
  • a2e3446e37 Added theme class to markdown links hmhealey 2015-09-21 11:41:40 -04:00
  • 3e868a6042 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. JoramWilander 2015-09-21 11:30:08 -04:00
  • a35fa9c974 Merge pull request #732 from mattermost/plt-243 Joram Wilander 2015-09-21 11:18:24 -04:00
  • eaaa30f6a2 Merge pull request #733 from hmhealey/plt310 Joram Wilander 2015-09-21 11:17:48 -04:00
  • 8b5cfa4594 Merge pull request #708 from hmhealey/plt173 Christopher Speller 2015-09-21 10:47:09 -04:00
  • d1101e3c91 Wrapped comment messages in divs like posts in the center pane hmhealey 2015-09-21 10:03:47 -04:00
  • 05b4a14d1e Adding new create channel modal to the more menu Christopher Speller 2015-09-21 09:40:45 -04:00
  • 4b177a6ed5 Added constants for EXIF orientations hmhealey 2015-09-18 18:00:09 -04:00
  • 7255209b72 Merge pull request #722 from hmhealey/timestamp Joram Wilander 2015-09-21 08:38:27 -04:00
  • f399b08db3 Merge pull request #729 from mattermost/rename-handle Joram Wilander 2015-09-21 08:37:53 -04:00
  • 4578138d57 Merge pull request #731 from asaadmahmoodspin/new-channel Christopher Speller 2015-09-21 08:25:41 -04:00
  • f75777ac6f Merge pull request #723 from hmhealey/plt17 Christopher Speller 2015-09-21 08:19:34 -04:00
  • 5dbdc0ff76 Updating new channel UI Asaad Mahmood 2015-09-21 11:09:23 +05:00
  • 814e467435 Shorten description help text it33 2015-09-20 21:24:27 -07:00
  • e989b839d5 Renaming "Handle" to "Channel URL" or "URL" it33 2015-09-20 21:17:58 -07:00
  • 4a13d37367 Renaming "Handle" to "Channel URL" or "URL" it33 2015-09-20 21:17:20 -07:00
  • aca720eb94 Adjust CLA request template it33 2015-09-19 21:40:44 -07:00
  • 86429c7bd5 Adjusting CLA request template it33 2015-09-19 21:27:13 -07:00
  • 7310153236 Added note on build version info improvement it33 2015-09-19 21:20:12 -07:00
  • 96b0ce880f Merge pull request #724 from mattermost/GIT-721 Corey Hulen 2015-09-19 19:53:57 -07:00
  • b8b3ba864d GIT-721 Removing sql ping log =Corey Hulen 2015-09-19 19:42:54 -07:00
  • 144a277a44 Cleaned up markdown formatting code and removed debug statements hmhealey 2015-09-19 11:08:39 -04:00
  • 5f18c71d07 Deferred to marked.js's html sanitization when markdown is enabled hmhealey 2015-09-19 11:01:38 -04:00
  • 2eb320f48a Changed markdown link parsing to automatically add an explicit protocol to urls hmhealey 2015-09-19 10:33:13 -04:00
  • efb3462a68 Prevented our url autolinking from breaking markdown links hmhealey 2015-09-19 10:31:48 -04:00
  • bb330b662a Added marked library to text_formatting.jsx hmhealey 2015-09-18 13:41:00 -04:00
  • ae5a1e3ea8 Removed underscores surrounding formatting tokens since they won't work with markdown hmhealey 2015-09-18 11:31:39 -04:00
  • 208bf914b8 Removed unnecessary conversion of newlines to html line breaks hmhealey 2015-09-18 11:29:52 -04:00
  • cfc919d111 Added a tooltip to post timestamps displaying the actual time the post was created hmhealey 2015-09-19 09:18:27 -04:00
  • 06f8b8bfb4 Merge pull request #720 from mattermost/it33-patch-4 Corey Hulen 2015-09-18 15:11:49 -07:00
  • 679e20aa4b Merge pull request #709 from mattermost/PLT-11 Harrison Healey 2015-09-18 18:11:01 -04:00
  • 676f2a6399 Merge pull request #718 from mattermost/it33-patch-3 Corey Hulen 2015-09-18 14:47:57 -07:00
  • 120bbb82cc Adjusting description of emoji codes feature it33 2015-09-18 14:34:52 -07:00
  • b02b93a060 Merge pull request #719 from lfbrock/patch-8 it33 2015-09-18 14:32:58 -07:00
  • 881089a82b Updated changlog to include new contributors and features lfbrock 2015-09-18 17:02:52 -04:00
  • d1241967e8 Adding build status indicator to README.md it33 2015-09-18 12:05:56 -07:00
  • 0ddabaf8de Merge pull request #717 from mattermost/fix-loadtest Corey Hulen 2015-09-18 09:49:49 -07:00
  • cdf813f07b merging =Corey Hulen 2015-09-18 09:25:47 -07:00
  • 5a436fd447 Merge pull request #699 from mattermost/PLT-92 Joram Wilander 2015-09-18 12:22:57 -04:00
  • 7caef4a7a7 Merge pull request #716 from hmhealey/plt299 Corey Hulen 2015-09-18 09:22:20 -07:00
  • d0f97b7a5f Merge pull request #714 from mattermost/test-matrix Corey Hulen 2015-09-18 09:21:05 -07:00
  • 1aa4913c44 fixing merge =Corey Hulen 2015-09-18 09:19:53 -07:00
  • c42a547b4f Fix authentication for loadtests. JoramWilander 2015-09-18 12:16:53 -04:00
  • bc8e69d99f Fixed incorrect check if a url starts with an explicit protocol hmhealey 2015-09-18 11:56:23 -04:00
  • 6eb32591d9 Merge pull request #713 from mattermost/it33-patch-3 Christopher Speller 2015-09-18 09:47:12 -04:00
  • 48110020af PLT-173 Changed thumbnails and previews to generate correctly for images with a non-standard orientation hmhealey 2015-09-17 11:09:13 -04:00
  • ab771c8f75 Adding go 1.5.1 and postgress to travis build Christopher Speller 2015-09-17 16:27:25 -04:00
  • 151849d536 Merge pull request #712 from mattermost/postgres-oauth-fix Christopher Speller 2015-09-18 09:30:25 -04:00
  • 5583907b5b Adding template for contributor list request it33 2015-09-18 05:55:02 -07:00
  • 432753bb4d Return false when checking if column exists, if the table does not exist with postgres. JoramWilander 2015-09-18 08:07:31 -04:00
  • c717fcb325 Merge pull request #665 from chengweiv5/fix-coding-style Christopher Speller 2015-09-18 07:48:25 -04:00
  • a31868336f go fmt Jack 2015-09-17 23:21:45 -07:00
  • e0a91c0d66 content type for getFile Jack 2015-09-17 23:11:03 -07:00
  • 60af1fad1f Moving logout item =Corey Hulen 2015-09-17 22:25:37 -07:00
  • 804b696bdc PLT-11 adding config for logs to UI =Corey Hulen 2015-09-17 22:00:33 -07:00
  • 44714dfcb1 PLT-11 Adding ability to save config file =Corey Hulen 2015-09-17 21:00:59 -07:00
  • d83be6df2d PLT-173 Added graphics-go and goexif libraries for image manipulation hmhealey 2015-09-17 11:08:47 -04:00
  • 82127341ca Merge pull request #705 from esethna/patch-1 Corey Hulen 2015-09-17 13:25:21 -07:00
  • c63da24964 moving to security tab =Corey Hulen 2015-09-17 13:24:55 -07:00
  • 522e4934c9 fixing versioning =Corey Hulen 2015-09-17 13:06:25 -07:00
  • af4deb2369 Making changes to versioning =Corey Hulen 2015-09-17 13:01:40 -07:00
  • a4aad2b69b Merge pull request #706 from lindy65/patch-2 Joram Wilander 2015-09-17 15:48:50 -04:00
  • 7994e7ddb9 Fixing URL for "Developer Machine Setup" lindy65 2015-09-17 21:24:14 +02:00
  • 9b5198c69c Merge branch 'master' into PLT-92 =Corey Hulen 2015-09-17 09:21:56 -07:00
  • 3edd8dbdf6 Merge pull request #704 from hmhealey/freetype Christopher Speller 2015-09-17 12:17:27 -04:00
  • 7901126b63 Merge pull request #701 from mattermost/PLT-40 Joram Wilander 2015-09-17 11:56:59 -04:00
  • aa79a12a31 Grammar change to New Channel ui text esethna 2015-09-17 09:56:42 -06:00
  • de64bd19d5 Merge pull request #703 from mattermost/add-gofmt Corey Hulen 2015-09-17 08:44:50 -07:00
  • 4005d8bfd0 Updated godep workspace and freetype library so that godep save and restore work again hmhealey 2015-09-17 11:04:26 -04:00
  • eb4b80a484 Adding gofmt to travis build Christopher Speller 2015-09-17 09:01:33 -04:00
  • 047fec54cc Merge pull request #683 from mattermost/it33-patch-1 Harrison Healey 2015-09-17 08:34:00 -04:00
  • ed976112ad Fixed typo it33 2015-09-17 05:10:12 -07:00
  • 1bb2e5a217 Merge pull request #700 from mattermost/GIT-698 Christopher Speller 2015-09-17 07:54:30 -04:00
  • fd3a7afb3e Merge pull request #702 from mattermost/oauth-switch-fix Joram Wilander 2015-09-17 07:53:02 -04:00
  • 936f032ec4 Merge pull request #680 from hmhealey/plt159 Joram Wilander 2015-09-17 07:49:29 -04:00
  • ce19b3c211 Properly check if OAuth providing is enabled on the client. JoramWilander 2015-09-17 07:46:38 -04:00
  • 99d0db136c Fixing css =Corey Hulen 2015-09-16 23:27:25 -07:00
  • 8e848f38d5 PLT-40 adding experimental support for emojis =Corey Hulen 2015-09-16 23:22:15 -07:00
  • 1d37723307 Fixes GIT-698 allow ability to disable team creation for SSO =Corey Hulen 2015-09-16 21:31:45 -07:00
  • 51c3445e69 Fixing postgres issue and bumping version number =Corey Hulen 2015-09-16 21:16:07 -07:00
  • 4352118700 Adding version to UI =Corey Hulen 2015-09-16 20:16:42 -07:00
  • abda39b652 Adding database schema version =Corey Hulen 2015-09-16 19:59:57 -07:00
  • 1e7f7852ad Outputing version to logs on server start =Corey Hulen 2015-09-16 17:49:48 -07:00
  • e3bf54f161 fixing build =Corey Hulen 2015-09-16 17:45:00 -07:00
  • cef7a1aae4 PLT-92 Adding server side versioning to the binary =Corey Hulen 2015-09-16 17:37:11 -07:00
  • acf2fb64b4 Cleaned up logic for the unread indicators Christopher Speller 2015-09-16 14:53:16 -04:00
  • 7e66a3d5be Moved unread channel indicators into their own React component and file hmhealey 2015-09-15 17:36:48 -04:00
  • 8d0c69aec6 Properly hide unread channel indicators when there are no unread channels hmhealey 2015-09-14 16:56:20 -04:00
  • e644b53b72 Merge pull request #697 from mattermost/PLT-93 Christopher Speller 2015-09-16 16:32:27 -04:00
  • 720f1082d3 Merge pull request #696 from mattermost/PLT-23 Christopher Speller 2015-09-16 16:31:26 -04:00
  • dc74d57611 Merge pull request #694 from mattermost/GIT-669 Christopher Speller 2015-09-16 16:30:05 -04:00
  • b1f26540ce Merge pull request #693 from mattermost/mm-1419 Christopher Speller 2015-09-16 16:26:56 -04:00
  • 47e6a33a45 Implement OAuth2 service provider functionality. JoramWilander 2015-09-16 15:49:12 -04:00
  • c60e687c6b Fixing broken email templates =Corey Hulen 2015-09-16 12:38:51 -07:00
  • 609e5c6652 Fixing broken email templates =Corey Hulen 2015-09-16 12:38:09 -07:00
  • c7bb4ab7f8 Fixing broken email templates =Corey Hulen 2015-09-16 12:37:54 -07:00
  • ac38aadc12 Fixing broken email templates =Corey Hulen 2015-09-16 12:36:35 -07:00
  • c2829b24e4 PLT-23 error.html pulls files from static =Corey Hulen 2015-09-16 12:08:26 -07:00