summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #62 from jedisct1/authenticated-encryptionCorey Hulen2015-06-301-6/+32
|\ | | | | SQL store: use authenticated encryption
| * SQL store: use authenticated encryptionFrank Denis2015-06-241-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #110 from nickago/MM-1430Corey Hulen2015-06-303-3/+19
|\ \ | | | | | | MM-1430 Added the ability to have hashtags with dashes in them
| * | Added the ability to have hashtags with dashes in themnickago2015-06-303-3/+19
| | |
* | | Merge pull request #102 from nickago/MM-1328Corey Hulen2015-06-301-1/+3
|\ \ \ | | | | | | | | MM-1328 Now limits domain to just alphanumeric
| * | | Aligned front end and back end domain requirementsnickago2015-06-301-1/+3
| |/ /
* | | Merge pull request #111 from rgarmsen2295/mm-1305Joram Wilander2015-06-301-8/+4
|\ \ \ | |/ / |/| | MM-1305 The word "constructor" will no longer be highlighted
| * | Removed unnecessary loop copyingReed Garmsen2015-06-301-5/+1
| | |
| * | Changed keyword logic to use arrays rather than maps to remove highlighting ↵Reed Garmsen2015-06-301-5/+5
|/ / | | | | | | of js object properties like constructor and __proto__
* | Merge pull request #109 from nickago/MM-1289Christopher Speller2015-06-301-3/+10
|\ \ | | | | | | Mm 1289 Now sorts extra channel members lexigraphically
| * | Added extra precaution to avoid null errornickago2015-06-301-7/+9
| | |
| * | MM-1289 Now sorts users in lexigraphical order in extra members popovernickago2015-06-301-1/+6
| | |
* | | Merge pull request #108 from rgarmsen2295/mm-1309Christopher Speller2015-06-301-1/+1
|\ \ \ | | | | | | | | MM-1309 Fixed grammmatical issue in error message
| * | | Fixed grammmatical issue in error messageReed Garmsen2015-06-301-1/+1
| |/ /
* | | Merge pull request #106 from mattermost/mm-1119Joram Wilander2015-06-3010-18/+99
|\ \ \ | |/ / |/| | fixes mm-1119 adds @all and @channel mention capabilites
| * | added mentioned username to default mention keysJoramWilander2015-06-301-1/+1
| | |
| * | @all and @channel now highlight like other mentionsJoramWilander2015-06-302-2/+8
| | |
| * | add default icon for non-user autocompletesJoramWilander2015-06-302-2/+13
| | |
| * | @all and @channel now auto-completeJoramWilander2015-06-294-3/+17
| | |
| * | added team-wide and channel-wide mentionsJoramWilander2015-06-293-11/+61
| | |
* | | Merge pull request #107 from mattermost/revert-91-MM-1289Christopher Speller2015-06-301-6/+1
|\ \ \ | | | | | | | | Revert "MM-1289 Sorted the channel members popover lexigraphically"
| * | | Revert "MM-1289 Sorted the channel members popover lexigraphically"Christopher Speller2015-06-301-6/+1
|/ / /
* | | Merge pull request #101 from rgarmsen2295/mm-983Christopher Speller2015-06-301-1/+1
|\ \ \ | | | | | | | | MM-983 Fixed file preview removal in IE10
| * | | Changed file preview removal from using dataset which is unsupported in ie10 ↵Reed Garmsen2015-06-291-1/+1
| | | | | | | | | | | | | | | | to using the getAttribute method which is backwards and forwards compatible
* | | | Merge pull request #91 from nickago/MM-1289Christopher Speller2015-06-301-1/+6
|\ \ \ \ | | | | | | | | | | MM-1289 Sorted the channel members popover lexigraphically
| * | | | Added semicolonsnickago2015-06-291-2/+2
| | | | |
| * | | | Sorted the channel members popover lexigraphicallynickago2015-06-291-1/+6
| |/ / /
* | | | Merge pull request #103 from nickago/MM-1293Joram Wilander2015-06-301-1/+1
|\ \ \ \ | | | | | | | | | | MM-1293 Updated file display key to avoid child flattening
| * | | | Changed the style of key-assignment to allow for more assured variancenickago2015-06-291-2/+1
| | | | |
| * | | | Updated file display key to avoid child flatteningnickago2015-06-291-1/+2
| |/ / /
* | | | Merge pull request #100 from asaadmahmoodspin/masterCorey Hulen2015-06-291-1/+1
|\ \ \ \ | | | | | | | | | | MM-1268 - Updating button in email template
| * | | | MM-1268 - Updating button in email templateAsaad Mahmood2015-06-301-1/+1
| | | | |
| * | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-303-2/+12
| |\| | |
| * | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-2918-126/+247
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-06-282-2/+2
| |\ \ \ \
* | \ \ \ \ Merge pull request #98 from mattermost/mm-1199Corey Hulen2015-06-2911-33/+102
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | fixes mm-1199 adds off-topic as a default channel
| * | | | | update unit tests for default channelsJoramWilander2015-06-293-3/+26
| | | | | |
| * | | | | add intro text specific to off-topic channelJoramWilander2015-06-292-1/+13
| | | | | |
| * | | | | new users now join off-topic defaultlyJoramWilander2015-06-294-16/+43
| | | | | |
| * | | | | move default channel creation to seperate func and add off-topicJoramWilander2015-06-295-22/+29
| | |_|/ / | |/| | |
* | | | | Merge pull request #99 from rgarmsen2295/mm-1303Joram Wilander2015-06-292-1/+10
|\ \ \ \ \ | | | | | | | | | | | | MM-1303
| * | | | | Changed invite email to reflect the sender's status in the team (e.g. admin ↵Reed Garmsen2015-06-292-1/+10
| |/ / / / | | | | | | | | | | | | | | | v.s. plain member)
* | | | | Merge pull request #51 from rgarmsen2295/mm-1287Corey Hulen2015-06-291-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | MM-1287
| * | | | Unescaped escape characters in the subject line of emails so that all ↵Reed Garmsen2015-06-221-1/+2
| | | | | | | | | | | | | | | | | | | | characters appear properly
* | | | | Merge pull request #49 from mattermost/mm-1316Joram Wilander2015-06-2912-90/+210
|\ \ \ \ \ | | | | | | | | | | | | fixes mm-1316 improves channel notifications UI and updates channellist etag
| * | | | | rebase touch-upsJoramWilander2015-06-294-3/+4
| | | | | |
| * | | | | fixed CSS indentingJoramWilander2015-06-291-11/+11
| | | | | |
| * | | | | make channel notifications modal visible in mobile modeJoramWilander2015-06-292-1/+5
| | | | | |
| * | | | | update etag versionJoramWilander2015-06-291-1/+1
| | | | | |
| * | | | | updated channel unit testJoramWilander2015-06-291-3/+9
| | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-05 10:16:19 +0000