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

9579 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
acc809ca88 Merge pull request #82 from ralder/fix-mentions-dropdown
gui: fix mentions dropdown list for pc browsers
2015-06-27 21:50:03 -08:00
Asaad Mahmood
e1714eaa3f Updating settings UI 2015-06-28 04:18:24 +05:00
Asaad Mahmood
86f774e1b0 Merge branch 'master' of https://github.com/mattermost/platform 2015-06-28 04:10:55 +05:00
Corey Hulen
b1c3bd37ad Merge pull request #66 from adamenger/patch-1
IAM not AIM
2015-06-27 06:08:16 -04:00
Corey Hulen
5ff8b54920 Merge pull request #59 from haikoschol/master
Fix typo in function name
2015-06-27 06:07:47 -04:00
ralder
f25cdbdb08 gui: fix broken mailto link in user-popover 2015-06-26 15:58:34 -07:00
Asaad Mahmood
9e7ba4aa5d Removing relative from span 2015-06-27 00:29:37 +05:00
test
0104bf822c gui: fix mentions dropdown 2015-06-26 11:38:27 -07:00
Asaad Mahmood
febb6e3b65 mm-1256 - Improving view modal and close modal button 2015-06-26 23:19:29 +05:00
Asaad Mahmood
f2401dd91f MM-1184 - Updating image preview 2015-06-26 03:07:20 +05:00
=Corey Hulen
ba1feac08c adding mysql 5.6 2015-06-25 17:00:10 -04:00
=Corey Hulen
937d2c65fb adding mysql 5.6 2015-06-25 16:53:53 -04:00
=Corey Hulen
bc88328aeb adding api unit tests 2015-06-25 16:42:40 -04:00
=Corey Hulen
e5586142a5 adding servies 2015-06-25 16:38:10 -04:00
=Corey Hulen
fac113a76d updating build script 2015-06-25 16:25:53 -04:00
=Corey Hulen
d51767fe78 updating services 2015-06-25 16:19:50 -04:00
=Corey Hulen
ac5ea20c3c adding services to build 2015-06-25 16:11:22 -04:00
=Corey Hulen
8e6609d177 updating build 2015-06-25 15:33:39 -04:00
=Corey Hulen
8eab243172 updating build 2015-06-25 15:27:57 -04:00
=Corey Hulen
e411a3ba7e adding the missing package 2015-06-25 15:18:53 -04:00
Corey Hulen
ac56304bc7 Merge pull request #67 from firstrow/patch-1
Update README.md - make it little user friendly
2015-06-25 13:23:43 -04:00
Corey Hulen
7248a0adfb Merge pull request #77 from mattermost/release-0.50
Release 0.50
2015-06-25 13:11:18 -04:00
Corey Hulen
cd5413958e Merge pull request #76 from mattermost/update-readme-release
Update readme release
2015-06-25 13:09:50 -04:00
=Corey Hulen
f5c2129fd5 updating readme 2015-06-25 12:51:22 -04:00
=Corey Hulen
92391121e6 updating readme 2015-06-25 12:41:48 -04:00
Joram Wilander
7904ea2738 Merge pull request #46 from mattermost/mm-1318
fixes mm-1318 only allow 5 files to be uploaded at a time
2015-06-25 12:28:34 -04:00
=Corey Hulen
16505ffe94 updating make 2015-06-25 12:21:47 -04:00
=Corey Hulen
6ee153d7f8 inital travis file 2015-06-25 11:52:32 -04:00
Corey Hulen
5e6fb9c181 Merge pull request #48 from rgarmsen2295/mm-1364
MM-1364
2015-06-25 11:42:45 -04:00
Corey Hulen
49baf73918 Merge pull request #45 from rgarmsen2295/mm-1309
MM-1309
2015-06-25 11:42:25 -04:00
Corey Hulen
d146916f39 Merge pull request #43 from rgarmsen2295/mm-1202
MM-1202
2015-06-25 11:42:11 -04:00
Corey Hulen
d9dfb2cbd1 Merge pull request #41 from asaadmahmoodspin/master
MM-1253 - Fixing new message and date separator corner case
2015-06-25 11:41:33 -04:00
Asaad Mahmood
e454cf54fa MM-1253 - Fixing new message and date separator corner case 2015-06-28 20:53:26 +05:00
Corey Hulen
0537e87a90 Merge pull request #34 from rgarmsen2295/mm-1288
MM-1288
2015-06-25 11:36:57 -04:00
Corey Hulen
9a81e76de0 Merge pull request #32 from rgarmsen2295/mm-1282
MM-1282
2015-06-25 11:36:47 -04:00
Corey Hulen
a8e078d367 Merge pull request #28 from rgarmsen2295/mm-1290
MM-1290
2015-06-25 11:36:28 -04:00
Corey Hulen
049a41f9be Merge pull request #27 from mattermost/mm-1240
fixes mm-1240 adds ability to turn valet feature on
2015-06-25 11:20:19 -04:00
Corey Hulen
bfe8d13cd1 Merge pull request #26 from rgarmsen2295/mm-454
MM-454
2015-06-25 10:59:59 -04:00
Corey Hulen
39e5f7913d Merge pull request #19 from mattermost/mm-1235
fixes mm-1235 clicking on mentions now works properly
2015-06-25 10:59:39 -04:00
Corey Hulen
362afd1b7f Merge pull request #18 from mattermost/mm-1269
fixes mm-1269 don't show blue bar for internet connection issue
2015-06-25 10:59:24 -04:00
Corey Hulen
b41b75fb35 Merge pull request #13 from rgarmsen2295/mm-1215
MM-1215
2015-06-25 10:59:01 -04:00
Corey Hulen
c1812b0bfc Merge pull request #9 from mattermost/mm-1263
fixes mm-1263 mentions are highlighted properly now
2015-06-25 10:58:46 -04:00
Corey Hulen
b33ab3d3e1 Merge pull request #8 from rgarmsen2295/mm-1097
MM-1097
2015-06-25 10:58:31 -04:00
Andrii Bubis
47322b9324 Fixed typos 2015-06-24 10:20:11 -07:00
Andrii Bubis
5db72e682b Fixed list numbers 2015-06-24 10:11:20 -07:00
Andrii Bubis
e7900b016d Update README.md 2015-06-24 10:02:53 -07:00
adamenger
afda53615a IAM not AIM 2015-06-24 11:34:53 -05:00
Frank Denis
34d688ca72 SQL store: use authenticated encryption
Data were encrypted using AES-CFB, with a properly randomized IV,
but without any authenticators. This allows the data to be tampered
with, without being noticed by the application.

This diff slightly changes the encryption/decryption functions in
sql_store.go to add a HMAC-SHA256 authenticator to encrypted messages.

Two keys are derived from AtRestEncryptKey: the first half of
SHA512(AtRestEncryptKey) for the block cipher and the second half for
the MAC. This can be changed to a KDF if needed.

The decryption function also checks that base64 decoding actually
worked, and that the ciphertext is long enough to include the IV and
the MAC.

Unfortunately, it breaks backward compatibility. But if such a change
has to be made, it has to be made early.
2015-06-24 16:56:57 +02:00
Haiko Schol
dea39c7b64 Fix typo in function name 2015-06-24 14:21:27 +02:00
=Corey Hulen
5bc0a19953 updating ding 2015-06-23 10:29:48 -08:00