IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,180 Commits 845 Branches 1,202 Tags
36658c13a4c7ebdfff22b8570e0db52bfa4de000
Commit Graph

3180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
=Corey Hulen
36658c13a4 Fixing merge conflicts 2015-10-19 11:42:40 -07:00
Harrison Healey
d139c9e825 Merge pull request #1108 from mattermost/plt-235 
PLT-235 Implement outgoing webhooks.
 2015-10-19 14:24:02 -04:00
Harrison Healey
fd69910fab Merge pull request #1109 from mattermost/setup-dev 
Updating developer machine setup
 2015-10-19 13:35:35 -04:00
=Corey Hulen
097d17bf2c Fixing merge issue 2015-10-19 10:29:10 -07:00
=Corey Hulen
468f01dc89 Merging from master 2015-10-19 10:25:51 -07:00
Corey Hulen
ea1b312968 Merge pull request #1072 from mattermost/plt-554 
PLT-554 Small refactor of websocket code on client and server
 2015-10-19 09:56:34 -07:00
Corey Hulen
d776d1aa0c Merge pull request #1067 from layzerar/fix_email_encoding 
Fix email encoding issue
 2015-10-19 09:37:01 -07:00
=Corey Hulen
540d13b53b Fixing formatting and typos 2015-10-19 09:35:09 -07:00
=Corey Hulen
e4f74a2443 Fixing formatting and typos 2015-10-19 09:34:29 -07:00
=Corey Hulen
94f02d1752 Updating developer machine setup 2015-10-19 09:32:30 -07:00
Joram Wilander
00c06fac43 Merge pull request #1107 from asaadmahmoodspin/ui-improvements 
Updating scroll on admin console
 2015-10-19 11:42:25 -04:00
JoramWilander
c7d00de682 Update db index for outgoing webhook 2015-10-19 11:12:40 -04:00
Asaad Mahmood
cbbfe0112b Updating scroll on admin console 2015-10-19 20:10:33 +05:00
it33
b6340b4c2c Clarifying creds aren't real in docs 2015-10-19 07:35:47 -07:00
Harrison Healey
75da10fffa Merge pull request #1104 from florianorben/fix_arrow_left_right 
No longer try to navigate to next/prev image if image preview modal is not open
 2015-10-19 10:35:33 -04:00
JoramWilander
a3ca106740 Generalized webhook post code and added it to outgoing webhooks 2015-10-19 10:19:48 -04:00
Harrison Healey
9a71222db0 Merge pull request #1102 from florianorben/fix_email_tooltip 
Fixes wrong tooltip on user profile
 2015-10-19 10:10:35 -04:00
Harrison Healey
2d0b952941 Merge pull request #1101 from stasvovk/admin_console_urls 
#962: change url when a user navigates between tabs in admin console
 2015-10-19 10:10:09 -04:00
Harrison Healey
814aa57fc1 Merge pull request #1087 from asaadmahmoodspin/ui-improvements 
Improving direct messages modal and some improvements for popovers
 2015-10-19 09:40:43 -04:00
JoramWilander
f24ea30a75 Refactor to hit database less often. 2015-10-19 09:00:30 -04:00
JoramWilander
9de8bc4727 Remove special team logic. 2015-10-19 09:00:30 -04:00
JoramWilander
182e59f2c0 Show/hide integrations properly based off config settings. 2015-10-19 09:00:30 -04:00
JoramWilander
5574151c85 Fix postgres query and minor UI updates for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
ba3cde024f Remove temporary test code. 2015-10-19 09:00:30 -04:00
JoramWilander
5bb22ed454 Fix minor style for gofmt. 2015-10-19 09:00:30 -04:00
JoramWilander
a91956e180 Add api unit tests for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
7bf23409b2 Added store tests for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
8c8f1bdd63 Add model test for outgoing webhooks. 2015-10-19 09:00:30 -04:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
Asaad Mahmood
13a35539f3 Updating scroll on LHS 2015-10-19 14:36:31 +05:00
it33
e308923aec Update Troubleshooting.md 2015-10-18 22:57:30 -07:00
it33
bc76dbee9b Update README.md 2015-10-18 22:11:54 -07:00
it33
9cfa13708c IE 10 support deprecated 2015-10-18 20:46:01 -07:00
Florian Orben
bfba1d55ad No longer try to navigate to next/prev image if image preview modal is not open 2015-10-19 03:10:36 +02:00
Florian Orben
fd61bebe88 Fixes wrong tooltip on user profile 2015-10-19 01:22:19 +02:00
it33
8ec6c07e3e Emphasize self-hosting 2015-10-18 11:03:41 -07:00
it33
901f67a744 Add Enterprise Support, link to releases 2015-10-18 11:03:05 -07:00
Stas Vovk
9fa3c996d5 change url when a user navigates between tabs [#962] 2015-10-18 18:55:04 +03:00
Asaad Mahmood
2a67116e71 Updating userEntries div to tr td 2015-10-18 20:03:34 +05:00
Asaad Mahmood
3a1636b7ce Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-18 18:55:22 +05:00
Joram Wilander
7e457dd8d9 Merge pull request #1090 from jvasallo/master 
Updated Email Check Regex to handle some extra cases
 2015-10-17 12:24:45 -04:00
Joram Wilander
714bff1595 Merge pull request #1096 from rgarmsen2295/plt-153 
PLT-153 Added better recognition of Android devices in the Active Sessions UI
 2015-10-17 12:17:36 -04:00
Joram Wilander
7b6121eae8 Merge pull request #1097 from rgarmsen2295/plt-693 
PLT-693 Fixes back button on username page during team signup when email is turned off
 2015-10-17 12:15:56 -04:00
Joram Wilander
635b9e30c2 Merge pull request #1099 from florianorben/PLT-463 
PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too much room
 2015-10-17 12:15:17 -04:00
=Corey Hulen
a8f3f76c59 Refactoring web classes to use multi-session 2015-10-16 19:05:55 -07:00
Florian Orben
aa40f88bbb PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too much room 2015-10-17 02:52:46 +02:00
Reed Garmsen
5f45556b43 Fixes back button on username page during team signup when email is turned off 2015-10-16 14:50:45 -07:00
Reed Garmsen
09514fb9f5 Added proper recognition of android devices in the Active Sessions UI 2015-10-16 14:21:46 -07:00
Joram Wilander
8ea76b0ada Merge pull request #1092 from trashcan/fix-autocomplete-transparency 
Add z-index to command-box so that elements behind it do not show through
 2015-10-16 16:10:21 -04:00
Asaad Mahmood
7849a48a85 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 
Conflicts:
	web/react/components/popover_list_members.jsx
	web/react/components/user_profile.jsx
 2015-10-16 23:19:23 +05:00