Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #1080 from hmhealey/plt686 | Joram Wilander | 2015-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | PLT-686 Changed preference saving to use the master database | |||||
| * | | | | | Changed preference saving to use the master database | hmhealey | 2015-10-15 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Update Troubleshooting.md | it33 | 2015-10-15 | 1 | -1/+1 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #1059 from florianorben/PLT-74 | Corey Hulen | 2015-10-15 | 5 | -6/+111 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last message | |||||
| * | | | | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last message | Florian Orben | 2015-10-15 | 2 | -5/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix bug where channel_id was not set if update_post ajax was "too fast" - fix bug js error if there is no last post, i.e. empty channel - renamed lastPostId to postId so it has a nicer api to be triggered from everywhere - fix a typo - automatically focus textarea on modal open | |||||
| * | | | | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last message | Florian Orben | 2015-10-15 | 5 | -3/+97 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1082 from mattermost/lfbrock-patch-1 | Corey Hulen | 2015-10-15 | 1 | -2/+11 | |
|\ \ \ \ \ | | | | | | | | | | | | | Added known issue to v1.1 and added new section for v1.2 | |||||
| * | | | | | Update CHANGELOG.md | it33 | 2015-10-15 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | Adding known issue around Slack import | |||||
| * | | | | | Added known issue to v1.1 and added new section for v1.2 | lfbrock | 2015-10-15 | 1 | -2/+10 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1081 from mattermost/hmhealey-patch-1 | Corey Hulen | 2015-10-15 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Updated node.js source path in Ubuntu dev setup | |||||
| * | | | | Updated node.js source path in Ubuntu dev setup | Harrison Healey | 2015-10-15 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1075 from mattermost/plt-577 | Christopher Speller | 2015-10-15 | 96 | -16753/+13493 | |
|\ \ \ \ | |_|_|/ |/| | | | PLT-577 Upgrading dependencies. | |||||
| * | | | Adding ReactDOM as a global | Christopher Speller | 2015-10-15 | 2 | -6/+1 | |
| | | | | ||||||
| * | | | Fixing most deprication warnings | Christopher Speller | 2015-10-15 | 79 | -377/+423 | |
| | | | | ||||||
| * | | | Updating build for updated versions | Christopher Speller | 2015-10-15 | 1 | -8/+10 | |
| | | | | ||||||
| * | | | Upgrading react and react-bootstrap. 0.13.3 to 0.14 and 0.25.1 to 0.27.1 | Christopher Speller | 2015-10-15 | 9 | -13768/+11448 | |
| | | | | ||||||
| * | | | Upgrading perfect scrollbar from 0.6.5 to 0.6.7 | Christopher Speller | 2015-10-15 | 4 | -53/+168 | |
| | | | | ||||||
| * | | | Upgrading jquery from 1.11.1 to 2.1.4 | Christopher Speller | 2015-10-15 | 4 | -2541/+1443 | |
|/ / / | ||||||
* | | | Merge pull request #1077 from mattermost/mark-tests | Christopher Speller | 2015-10-15 | 8 | -15/+49 | |
|\ \ \ | | | | | | | | | Marking when user ran the unit tests | |||||
| * | | | Marking when user ran the unit tests | =Corey Hulen | 2015-10-15 | 8 | -15/+49 | |
| | | | | ||||||
* | | | | Merge pull request #1076 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-10-15 | 21 | -66/+97 | |
|\ \ \ \ | | | | | | | | | | | Multiple UI Improvements | |||||
| * | | | | Removing my navbar popover changes since Chris has already done the popover ↵ | Asaad Mahmood | 2015-10-15 | 1 | -15/+16 | |
| | | | | | | | | | | | | | | | | | | | | changes in his PR | |||||
| * | | | | Changing user popover trigger from hover click to just click | Asaad Mahmood | 2015-10-15 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-15 | 22 | -82/+112 | |
|/ / / / | ||||||
* | | | | Merge pull request #1057 from hmhealey/plt520 | Christopher Speller | 2015-10-15 | 5 | -137/+346 | |
|\ \ \ \ | |/ / / |/| | | | PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap | |||||
| * | | | Updated More Direct Channels modal and converted it to ReactBootstrap | hmhealey | 2015-10-14 | 5 | -137/+346 | |
| | | | | ||||||
* | | | | Merge pull request #1055 from florianorben/PLT-42 | Christopher Speller | 2015-10-15 | 2 | -0/+17 | |
|\ \ \ \ | |_|_|/ |/| | | | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading | |||||
| * | | | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading | Florian Orben | 2015-10-14 | 2 | -0/+17 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1065 from apaatsio/clarify-system-menu | Harrison Healey | 2015-10-15 | 1 | -1/+5 | |
|\ \ \ | | | | | | | | | Add titles to clarify icons in system console | |||||
| * | | | Add titles to clarify icons in system console | Antti Ahti | 2015-10-15 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | The + and x icons in the team section can easily be misinterpreted as "Create team" and "Delete team". Added clarifying title text that the user can see when hovering on the icon. | |||||
* | | | | Merge pull request #1063 from mattermost/SMTP-update | Corey Hulen | 2015-10-15 | 1 | -45/+36 | |
|\ \ \ \ | | | | | | | | | | | Updated to use System Console | |||||
| * | | | | Updated to use System Console | it33 | 2015-10-14 | 1 | -45/+36 | |
| |/ / / | ||||||
* | | | | Merge pull request #1058 from rgarmsen2295/plt-434 | Joram Wilander | 2015-10-15 | 1 | -20/+279 | |
|\ \ \ \ | | | | | | | | | | | PLT-434 Improve Audit History Format | |||||
| * | | | | Properly handle missing session IDs regardless of case | Reed Garmsen | 2015-10-14 | 1 | -5/+9 | |
| | | | | | ||||||
| * | | | | Added all remaining audit descriptions to supported audits | Reed Garmsen | 2015-10-14 | 1 | -47/+59 | |
| | | | | | ||||||
| * | | | | Added more individual audit handling, primarily involving the user | Reed Garmsen | 2015-10-14 | 1 | -5/+51 | |
| | | | | | ||||||
| * | | | | Added more supported audits to audit log | Reed Garmsen | 2015-10-14 | 1 | -73/+140 | |
| | | | | | ||||||
| * | | | | Finished structure for formatting audits and began writing individual ↵ | Reed Garmsen | 2015-10-14 | 1 | -61/+132 | |
| | | | | | | | | | | | | | | | | | | | | formatting for each audit | |||||
| * | | | | Initial changes to audit log along with structure for handling different ↵ | Reed Garmsen | 2015-10-14 | 1 | -16/+75 | |
| | |/ / | |/| | | | | | | | | | | audit types | |||||
* | | | | Update Production-Ubuntu.md | it33 | 2015-10-15 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Updating /docs TOC | it33 | 2015-10-14 | 1 | -1/+3 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #1062 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-14 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fixing doc | |||||
| * | | | Fixing doc | =Corey Hulen | 2015-10-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #1053 from florianorben/markown_fix | Corey Hulen | 2015-10-14 | 2 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Don't auto-add http:// to mailto: and ftp: markdown links | |||||
| * | | | | Don't auto-add http:// to mailto: and ftp: markdown links | Florian Orben | 2015-10-14 | 2 | -2/+2 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #1061 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-14 | 1 | -18/+23 | |
|\ \ \ \ | | |/ / | |/| | | Release 1.1.0 final merge | |||||
| * | | | Merge pull request #1056 from esethna/patch-7 | Corey Hulen | 2015-10-14 | 1 | -18/+23 | |
| |\ \ \ | | | | | | | | | | | Update SMTP instructions | |||||
| | * | | | Update SMTP instructions | esethna | 2015-10-14 | 1 | -18/+23 | |
| |/ / / | | | | | | | | | Needs dev review. | |||||
* | | | | Clarifying description | it33 | 2015-10-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Update Slack-Import.md | it33 | 2015-10-14 | 1 | -1/+1 | |
| | | | |