summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Inital attempt at active element checkingnickago2015-07-011-1/+7
| | |_|_|/ | |/| | |
* | | | | Fixed and added links to process and forumsit332015-07-031-1/+9
| |/ / / |/| | |
* | | | Merge pull request #126 from rgarmsen2295/mm-1210Joram Wilander2015-07-023-41/+125
|\ \ \ \ | | | | | | | | | | MM-1210 Added loading animation that is used while posts in a channel load
| * | | | Restructured logic to flow more naturally and be cleanerReed Garmsen2015-07-021-42/+44
| | | | |
| * | | | Added import statement to styles.scssReed Garmsen2015-07-021-0/+1
| | | | |
| * | | | Added logic for loading animation to appear when posts have yet to be ↵Reed Garmsen2015-07-022-5/+15
| | | | | | | | | | | | | | | | | | | | loaded. Added markup necessary for loading animation css. Removed a file that was no longer needed for the design.
| * | | | Added new files for adding new loading animationReed Garmsen2015-07-022-0/+71
|/ / / /
* | | | Merge pull request #125 from asaadmahmoodspin/masterChristopher Speller2015-07-023-4/+2
|\ \ \ \ | | | | | | | | | | MM-1319 - Copy link and background change
| * | | | Fixing padding in sidebar dropdownAsaad Mahmood2015-07-181-1/+1
| | | | |
| * | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-180-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #124 from asaadmahmoodspin/masterCorey Hulen2015-07-023-4/+7
|\ \ \ \ \ | | | | | | | | | | | | Minor fixes to mattermost UI
| | * | | | MM-1319 - Copy link and background changeAsaad Mahmood2015-07-182-3/+1
| |/ / / /
| * | | | Updating marginsAsaad Mahmood2015-07-181-3/+5
| | | | |
| * | | | Minor fixes to mattermost UIAsaad Mahmood2015-07-182-1/+2
|/ / / /
* | | | Merge pull request #123 from asaadmahmoodspin/mm-1426Corey Hulen2015-07-0213-36/+68
|\ \ \ \ | | | | | | | | | | MM-1426 - Updating UI
| * | | | Changing var currentUser in post_rightAsaad Mahmood2015-07-171-6/+6
| | | | |
| * | | | Changing var name from currentUser to currentUserCssAsaad Mahmood2015-07-171-3/+3
| | | | |
| * | | | Adding highlights and improving css for posts on responsive screensAsaad Mahmood2015-07-173-7/+4
| | | | |
| * | | | Merge pull request #2 from rgarmsen2295/mm-1453asaadmahmoodspin2015-07-022-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 Garmsen2015-07-022-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | current user
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1426Asaad Mahmood2015-07-171-11/+13
| |\ \ \ \ \
| * | | | | | Improving modal UIAsaad Mahmood2015-07-172-4/+3
| | | | | | |
| * | | | | | Improving channel notificationsAsaad Mahmood2015-07-171-3/+3
| | | | | | |
| * | | | | | Improving image modalsAsaad Mahmood2015-07-172-1/+2
| | | | | | |
| * | | | | | Adding border radiusAsaad Mahmood2015-07-171-0/+1
| | | | | | |
| * | | | | | MM-1426 - Updating UIAsaad Mahmood2015-07-179-19/+37
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #121 from rgarmsen2295/mm-1445Corey Hulen2015-07-021-3/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | MM-1445 Changed valet title and description for clarity
| * | | | | Changed valet title and description for clarityReed Garmsen2015-07-021-3/+4
| |/ / / /
* | | | | Merge pull request #120 from mattermost/get-teammate-fixCorey Hulen2015-07-021-11/+13
|\ \ \ \ \ | |/ / / / |/| | | | fix getDirectTeammate so that if teammate is the second id it doesn't return null
| * | | | make loop simplerJoramWilander2015-07-021-1/+1
| | | | |
| * | | | fix getDirectTeammate so that if teammate is the second id it doesn't return ↵JoramWilander2015-07-021-11/+13
|/ / / / | | | | | | | | | | | | null
* | | | Merge pull request #118 from nickago/MM-1363Joram Wilander2015-07-021-3/+10
|\ \ \ \ | | | | | | | | | | Mm 1363 Limit uploads to only JPEGs for profile pictures
| * | | | Changed ordering of steps for upload to imporve astheticnickago2015-07-011-2/+4
| | | | |
| * | | | Restricted profile picture uploads to just JPEGsnickago2015-07-011-1/+6
| |/ / /
* | | | Merge pull request #117 from nickago/MM-1308Christopher Speller2015-07-021-1/+1
|\ \ \ \ | | | | | | | | | | MM-1308 Changed offline timeout to 1 mintue
| * | | | Changed offline timeout to 1 mintuenickago2015-07-011-1/+1
| |/ / /
* | | | Merge pull request #115 from nickago/MM-1425Corey Hulen2015-07-016-9/+9
|\ \ \ \ | | | | | | | | | | MM-1425 Facelifted "direct message" to "private message"
| * | | | Facelifted "direct message" to "private message"nickago2015-07-016-9/+9
| |/ / /
* | | | Merge pull request #114 from asaadmahmoodspin/masterCorey Hulen2015-07-0112-5/+21
|\ \ \ \ | | | | | | | | | | Fixing css issues in IE, adding doctype to html files
| * | | | Improving targeting for row contentAsaad Mahmood2015-07-011-5/+5
| | | | |
| * | | | Just arranging the css more properlyAsaad Mahmood2015-07-011-1/+4
| | | | |
| * | | | Fixing height for contentAsaad Mahmood2015-07-012-3/+5
| | | | |
| * | | | Fixing css issues in IE, adding doctype to html filesAsaad Mahmood2015-07-0111-0/+11
| |/ / /
* | | | Merge pull request #92 from nickago/MM-1151Corey Hulen2015-07-014-14/+27
|\ \ \ \ | | | | | | | | | | MM-1151 clickable search results
| * | | | Finally fixed the git weirdnessnickago2015-07-014-14/+27
| |/ / /
* | | | Merge pull request #90 from ralder/patch-1Corey Hulen2015-07-011-1/+1
|\ \ \ \ | |/ / / |/| | | fix pr #82 bug mention list inside modal
| * | | fix pr #82 mention list inside modalralder2015-06-291-1/+1
| | | |
* | | | 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-18 19:03:35 +0000