Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-16 | 15 | -102/+152 |
|\ | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/popover_list_members.jsx web/react/components/user_profile.jsx | ||||
| * | Merge pull request #1089 from mattermost/client-warning-fixes | Corey Hulen | 2015-10-16 | 11 | -103/+132 |
| |\ | | | | | | | Fixing some client warnings | ||||
| | * | Fixing some client warnings | Christopher Speller | 2015-10-16 | 11 | -103/+132 |
| | | | |||||
| * | | Merge pull request #1085 from mattermost/plt-633 | Harrison Healey | 2015-10-16 | 3 | -4/+17 |
| |\ \ | | |/ | |/| | PLT-633 Add default username and icon to incoming webhooks. | ||||
| | * | Add default username and icon to incoming webhooks. | JoramWilander | 2015-10-16 | 3 | -4/+17 |
| | | | |||||
| * | | Adding single-line Docker install | it33 | 2015-10-16 | 1 | -0/+7 |
| | | | |||||
| * | | Merge pull request #1088 from hmhealey/initprefs | Harrison Healey | 2015-10-16 | 1 | -1/+2 |
| |\ \ | | | | | | | | | Fixed preference test that was failing | ||||
| | * | | Fixed preference test that was failing | hmhealey | 2015-10-16 | 1 | -1/+2 |
| |/ / | |||||
* | | | Fixing more direct channel modal scrolling | Asaad Mahmood | 2015-10-16 | 3 | -1/+23 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-16 | 24 | -149/+488 |
|\| | | | | | | | | | | | ui-improvements | ||||
| * | | Merge pull request #1054 from stasvovk/PLT-637 | Christopher Speller | 2015-10-16 | 7 | -14/+220 |
| |\ \ | | | | | | | | | PLT-638: added display tab under account settings. added 24h time option | ||||
| | * \ | Merge remote-tracking branch 'upstream/master' into PLT-637 | Stas Vovk | 2015-10-16 | 133 | -17054/+14467 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx | ||||
| | * | | | update posts time in the right sidebar when user changes time format | Stas Vovk | 2015-10-15 | 1 | -0/+14 |
| | | | | | |||||
| | * | | | fixed style guide error | Stas Vovk | 2015-10-15 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | added file with display settings | Stas Vovk | 2015-10-14 | 1 | -0/+168 |
| | | | | | |||||
| | * | | | added display tab under account settings. added 24h time option | Stas Vovk | 2015-10-14 | 5 | -14/+38 |
| | | | | | |||||
| * | | | | Merge pull request #1083 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-16 | 3 | -3/+6 |
| |\ \ \ \ | | | | | | | | | | | | | Adding momentum scrolling on IOS | ||||
| * \ \ \ \ | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 11 | -13/+179 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added an initial call to get all user preferences on page load | ||||
| | * | | | | | Added an initial call to get all user preferences on page load | hmhealey | 2015-10-15 | 11 | -13/+179 |
| | | | | | | | |||||
| | * | | | | | Removed preference migration code | hmhealey | 2015-10-15 | 3 | -99/+39 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1078 from hmhealey/plt701 | Christopher Speller | 2015-10-16 | 3 | -100/+42 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | PLT-701 Removed preference migration code | ||||
| | * | | | | | Removed preference migration code | hmhealey | 2015-10-15 | 3 | -100/+42 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1049 from apaatsio/full-teams-data | Joram Wilander | 2015-10-16 | 5 | -20/+45 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use display name instead of name in team switcher menu | ||||
| | * | | | | | | Fix lint | Antti Ahti | 2015-10-15 | 1 | -5/+4 |
| | | | | | | | | |||||
| | * | | | | | | Treat teams as an array instead of object | Antti Ahti | 2015-10-15 | 1 | -8/+5 |
| | | | | | | | | |||||
| | * | | | | | | Sort teams by display name | Antti Ahti | 2015-10-15 | 1 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First we need to convert the object to array, because objects cannot be sorted. | ||||
| | * | | | | | | Sanitize team data | Antti Ahti | 2015-10-14 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to expose sensitive data that might pose a security risk. | ||||
| | * | | | | | | Fix typo (isTreamCreationAllowed -> isTeamCreationAllowed) | Antti Ahti | 2015-10-14 | 1 | -7/+7 |
| | | | | | | | | |||||
| | * | | | | | | Use team display name in team switcher menu | Antti Ahti | 2015-10-14 | 4 | -14/+18 |
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | - /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu | ||||
| * | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-16 | 8 | -88/+82 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Adding momentum scrolling on IOS | Asaad Mahmood | 2015-10-16 | 3 | -3/+6 |
|/ / / / / | |||||
* | | | | | 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 |