Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added a small margin where the PostsView will be considered to be at the ↵ | hmhealey | 2016-01-20 | 1 | -1/+4 |
| | | | | bottom even if it's not exactly at the bottom | ||||
* | Removed some vestigial code from the post textbox | hmhealey | 2016-01-20 | 1 | -19/+0 |
| | |||||
* | Changed the post textbox resizing code to be more reliable and not rely on ↵ | hmhealey | 2016-01-20 | 2 | -24/+30 |
| | | | | magic numbers | ||||
* | Revert " PLT-7 adding loc for db calls" | Corey Hulen | 2016-01-20 | 2 | -51/+50 |
| | |||||
* | PLT-7 adding loc db calls for users table | =Corey Hulen | 2016-01-20 | 2 | -10/+10 |
| | |||||
* | PLT-7 adding loc db calls for posts table | =Corey Hulen | 2016-01-20 | 1 | -1/+1 |
| | |||||
* | PLT-7 adding loc db calls for session table | =Corey Hulen | 2016-01-20 | 1 | -3/+3 |
| | |||||
* | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 1 | -10/+10 |
| | |||||
* | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 1 | -6/+6 |
| | |||||
* | PLT-7 adding loc db calls for webhooks table | =Corey Hulen | 2016-01-20 | 1 | -1/+1 |
| | |||||
* | PLT-7 adding loc db calls for team table | =Corey Hulen | 2016-01-20 | 1 | -13/+13 |
| | |||||
* | PLT-7 adding loc for db calls audits and prefs | =Corey Hulen | 2016-01-20 | 1 | -6/+7 |
| | |||||
* | Merge pull request #1894 from mattermost/release-1.4 | Corey Hulen | 2016-01-14 | 1 | -3/+3 |
|\ | | | | | Release 1.4 | ||||
| * | Encode url query properly for SSO switching | JoramWilander | 2016-01-14 | 1 | -3/+3 |
| | | |||||
* | | Fix error message | JoramWilander | 2016-01-14 | 1 | -5/+10 |
| | | |||||
* | | Minor update to about modal | JoramWilander | 2016-01-14 | 1 | -4/+1 |
| | | |||||
* | | Added license validation and settings | JoramWilander | 2016-01-14 | 11 | -27/+397 |
| | | |||||
* | | Merge pull request #1855 from rgarmsen2295/plt-1006 | Corey Hulen | 2016-01-13 | 4 | -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 tooltip | Reed Garmsen | 2016-01-11 | 4 | -7/+45 |
| | | | |||||
* | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-13 | 5 | -6/+20 |
|\ \ \ | | | | | | | | | Adding away icon and changing online and offline icons | ||||
| * | | | Adding away icon and changing online and offline icons | Asaad Mahmood | 2016-01-11 | 5 | -6/+20 |
| | | | | |||||
* | | | | Merge pull request #1850 from mattermost/preview-mode | Corey Hulen | 2016-01-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Documenting how Preview Mode is disabled | ||||
| * | | | | Update email_settings.jsx | it33 | 2016-01-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Documenting how Preview Mode turns off | it33 | 2016-01-09 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1876 from mattermost/release-1.4 | Corey Hulen | 2016-01-12 | 1 | -1/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | Release 1.4 RC2 | ||||
| * | | | | Add removal comments | JoramWilander | 2016-01-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Support old oauth routes | JoramWilander | 2016-01-12 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #1830 from rgarmsen2295/plt-1599 | Joram Wilander | 2016-01-12 | 1 | -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 Garmsen | 2016-01-07 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | display name | ||||
* | | | | | | Merge pull request #1852 from mattermost/PLT-1608 | Joram Wilander | 2016-01-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | PLT-1608 Upgrading logging package | ||||
| * | | | | | Upgrade logging package | =Corey Hulen | 2016-01-11 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Adding push-test.mattermost.com | it33 | 2016-01-11 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1854 from hmhealey/plt1608 | Joram Wilander | 2016-01-11 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-1608 Fixed developer errors storing invalid error objects | ||||
| * | | | | Fixed developer errors storing invalid error objects | hmhealey | 2016-01-11 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1849 from hmhealey/plt1578 | Corey Hulen | 2016-01-11 | 2 | -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 bugs | hmhealey | 2016-01-11 | 2 | -8/+36 |
| | |/ | |/| | |||||
* | | | Merge pull request #1822 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-01-11 | 5 | -5/+13 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | Updating fix | Asaad Mahmood | 2016-01-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2016-01-07 | 5 | -5/+13 |
| | |/ | |/| | |||||
* | | | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 4 | -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 ↵ | hmhealey | 2016-01-07 | 1 | -13/+36 |
| | | | | | | | | | | | | | | | | members before rendering | ||||
| * | | | Made ChannelInviteModal pull all channel members before rendering | hmhealey | 2016-01-07 | 3 | -10/+35 |
| | | | | |||||
* | | | | Merge pull request #1828 from hmhealey/plt1397 | Joram Wilander | 2016-01-11 | 1 | -15/+6 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-1397/PLT-1580/PLT-1614 Fixed spacing around markdown lists and paragraphs | ||||
| * | | | Fixed spacing between paragraphs in a post | hmhealey | 2016-01-07 | 1 | -1/+4 |
| | | | | |||||
| * | | | Fixed vertical spacing between lists and paragraphs in post bodies | hmhealey | 2016-01-07 | 1 | -11/+3 |
| | | | | |||||
| * | | | Removed extra space below unordered lists | hmhealey | 2016-01-07 | 1 | -5/+1 |
| | |/ | |/| | |||||
* | | | Fixed FileUpload to properly unbind drag handlers when unmounted | hmhealey | 2016-01-08 | 1 | -0/+12 |
| | | | |||||
* | | | Removed ability to drag n' drop text; drag n' drop ui no longer appears when ↵ | Reed Garmsen | 2016-01-06 | 4 | -24/+30 |
|/ / | | | | | | | non-files are dragged | ||||
* | | Merge pull request #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 2 | -2/+133 |
|\ \ | |/ |/| | PLT-1558 adding session length to config file | ||||
| * | Adding UI for session length settings | =Corey Hulen | 2016-01-05 | 1 | -1/+132 |
| | |