Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update nfnt/resize library to the most recent version (as of July 20) | hmhealey | 2015-07-24 | 4 | -9/+99 |
| | |||||
* | Merge pull request #170 from mattermost/mm-1420 | Corey Hulen | 2015-07-23 | 49 | -151/+9362 |
|\ | | | | | Fixes mm-1420 adding initial support for postgres | ||||
| * | removing old bindVars methods | =Corey Hulen | 2015-07-23 | 1 | -1/+1 |
| | | |||||
| * | Fixing merges for latest postgres | =Corey Hulen | 2015-07-23 | 6 | -35/+76 |
| | | |||||
| * | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-23 | 43 | -257/+922 |
| |\ | |||||
| * \ | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-22 | 44 | -446/+1080 |
| |\ \ | |||||
| * | | | Fixing merge | =Corey Hulen | 2015-07-21 | 1 | -1/+2 |
| | | | | |||||
| * | | | fixing merge conflicts | =Corey Hulen | 2015-07-21 | 149 | -2589/+2303 |
| |\ \ \ | |||||
| * \ \ \ | merging | =Corey Hulen | 2015-07-12 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | minor tweaks to make sure mysql still runs | =Corey Hulen | 2015-07-12 | 5 | -9/+28 |
| | | | | | | |||||
| | * | | | | Patching remainder of the sql stmts to work with postgres | =Corey Hulen | 2015-07-12 | 9 | -73/+121 |
| | | | | | | |||||
| | * | | | | Fixes mm-1420 adding postgres support | =Corey Hulen | 2015-07-12 | 43 | -95/+9241 |
| | | | | | | |||||
| * | | | | | minor tweaks to make sure mysql still runs | =Corey Hulen | 2015-07-12 | 5 | -9/+28 |
| | | | | | | |||||
| * | | | | | Patching remainder of the sql stmts to work with postgres | =Corey Hulen | 2015-07-12 | 9 | -74/+122 |
| | | | | | | |||||
| * | | | | | Fixes mm-1420 adding postgres support | =Corey Hulen | 2015-07-12 | 43 | -95/+9241 |
| | | | | | | |||||
* | | | | | | Merge pull request #242 from asaadmahmoodspin/master | Christopher Speller | 2015-07-23 | 9 | -11/+24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | UI Fixes | ||||
| * | | | | | | UI changes for search bar in the RHS for Mobile Web | Asaad Mahmood | 2015-07-23 | 1 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | Adjusting padding for LHS header info | Asaad Mahmood | 2015-07-23 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Adding hover effect for LHS menu icon | Asaad Mahmood | 2015-07-23 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Placing SVGs into constants.jsx | Asaad Mahmood | 2015-07-23 | 5 | -5/+11 |
| | | | | | | | |||||
| * | | | | | | UI Fixes | Asaad Mahmood | 2015-07-23 | 4 | -4/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #243 from hmhealey/mm1678 | Christopher Speller | 2015-07-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | MM-1678 Fixed sidebar so that it can open threads containing non-image attachments | ||||
| * | | | | | | | Fixed reference to non-existant local variable that prevented the sidebar ↵ | hmhealey | 2015-07-23 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | from opening message threads containing non-image attachments | ||||
* | | | | | | | Merge pull request #244 from rgarmsen2295/mm-1610 | Christopher Speller | 2015-07-23 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | MM-1610 Fixed issue with error message for uploading more than 5 files not appearing on OSX | ||||
| * | | | | | | Fixed issue with error message for uploading more than 5 files not appearing ↵ | Reed Garmsen | 2015-07-23 | 3 | -3/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | on OSX | ||||
* | | | | | | Merge pull request #237 from mattermost/mm-1570 | Corey Hulen | 2015-07-23 | 21 | -131/+789 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fixes mm-1570 adds support for using mattermost as an OAuth client | ||||
| * | | | | | added store unit test for user.GetByAuth and added password length checking ↵ | JoramWilander | 2015-07-23 | 2 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | in api.login | ||||
| * | | | | | added SSOSettings to docker config file | JoramWilander | 2015-07-22 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | add check on server to prevent password updating for users who log in ↵ | JoramWilander | 2015-07-22 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | through oauth | ||||
| * | | | | | only show gitlab signup/login links if gitlab oauth is turned on | JoramWilander | 2015-07-22 | 9 | -14/+46 |
| | | | | | | |||||
| * | | | | | add changes from team review | JoramWilander | 2015-07-22 | 5 | -12/+13 |
| | | | | | | |||||
| * | | | | | added error case for login and removed authdata + authservice unique ↵ | JoramWilander | 2015-07-22 | 2 | -10/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | constraint in users table | ||||
| * | | | | | added signup link verification to oauth signup flow | JoramWilander | 2015-07-22 | 3 | -49/+88 |
| | | | | | | |||||
| * | | | | | add error for trying to sign up with the same oauth account twice | JoramWilander | 2015-07-22 | 2 | -1/+6 |
| | | | | | | |||||
| * | | | | | added error message when trying to sign up with gitlab using an email ↵ | JoramWilander | 2015-07-22 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | already used in the system | ||||
| * | | | | | merged with new team domain changes and added signup/login links for gitlab | JoramWilander | 2015-07-22 | 9 | -36/+50 |
| | | | | | | |||||
| * | | | | | made oauth architecture more generalized | JoramWilander | 2015-07-22 | 5 | -58/+141 |
| | | | | | | |||||
| * | | | | | removed change password UI for oauth accounts | JoramWilander | 2015-07-22 | 3 | -30/+49 |
| | | | | | | |||||
| * | | | | | inital implementation of using GitLab OAuth2 provider for signup/login | JoramWilander | 2015-07-22 | 11 | -58/+463 |
| | | | | | | |||||
* | | | | | | Merge pull request #194 from ralder/fix-command-box-css | Corey Hulen | 2015-07-22 | 11 | -103/+101 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [webui] fix command-list css | ||||
| * | | | | | | [webui] fix command-list css | ralder | 2015-07-22 | 11 | -103/+101 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #240 from asaadmahmoodspin/master | Corey Hulen | 2015-07-22 | 13 | -23/+32 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Minor UI Improvements | ||||
| * | | | | | | Updating dropdown icon in LHS header | Asaad Mahmood | 2015-07-23 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Minor UI Improvements | Asaad Mahmood | 2015-07-23 | 13 | -21/+30 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #241 from rgarmsen2295/mm-1556 | Joram Wilander | 2015-07-22 | 1 | -4/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1556 Better error handling of channel descriptions that are too large | ||||
| * | | | | | | Channel descriptions entered that are larger than the max number of bytes ↵ | Reed Garmsen | 2015-07-22 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | now cause an error to be printed to the client without closing the modal and losing the user's draft of the description | ||||
* | | | | | | | Merge pull request #228 from nickago/MM-1547 | Joram Wilander | 2015-07-22 | 3 | -15/+86 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | MM-1547 Added local cache storing of drafts for comments | ||||
| * | | | | | | | Added message persistance on closing RHS/switching to another comment | nickago | 2015-07-22 | 3 | -15/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread. Similar to the center pane and channels, switching comment threads won't delete entered but unsent text/media in the RHS | ||||
* | | | | | | | | Merge pull request #238 from mattermost/mm-1639a | Corey Hulen | 2015-07-22 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Adding godep support to travis | ||||
| * | | | | | | | Fixing godep restore | =Corey Hulen | 2015-07-22 | 2 | -2/+5 |
| | | | | | | | |