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

  • 4f371254c6 Merge pull request #771 from rgarmsen2295/plt-143 Harrison Healey 2015-09-24 09:17:59 -04:00
  • 90d1f4c6a1 Merge pull request #776 from mishimi/patch-5 Harrison Healey 2015-09-24 09:09:53 -04:00
  • 54c7dba33d Merge pull request #765 from mattermost/PLT-349 Christopher Speller 2015-09-24 08:14:30 -04:00
  • 56f76502e3 Merge pull request #769 from hmhealey/plt334 Joram Wilander 2015-09-24 08:14:25 -04:00
  • 59afe8bdf8 PLT-388 mishimi 2015-09-24 04:07:49 -07:00
  • 8617c6a4a3 godep fix Jack 2015-09-23 20:10:11 -07:00
  • dd94a3df5d add imaging Jack 2015-09-23 20:00:36 -07:00
  • f43d355078 godep save Jack 2015-09-23 19:54:07 -07:00
  • 396a535f10 use github.com/disintegration/imaging Jack 2015-09-23 15:57:49 -07:00
  • 00112cae51 Assiging first user system_admin role =Corey Hulen 2015-09-23 15:52:59 -07:00
  • ef8705ab6b Text cursor now focuses on the textbox after performing a drag and drop of some text Reed Garmsen 2015-09-23 15:12:23 -07:00
  • fba72b849c Merge pull request #766 from mattermost/postpone-oauth-and-webhooks Corey Hulen 2015-09-23 15:25:44 -07:00
  • 23029204dc Merge pull request #770 from hmhealey/plt339 Corey Hulen 2015-09-23 15:21:46 -07:00
  • 985aebf861 Fixing state setting =Corey Hulen 2015-09-23 15:16:48 -07:00
  • 03eece597d Added support to drag and drop text into the main textbox or RHS textbox Reed Garmsen 2015-09-23 15:01:02 -07:00
  • 466f470ff1 Changed Markdown links to open in a new tab hmhealey 2015-09-23 17:53:46 -04:00
  • 511fcce553 Restricted markdown output to only appear on one line when in singleline mode hmhealey 2015-09-23 17:42:57 -04:00
  • 7f3bfdbe0c Fixing merge =Corey Hulen 2015-09-23 14:38:34 -07:00
  • c7c644874e Merge pull request #768 from mattermost/segment-fix Corey Hulen 2015-09-23 14:35:26 -07:00
  • a9c4f5efd0 fixing segment bug =Corey Hulen 2015-09-23 14:35:05 -07:00
  • b7d819bfcd Merge pull request #767 from mattermost/segment-fix Corey Hulen 2015-09-23 14:33:04 -07:00
  • 2f72d4702b fixing segment bug =Corey Hulen 2015-09-23 14:32:44 -07:00
  • f9abb5a94a Merge pull request #762 from asaadmahmoodspin/ui-improvements Harrison Healey 2015-09-23 17:21:57 -04:00
  • d792745f54 Merge pull request #752 from mattermost/PLT-11-email Corey Hulen 2015-09-23 14:04:08 -07:00
  • ccf2e6e4e7 Changing image settings to file settings =Corey Hulen 2015-09-23 13:47:10 -07:00
  • ea0dcb4421 Small fix for react key warning Reed Garmsen 2015-09-23 13:21:35 -07:00
  • 1779a71721 Removing OAuth and webhooks changes it33 2015-09-23 13:29:50 -07:00
  • 2b5b8f95ed Merge branch 'master' into PLT-11-email =Corey Hulen 2015-09-23 12:55:58 -07:00
  • 1626a6de6f PLT-349 adding team mgt to admin console =Corey Hulen 2015-09-23 12:49:28 -07:00
  • 0170cfe604 Merge pull request #764 from mattermost/theme-image-fix Corey Hulen 2015-09-23 12:44:13 -07:00
  • e79e66c0a4 Fix theme images 404ing. JoramWilander 2015-09-23 15:29:39 -04:00
  • bff0956ba5 Merge pull request #761 from mattermost/plt-356 Harrison Healey 2015-09-23 15:04:45 -04:00
  • 15f15de8ca Merge pull request #759 from mattermost/plt-242-3 Harrison Healey 2015-09-23 15:04:22 -04:00
  • 47aab71e6b Markdown UI improvements with small description height fix Asaad Mahmood 2015-09-23 23:37:36 +05:00
  • 301706f255 Merge pull request #753 from hmhealey/plt341 Corey Hulen 2015-09-23 09:57:43 -07:00
  • 845229d983 Fix post not rendering properly in some cases. JoramWilander 2015-09-23 12:25:01 -04:00
  • fa312f5b47 Merge pull request #760 from chengweiv5/PLT-126 Harrison Healey 2015-09-23 11:31:10 -04:00
  • f7a32fa38a PLT-126: Change 'Private Messages' to 'Direct Messages' Chengwei Yang 2015-09-23 22:37:40 +08:00
  • e4a15076f4 Implement UI theme colors. JoramWilander 2015-09-23 10:12:40 -04:00
  • 018b036e5d Added CSS classes to markdown headings, links, and tables hmhealey 2015-09-22 15:23:39 -04:00
  • 7eef5be359 Merge pull request #740 from asaadmahmoodspin/ui-improvements Joram Wilander 2015-09-23 08:41:17 -04:00
  • f2c0db000c Merge pull request #756 from rgarmsen2295/plt-165 Joram Wilander 2015-09-23 08:40:11 -04:00
  • e637927a0b Merge pull request #757 from chengweiv5/PLT-168 Joram Wilander 2015-09-23 08:39:31 -04:00
  • d3c09f209b Merge pull request #755 from rgarmsen2295/plt-164 Christopher Speller 2015-09-23 08:30:42 -04:00
  • bdd0cfd227 Merge pull request #751 from hmhealey/plt344 Christopher Speller 2015-09-23 08:27:12 -04:00
  • 0391e5fe96 Merge pull request #758 from sjmog/readme-fix it33 2015-09-23 05:23:05 -07:00
  • fc104242f4 Merge pull request #748 from hmhealey/plt233 Christopher Speller 2015-09-23 08:22:41 -04:00
  • 772a4337c6 Merge pull request #739 from rgarmsen2295/plt-39 Christopher Speller 2015-09-23 08:19:45 -04:00
  • bc057f1f9d fix README typo Sam Morgan 2015-09-23 12:48:51 +01:00
  • 284b3bb64c PLT-168: check email used to reset password strictly Chengwei Yang 2015-09-23 16:57:48 +08:00
  • f340d21cf4 Merge pull request #754 from mattermost/it33-patch-1 Corey Hulen 2015-09-22 17:28:25 -07:00
  • 3ab7d3e24d Adds a check for email validity client-side when joining a team using a public link Reed Garmsen 2015-09-22 16:38:46 -07:00
  • 2270a2bb45 Functionalized draft checking Reed Garmsen 2015-09-22 16:00:44 -07:00
  • bb557b30d7 Post drafts are now displayed when they contain only files and no text Reed Garmsen 2015-09-22 15:23:50 -07:00
  • f533d4bf30 Removing CLA templates response it33 2015-09-22 14:28:12 -07:00
  • f1700e765b Small change to remove react warning Reed Garmsen 2015-09-21 18:41:22 -07:00
  • 9e04909c0a Adding new EnableIncomingWebhooks property to service settings in the admin console. =Corey Hulen 2015-09-22 13:28:03 -07:00
  • 554f017327 Fixing merge conflict =Corey Hulen 2015-09-22 13:20:24 -07:00
  • 6e60768abe Fixing merge conflict =Corey Hulen 2015-09-22 13:18:42 -07:00
  • ac7918c554 Merge pull request #715 from mattermost/plt-27 Joram Wilander 2015-09-22 15:47:57 -04:00
  • e22e7b8b7b Fixing bug in generating key length =Corey Hulen 2015-09-22 12:31:01 -07:00
  • fc71869a96 Merge branch 'master' into PLT-11-email =Corey Hulen 2015-09-22 12:24:39 -07:00
  • 88e5a71e8c Adding service settings to admin console =Corey Hulen 2015-09-22 12:12:50 -07:00
  • 55f11ba871 Removed extra handling of markdown links when doing autolinking hmhealey 2015-09-22 14:34:59 -04:00
  • ec0e11489e Merge pull request #1 from driou/driou-patch-1 Adrien Bourroux 2015-09-22 20:34:34 +02:00
  • 50ccf053ac Update README.md Adrien Bourroux 2015-09-22 20:32:43 +02:00
  • 1afa1d37c7 Moved text formatting code to only occur inside of markdown text nodes hmhealey 2015-09-22 14:30:50 -04:00
  • d025da5da9 Changed hashtag regex to only accept hashtags that begin with a letter hmhealey 2015-09-22 14:28:43 -04:00
  • 1709532ae6 Moved emoticon parsing to happen after url parsing so that we don't have smilies accidentally occuring in urls hmhealey 2015-09-22 14:14:54 -04:00
  • a44e8f0cd9 Merge pull request #710 from jdeng/master Joram Wilander 2015-09-22 14:08:32 -04:00
  • ffe34aa154 Restored changes which remove emojify and switch to our own version hmhealey 2015-09-22 13:53:43 -04:00
  • e9a2c223f2 Merge pull request #747 from mattermost/revert-742-plt289 Christopher Speller 2015-09-22 13:33:18 -04:00
  • 6beadc0319 Revert "PLT-289 Properly removed lingering references to emojify" Christopher Speller 2015-09-22 13:33:11 -04:00
  • 09e8874b8e Removed click handler from RHS [...] menu hmhealey 2015-09-22 13:27:10 -04:00
  • 7c0388856d Merge pull request #746 from mattermost/revert-737-plt289 Christopher Speller 2015-09-22 13:22:04 -04:00
  • e7d408585a Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed emojify" Christopher Speller 2015-09-22 13:21:58 -04:00
  • 302372cfa0 Removing click event for channel description popover Asaad Mahmood 2015-09-22 21:01:55 +05:00
  • 130e73ca02 Merge pull request #742 from hmhealey/plt289 Christopher Speller 2015-09-22 11:25:15 -04:00
  • 602bed85f2 fix conflict Jack 2015-09-22 08:16:51 -07:00
  • a948935def Properly removed lingering references to emojify hmhealey 2015-09-22 10:54:52 -04:00
  • f439c82d7c Merge pull request #737 from hmhealey/plt289 Harrison Healey 2015-09-22 09:32:25 -04:00
  • 251d33ad23 Added parsing for named emojis to TextFormatting and removed dependency on emojify hmhealey 2015-09-21 17:30:29 -04:00
  • 08a3acbb44 Adding team settings to admin console =Corey Hulen 2015-09-22 01:15:41 -07:00
  • 87e67e825c Merge pull request #725 from mattermost/it33-patch-3 Corey Hulen 2015-09-22 00:43:11 -07:00
  • df2d668d59 Merge pull request #730 from mattermost/shorten-description-help-text Corey Hulen 2015-09-22 00:42:44 -07:00
  • f05a2c03d5 Adding SQL settings to admin console =Corey Hulen 2015-09-22 00:00:19 -07:00
  • 38cc148574 UI Modifications for multiple tickets Asaad Mahmood 2015-09-22 11:21:28 +05:00
  • afcff9b301 Fixing unit tests =Corey Hulen 2015-09-21 20:38:31 -07:00
  • e78c79b832 Adding rate limiter settings to the admin console =Corey Hulen 2015-09-21 19:01:52 -07:00
  • cae5dbd245 Adding privacy to admin console =Corey Hulen 2015-09-21 18:23:10 -07:00
  • f8e2a43d09 Fixing eslint errors =Corey Hulen 2015-09-21 17:52:30 -07:00
  • 0529a494ae Adding image properties =Corey Hulen 2015-09-21 17:34:13 -07:00
  • b4be8eb554 Minor changes to how resend status is passed Reed Garmsen 2015-09-21 17:03:08 -07:00
  • dda30e407a Added confirmation when users request another verification email; users are no longer redirected after requesting another verification email Reed Garmsen 2015-09-21 16:03:18 -07:00
  • e863096358 Fixing broken signup pages =Corey Hulen 2015-09-21 15:34:09 -07:00
  • 00f7fdbfc6 Correcting typo it33 2015-09-21 15:27:32 -07:00
  • 80488dec22 Adjusting sentence it33 2015-09-21 15:26:44 -07:00
  • 9baef5a6a0 Fixing button =Corey Hulen 2015-09-21 15:17:02 -07:00
  • ed9a2da83b Adding email to admin console =Corey Hulen 2015-09-21 15:11:56 -07:00
  • 98186e5018 Implement incoming webhooks. JoramWilander 2015-09-21 14:22:23 -04:00