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

3201 Коммитов

Автор SHA1 Сообщение Дата
it33
bfb3040d55 Minor formatting adjustments 2015-10-20 11:38:39 -07:00
it33
e0cda76eb8 Merge pull request #1126 from mattermost/upgrade-guide
Create Upgrade-Guide.md
2015-10-20 11:28:47 -07:00
it33
8424124987 Create Upgrade-Guide.md 2015-10-20 11:15:39 -07:00
Christopher Speller
8b4771a6c7 Merge branch 'release-1.1.0' 2015-10-20 14:04:14 -04:00
Christopher Speller
b8eb11a439 Merge pull request #1125 from mattermost/changelog-update
Update CHANGELOG.md
2015-10-20 13:05:52 -04:00
it33
fcc67b77cd Update CHANGELOG.md 2015-10-20 12:50:27 -04:00
Joram Wilander
4ed9a9ebca Merge pull request #1100 from girishso/wink_emoji
PLT-699: translate ;) to wink emoji
2015-10-20 12:37:51 -04:00
Joram Wilander
f183f6673f Merge pull request #1116 from sharms/master
Fixed missing colon
2015-10-20 11:50:09 -04:00
Joram Wilander
239abd88e0 Merge pull request #1084 from apaatsio/handle-window-resize-properly
Handle window resize in React way
2015-10-20 11:49:03 -04:00
Christopher Speller
98aaf9067b Merge pull request #1115 from mattermost/salt-fix
Allowing salts longer than 32 chars
2015-10-20 10:38:15 -04:00
Harrison Healey
7d3bc099b9 Merge pull request #1119 from mattermost/fix-db-upgrade
Hotfix to allow db schema .7 to be upgraded to 1.1
2015-10-20 10:02:06 -04:00
Joram Wilander
460a82878a Merge pull request #1113 from hmhealey/plt716
PLT-716/717 Added from:, in:, and channel: search filters
2015-10-20 08:00:21 -04:00
Joram Wilander
7d8e08ccf6 Merge pull request #1095 from rgarmsen2295/plt-661
PLT-661 Changed all goroutine functions to use '...AndForget' as the naming convention
2015-10-20 07:58:05 -04:00
=Corey Hulen
437efdaaaa Hotfix to allow .7 to be upgraded to 1.1 2015-10-20 04:49:42 -07:00
it33
88b3aa4d80 Create Gitlab-Integration-Service-for-Mattermost.md 2015-10-20 02:11:41 -07:00
Antti Ahti
d3f99e8217 Handle window resize events in React way
Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling.

See http://facebook.github.io/react/tips/dom-event-listeners.html
2015-10-20 10:07:45 +03:00
it33
4404912909 Minor formatting adjustment 2015-10-19 17:41:39 -07:00
Reed Garmsen
04bf527966 Changed all goroutine functions to use '...AndForget' as the standard naming system 2015-10-19 13:58:15 -07:00
Steven Harms
1d4e96605e Fixed missing colon 2015-10-19 16:02:30 -04:00
Joram Wilander
b5b233f3f0 Merge pull request #1114 from asaadmahmoodspin/ui-improvements
Ui improvements
2015-10-19 15:35:07 -04:00
hmhealey
995c5a276b Fixed incorrectly escaped * in wildcard search for postgres 2015-10-19 15:30:43 -04:00
Asaad Mahmood
b950d99b3a Updating direct messages title 2015-10-19 23:59:17 +05: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
=Corey Hulen
f7e51b14d7 Allowing salts longer than 32 chars 2015-10-19 11:23:44 -07:00
Asaad Mahmood
5135986a3b Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-19 22:59:01 +05:00
Asaad Mahmood
2d42aefeaf Multiple UI Improvements 2015-10-19 22:58:47 +05:00
Harrison Healey
fd69910fab Merge pull request #1109 from mattermost/setup-dev
Updating developer machine setup
2015-10-19 13:35:35 -04:00
hmhealey
06fd374c19 Added from:, in:, and channel: search modifiers 2015-10-19 13:25:19 -04: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