summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Added a small margin where the PostsView will be considered to be at the ↵hmhealey2016-01-201-1/+4
| | | | bottom even if it's not exactly at the bottom
* Removed some vestigial code from the post textboxhmhealey2016-01-201-19/+0
|
* Changed the post textbox resizing code to be more reliable and not rely on ↵hmhealey2016-01-202-24/+30
| | | | magic numbers
* Revert " PLT-7 adding loc for db calls"Corey Hulen2016-01-202-51/+50
|
* PLT-7 adding loc db calls for users table=Corey Hulen2016-01-202-10/+10
|
* PLT-7 adding loc db calls for posts table=Corey Hulen2016-01-201-1/+1
|
* PLT-7 adding loc db calls for session table=Corey Hulen2016-01-201-3/+3
|
* PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-201-10/+10
|
* PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-201-6/+6
|
* PLT-7 adding loc db calls for webhooks table=Corey Hulen2016-01-201-1/+1
|
* PLT-7 adding loc db calls for team table=Corey Hulen2016-01-201-13/+13
|
* PLT-7 adding loc for db calls audits and prefs=Corey Hulen2016-01-201-6/+7
|
* Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-141-3/+3
|\ | | | | Release 1.4
| * Encode url query properly for SSO switchingJoramWilander2016-01-141-3/+3
| |
* | Fix error messageJoramWilander2016-01-141-5/+10
| |
* | Minor update to about modalJoramWilander2016-01-141-4/+1
| |
* | Added license validation and settingsJoramWilander2016-01-1411-27/+397
| |
* | Merge pull request #1855 from rgarmsen2295/plt-1006Corey Hulen2016-01-134-7/+45
|\ \ | | | | | | PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
| * | Changed statistics to show usernames with an email tooltipReed Garmsen2016-01-114-7/+45
| | |
* | | Merge pull request #1853 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-135-6/+20
|\ \ \ | | | | | | | | Adding away icon and changing online and offline icons
| * | | Adding away icon and changing online and offline iconsAsaad Mahmood2016-01-115-6/+20
| | | |
* | | | Merge pull request #1850 from mattermost/preview-modeCorey Hulen2016-01-131-1/+1
|\ \ \ \ | | | | | | | | | | Documenting how Preview Mode is disabled
| * | | | Update email_settings.jsxit332016-01-091-1/+1
| | | | |
| * | | | Documenting how Preview Mode turns offit332016-01-091-1/+1
| | | | |
* | | | | Merge pull request #1876 from mattermost/release-1.4Corey Hulen2016-01-121-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | Release 1.4 RC2
| * | | | Add removal commentsJoramWilander2016-01-121-2/+2
| | | | |
| * | | | Support old oauth routesJoramWilander2016-01-121-1/+3
| | | | |
* | | | | Merge pull request #1830 from rgarmsen2295/plt-1599Joram Wilander2016-01-121-2/+8
|\ \ \ \ \ | | | | | | | | | | | | PLT-1599 Help text in invite member modal now reflects the default channel name
| * | | | | Help text in invite member modal now updates according to town-square ↵Reed Garmsen2016-01-071-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | display name
* | | | | | Merge pull request #1852 from mattermost/PLT-1608Joram Wilander2016-01-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | PLT-1608 Upgrading logging package
| * | | | | Upgrade logging package=Corey Hulen2016-01-111-1/+1
| | |_|/ / | |/| | |
* | | | | Adding push-test.mattermost.comit332016-01-111-2/+2
| | | | |
* | | | | Merge pull request #1854 from hmhealey/plt1608Joram Wilander2016-01-111-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | PLT-1608 Fixed developer errors storing invalid error objects
| * | | | Fixed developer errors storing invalid error objectshmhealey2016-01-111-1/+1
| |/ / /
* | | | Merge pull request #1849 from hmhealey/plt1578Corey Hulen2016-01-112-8/+36
|\ \ \ \ | |/ / / |/| | | PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs
| * | | Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugshmhealey2016-01-112-8/+36
| | |/ | |/|
* | | Merge pull request #1822 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-01-115-5/+13
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Updating fixAsaad Mahmood2016-01-081-1/+1
| | | |
| * | | Multiple UI ImprovementsAsaad Mahmood2016-01-075-5/+13
| | |/ | |/|
* | | Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-114-23/+71
|\ \ \ | | | | | | | | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
| * | | Added a loading screen to ChannelMembersModal and made it pull all channel ↵hmhealey2016-01-071-13/+36
| | | | | | | | | | | | | | | | members before rendering
| * | | Made ChannelInviteModal pull all channel members before renderinghmhealey2016-01-073-10/+35
| | | |
* | | | Merge pull request #1828 from hmhealey/plt1397Joram Wilander2016-01-111-15/+6
|\ \ \ \ | |_|_|/ |/| | | PLT-1397/PLT-1580/PLT-1614 Fixed spacing around markdown lists and paragraphs
| * | | Fixed spacing between paragraphs in a posthmhealey2016-01-071-1/+4
| | | |
| * | | Fixed vertical spacing between lists and paragraphs in post bodieshmhealey2016-01-071-11/+3
| | | |
| * | | Removed extra space below unordered listshmhealey2016-01-071-5/+1
| | |/ | |/|
* | | Fixed FileUpload to properly unbind drag handlers when unmountedhmhealey2016-01-081-0/+12
| | |
* | | Removed ability to drag n' drop text; drag n' drop ui no longer appears when ↵Reed Garmsen2016-01-064-24/+30
|/ / | | | | | | non-files are dragged
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-062-2/+133
|\ \ | |/ |/| PLT-1558 adding session length to config file
| * Adding UI for session length settings=Corey Hulen2016-01-051-1/+132
| |