summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update nfnt/resize library to the most recent version (as of July 20)hmhealey2015-07-244-9/+99
|
* Merge pull request #170 from mattermost/mm-1420Corey Hulen2015-07-2349-151/+9362
|\ | | | | Fixes mm-1420 adding initial support for postgres
| * removing old bindVars methods=Corey Hulen2015-07-231-1/+1
| |
| * Fixing merges for latest postgres=Corey Hulen2015-07-236-35/+76
| |
| * Merge branch 'master' into mm-1420=Corey Hulen2015-07-2343-257/+922
| |\
| * \ Merge branch 'master' into mm-1420=Corey Hulen2015-07-2244-446/+1080
| |\ \
| * | | Fixing merge=Corey Hulen2015-07-211-1/+2
| | | |
| * | | fixing merge conflicts=Corey Hulen2015-07-21149-2589/+2303
| |\ \ \
| * \ \ \ merging=Corey Hulen2015-07-120-0/+0
| |\ \ \ \
| | * | | | minor tweaks to make sure mysql still runs=Corey Hulen2015-07-125-9/+28
| | | | | |
| | * | | | Patching remainder of the sql stmts to work with postgres=Corey Hulen2015-07-129-73/+121
| | | | | |
| | * | | | Fixes mm-1420 adding postgres support=Corey Hulen2015-07-1243-95/+9241
| | | | | |
| * | | | | minor tweaks to make sure mysql still runs=Corey Hulen2015-07-125-9/+28
| | | | | |
| * | | | | Patching remainder of the sql stmts to work with postgres=Corey Hulen2015-07-129-74/+122
| | | | | |
| * | | | | Fixes mm-1420 adding postgres support=Corey Hulen2015-07-1243-95/+9241
| | | | | |
* | | | | | Merge pull request #242 from asaadmahmoodspin/masterChristopher Speller2015-07-239-11/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | UI Fixes
| * | | | | | UI changes for search bar in the RHS for Mobile WebAsaad Mahmood2015-07-231-3/+4
| | | | | | |
| * | | | | | Adjusting padding for LHS header infoAsaad Mahmood2015-07-231-1/+1
| | | | | | |
| * | | | | | Adding hover effect for LHS menu iconAsaad Mahmood2015-07-231-1/+5
| | | | | | |
| * | | | | | Placing SVGs into constants.jsxAsaad Mahmood2015-07-235-5/+11
| | | | | | |
| * | | | | | UI FixesAsaad Mahmood2015-07-234-4/+6
| | | | | | |
* | | | | | | Merge pull request #243 from hmhealey/mm1678Christopher Speller2015-07-231-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 ↵hmhealey2015-07-231-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | from opening message threads containing non-image attachments
* | | | | | | Merge pull request #244 from rgarmsen2295/mm-1610Christopher Speller2015-07-233-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 Garmsen2015-07-233-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | on OSX
* | | | | | Merge pull request #237 from mattermost/mm-1570Corey Hulen2015-07-2321-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 ↵JoramWilander2015-07-232-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | in api.login
| * | | | | added SSOSettings to docker config fileJoramWilander2015-07-221-0/+10
| | | | | |
| * | | | | add check on server to prevent password updating for users who log in ↵JoramWilander2015-07-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | through oauth
| * | | | | only show gitlab signup/login links if gitlab oauth is turned onJoramWilander2015-07-229-14/+46
| | | | | |
| * | | | | add changes from team reviewJoramWilander2015-07-225-12/+13
| | | | | |
| * | | | | added error case for login and removed authdata + authservice unique ↵JoramWilander2015-07-222-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | constraint in users table
| * | | | | added signup link verification to oauth signup flowJoramWilander2015-07-223-49/+88
| | | | | |
| * | | | | add error for trying to sign up with the same oauth account twiceJoramWilander2015-07-222-1/+6
| | | | | |
| * | | | | added error message when trying to sign up with gitlab using an email ↵JoramWilander2015-07-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | already used in the system
| * | | | | merged with new team domain changes and added signup/login links for gitlabJoramWilander2015-07-229-36/+50
| | | | | |
| * | | | | made oauth architecture more generalizedJoramWilander2015-07-225-58/+141
| | | | | |
| * | | | | removed change password UI for oauth accountsJoramWilander2015-07-223-30/+49
| | | | | |
| * | | | | inital implementation of using GitLab OAuth2 provider for signup/loginJoramWilander2015-07-2211-58/+463
| | | | | |
* | | | | | Merge pull request #194 from ralder/fix-command-box-cssCorey Hulen2015-07-2211-103/+101
|\ \ \ \ \ \ | | | | | | | | | | | | | | [webui] fix command-list css
| * | | | | | [webui] fix command-list cssralder2015-07-2211-103/+101
| | | | | | |
* | | | | | | Merge pull request #240 from asaadmahmoodspin/masterCorey Hulen2015-07-2213-23/+32
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Minor UI Improvements
| * | | | | | Updating dropdown icon in LHS headerAsaad Mahmood2015-07-231-2/+2
| | | | | | |
| * | | | | | Minor UI ImprovementsAsaad Mahmood2015-07-2313-21/+30
| |/ / / / /
* | | | | | Merge pull request #241 from rgarmsen2295/mm-1556Joram Wilander2015-07-221-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 Garmsen2015-07-221-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-1547Joram Wilander2015-07-223-15/+86
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1547 Added local cache storing of drafts for comments
| * | | | | | | Added message persistance on closing RHS/switching to another commentnickago2015-07-223-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-1639aCorey Hulen2015-07-221-0/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Adding godep support to travis
| * | | | | | | Fixing godep restore=Corey Hulen2015-07-222-2/+5
| | | | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 03:50:58 +0000