Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing merge | =Corey Hulen | 2015-10-16 | 17 | -37/+377 |
|\ | |||||
| * | 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 | 92 | -603/+1207 |
| | |\ | | | | | | | | | | | | | | | | | 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 #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 5 | -13/+25 |
| |\ \ \ | | | | | | | | | | | 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 | 5 | -13/+25 |
| | | | | | |||||
| * | | | | Merge pull request #1049 from apaatsio/full-teams-data | Joram Wilander | 2015-10-16 | 1 | -4/+21 |
| |\ \ \ \ | | |_|_|/ | |/| | | | 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. | ||||
| | * | | | Use team display name in team switcher menu | Antti Ahti | 2015-10-14 | 1 | -5/+8 |
| | | |/ | | |/| | | | | | | | | | | | | | - /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu | ||||
| * | | | 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 |
| | | | | |||||
* | | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 35 | -229/+259 |
|/ / / | |||||
* | | | 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 |
| |/ |/| | |||||
* | | 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 | 13 | -71/+90 |
| | | |||||
* | | Merge pull request #1057 from hmhealey/plt520 | Christopher Speller | 2015-10-15 | 4 | -137/+300 |
|\ \ | | | | | | | 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 | 4 | -137/+300 |
| |/ | |||||
* | | Merge pull request #1055 from florianorben/PLT-42 | Christopher Speller | 2015-10-15 | 1 | -0/+12 |
|\ \ | | | | | | | 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 | 1 | -0/+12 |
| |/ | |||||
* | | 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 #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 | ||||
* / | Don't auto-add http:// to mailto: and ftp: markdown links | Florian Orben | 2015-10-14 | 2 | -2/+2 |
|/ | |||||
* | Fixed overwritten CSS class in the sidebar | hmhealey | 2015-10-14 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1046 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-14 | 6 | -24/+37 |
|\ | | | | | Multiple UI Improvements | ||||
| * | Multiple UI Improvements | Asaad Mahmood | 2015-10-14 | 6 | -24/+37 |
| | | |||||
* | | Merge release branch 'release-1.1.0' | Christopher Speller | 2015-10-14 | 3 | -18/+50 |
|\ \ | |/ |/| | |||||
| * | Fix webhook name not overriding in LHS and update webhook help text. | JoramWilander | 2015-10-13 | 2 | -8/+40 |
| | | |||||
| * | Fixing user settings dialog so it desn't ask you to check your email unless ↵ | Christopher Speller | 2015-10-13 | 1 | -10/+10 |
| | | | | | | | | you changed it | ||||
* | | Merge pull request #993 from apaatsio/bootstrap-help-block | Christopher Speller | 2015-10-14 | 3 | -3/+3 |
|\ \ | | | | | | | Use help-block class from Bootstrap | ||||
| * | | Use help-block class from Bootstrap | Antti Ahti | 2015-10-09 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | Use help-block class provided by Bootstrap instead of using a custom form__hint class. We still override some styles from the Bootstrap class, though. | ||||
* | | | Merge pull request #1042 from hmhealey/plt322-followup | Joram Wilander | 2015-10-13 | 1 | -6/+8 |
|\ \ \ | | | | | | | | | PLT-322 Fixed leave direct channel button for users with a long username | ||||
| * | | | Fixed leave direct channel button for users with a long username | hmhealey | 2015-10-13 | 1 | -6/+8 |
| | | | | |||||
* | | | | Merge pull request #1017 from stasvovk/PLT-589 | Joram Wilander | 2015-10-13 | 2 | -4/+8 |
|\ \ \ \ | | | | | | | | | | | PLT-589: changed Admin to Team Admin in Manage Team members | ||||
| * \ \ \ | Merge branch 'master' into PLT-589 | Stas Vovk | 2015-10-13 | 7 | -57/+71 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589 | Stas Vovk | 2015-10-13 | 2 | -3/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into PLT-589 | Stas Vovk | 2015-10-12 | 2 | -3/+1 |
| | |\ \ \ \ \ |