Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-18 | 0 | -0/+0 |
|\ | |||||
| * | Merge pull request #124 from asaadmahmoodspin/master | Corey Hulen | 2015-07-02 | 3 | -4/+7 |
| |\ | | | | | | | Minor fixes to mattermost UI | ||||
* | | | MM-1319 - Copy link and background change | Asaad Mahmood | 2015-07-18 | 2 | -3/+1 |
| |/ |/| | |||||
* | | Updating margins | Asaad Mahmood | 2015-07-18 | 1 | -3/+5 |
| | | |||||
* | | Minor fixes to mattermost UI | Asaad Mahmood | 2015-07-18 | 2 | -1/+2 |
|/ | |||||
* | Merge pull request #123 from asaadmahmoodspin/mm-1426 | Corey Hulen | 2015-07-02 | 13 | -36/+68 |
|\ | | | | | MM-1426 - Updating UI | ||||
| * | Changing var currentUser in post_right | Asaad Mahmood | 2015-07-17 | 1 | -6/+6 |
| | | |||||
| * | Changing var name from currentUser to currentUserCss | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | | |||||
| * | Adding highlights and improving css for posts on responsive screens | Asaad Mahmood | 2015-07-17 | 3 | -7/+4 |
| | | |||||
| * | Merge pull request #2 from rgarmsen2295/mm-1453 | asaadmahmoodspin | 2015-07-02 | 2 | -8/+24 |
| |\ | | | | | | | MM-1453 Added additional class to the markup indicating if the post came from the current user | ||||
| | * | Added additional class to the markup indicating if the post came from the ↵ | Reed Garmsen | 2015-07-02 | 2 | -8/+24 |
| | | | | | | | | | | | | current user | ||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1426 | Asaad Mahmood | 2015-07-17 | 1 | -11/+13 |
| |\ \ | |||||
| * | | | Improving modal UI | Asaad Mahmood | 2015-07-17 | 2 | -4/+3 |
| | | | | |||||
| * | | | Improving channel notifications | Asaad Mahmood | 2015-07-17 | 1 | -3/+3 |
| | | | | |||||
| * | | | Improving image modals | Asaad Mahmood | 2015-07-17 | 2 | -1/+2 |
| | | | | |||||
| * | | | Adding border radius | Asaad Mahmood | 2015-07-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | MM-1426 - Updating UI | Asaad Mahmood | 2015-07-17 | 9 | -19/+37 |
| | |/ | |/| | |||||
* | | | Merge pull request #121 from rgarmsen2295/mm-1445 | Corey Hulen | 2015-07-02 | 1 | -3/+4 |
|\ \ \ | |_|/ |/| | | MM-1445 Changed valet title and description for clarity | ||||
| * | | Changed valet title and description for clarity | Reed Garmsen | 2015-07-02 | 1 | -3/+4 |
| |/ | |||||
* | | Merge pull request #120 from mattermost/get-teammate-fix | Corey Hulen | 2015-07-02 | 1 | -11/+13 |
|\ \ | |/ |/| | fix getDirectTeammate so that if teammate is the second id it doesn't return null | ||||
| * | make loop simpler | JoramWilander | 2015-07-02 | 1 | -1/+1 |
| | | |||||
| * | fix getDirectTeammate so that if teammate is the second id it doesn't return ↵ | JoramWilander | 2015-07-02 | 1 | -11/+13 |
|/ | | | | null | ||||
* | Merge pull request #118 from nickago/MM-1363 | Joram Wilander | 2015-07-02 | 1 | -3/+10 |
|\ | | | | | Mm 1363 Limit uploads to only JPEGs for profile pictures | ||||
| * | Changed ordering of steps for upload to imporve asthetic | nickago | 2015-07-01 | 1 | -2/+4 |
| | | |||||
| * | Restricted profile picture uploads to just JPEGs | nickago | 2015-07-01 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #117 from nickago/MM-1308 | Christopher Speller | 2015-07-02 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1308 Changed offline timeout to 1 mintue | ||||
| * | | Changed offline timeout to 1 mintue | nickago | 2015-07-01 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #115 from nickago/MM-1425 | Corey Hulen | 2015-07-01 | 6 | -9/+9 |
|\ \ | | | | | | | MM-1425 Facelifted "direct message" to "private message" | ||||
| * | | Facelifted "direct message" to "private message" | nickago | 2015-07-01 | 6 | -9/+9 |
| |/ | |||||
* | | Merge pull request #114 from asaadmahmoodspin/master | Corey Hulen | 2015-07-01 | 12 | -5/+21 |
|\ \ | | | | | | | Fixing css issues in IE, adding doctype to html files | ||||
| * | | Improving targeting for row content | Asaad Mahmood | 2015-07-01 | 1 | -5/+5 |
| | | | |||||
| * | | Just arranging the css more properly | Asaad Mahmood | 2015-07-01 | 1 | -1/+4 |
| | | | |||||
| * | | Fixing height for content | Asaad Mahmood | 2015-07-01 | 2 | -3/+5 |
| | | | |||||
| * | | Fixing css issues in IE, adding doctype to html files | Asaad Mahmood | 2015-07-01 | 11 | -0/+11 |
| |/ | |||||
* | | Merge pull request #92 from nickago/MM-1151 | Corey Hulen | 2015-07-01 | 4 | -14/+27 |
|\ \ | | | | | | | MM-1151 clickable search results | ||||
| * | | Finally fixed the git weirdness | nickago | 2015-07-01 | 4 | -14/+27 |
| |/ | |||||
* | | Merge pull request #90 from ralder/patch-1 | Corey Hulen | 2015-07-01 | 1 | -1/+1 |
|\ \ | |/ |/| | fix pr #82 bug mention list inside modal | ||||
| * | fix pr #82 mention list inside modal | ralder | 2015-06-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #62 from jedisct1/authenticated-encryption | Corey Hulen | 2015-06-30 | 1 | -6/+32 |
|\ \ | | | | | | | SQL store: use authenticated encryption | ||||
| * | | SQL store: use authenticated encryption | Frank Denis | 2015-06-24 | 1 | -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-1430 | Corey Hulen | 2015-06-30 | 3 | -3/+19 |
|\ \ \ | | | | | | | | | MM-1430 Added the ability to have hashtags with dashes in them | ||||
| * | | | Added the ability to have hashtags with dashes in them | nickago | 2015-06-30 | 3 | -3/+19 |
| | | | | |||||
* | | | | Merge pull request #102 from nickago/MM-1328 | Corey Hulen | 2015-06-30 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | MM-1328 Now limits domain to just alphanumeric | ||||
| * | | | | Aligned front end and back end domain requirements | nickago | 2015-06-30 | 1 | -1/+3 |
| |/ / / | |||||
* | | | | Merge pull request #111 from rgarmsen2295/mm-1305 | Joram Wilander | 2015-06-30 | 1 | -8/+4 |
|\ \ \ \ | |/ / / |/| | | | MM-1305 The word "constructor" will no longer be highlighted | ||||
| * | | | Removed unnecessary loop copying | Reed Garmsen | 2015-06-30 | 1 | -5/+1 |
| | | | | |||||
| * | | | Changed keyword logic to use arrays rather than maps to remove highlighting ↵ | Reed Garmsen | 2015-06-30 | 1 | -5/+5 |
|/ / / | | | | | | | | | | of js object properties like constructor and __proto__ | ||||
* | | | Merge pull request #109 from nickago/MM-1289 | Christopher Speller | 2015-06-30 | 1 | -3/+10 |
|\ \ \ | | | | | | | | | Mm 1289 Now sorts extra channel members lexigraphically | ||||
| * | | | Added extra precaution to avoid null error | nickago | 2015-06-30 | 1 | -7/+9 |
| | | | | |||||
| * | | | MM-1289 Now sorts users in lexigraphical order in extra members popover | nickago | 2015-06-30 | 1 | -1/+6 |
| | | | |