summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-165-0/+198
|\ | | | | PLT-638: added display tab under account settings. added 24h time option
| * Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-1676-550/+1096
| |\ | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx
| * | update posts time in the right sidebar when user changes time formatStas Vovk2015-10-151-0/+14
| | |
| * | added file with display settingsStas Vovk2015-10-141-0/+168
| | |
| * | added display tab under account settings. added 24h time optionStas Vovk2015-10-143-0/+16
| | |
* | | Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-161-5/+1
|\ \ \ | | | | | | | | Added an initial call to get all user preferences on page load
| * | | Added an initial call to get all user preferences on page loadhmhealey2015-10-151-5/+1
| | | |
* | | | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-161-4/+21
|\ \ \ \ | |_|_|/ |/| | | Use display name instead of name in team switcher menu
| * | | Fix lintAntti Ahti2015-10-151-5/+4
| | | |
| * | | Treat teams as an array instead of objectAntti Ahti2015-10-151-8/+5
| | | |
| * | | Sort teams by display nameAntti Ahti2015-10-151-1/+19
| | | | | | | | | | | | | | | | First we need to convert the object to array, because objects cannot be sorted.
| * | | Use team display name in team switcher menuAntti Ahti2015-10-141-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 messageFlorian Orben2015-10-152-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 messageFlorian Orben2015-10-153-3/+50
| | |
* | | Adding ReactDOM as a globalChristopher Speller2015-10-151-6/+0
| | |
* | | Fixing most deprication warningsChristopher Speller2015-10-1569-332/+378
| |/ |/|
* | Removing my navbar popover changes since Chris has already done the popover ↵Asaad Mahmood2015-10-151-15/+16
| | | | | | | | changes in his PR
* | Changing user popover trigger from hover click to just clickAsaad Mahmood2015-10-151-1/+1
| |
* | Multiple UI ImprovementsAsaad Mahmood2015-10-1512-71/+86
| |
* | Merge pull request #1057 from hmhealey/plt520Christopher Speller2015-10-152-131/+288
|\ \ | | | | | | PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap
| * | Updated More Direct Channels modal and converted it to ReactBootstraphmhealey2015-10-142-131/+288
| |/
* | Merge pull request #1055 from florianorben/PLT-42Christopher Speller2015-10-151-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 uploadingFlorian Orben2015-10-141-0/+12
| |/
* | Merge pull request #1065 from apaatsio/clarify-system-menuHarrison Healey2015-10-151-1/+5
|\ \ | | | | | | Add titles to clarify icons in system console
| * | Add titles to clarify icons in system consoleAntti Ahti2015-10-151-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.
* | Properly handle missing session IDs regardless of caseReed Garmsen2015-10-141-5/+9
| |
* | Added all remaining audit descriptions to supported auditsReed Garmsen2015-10-141-47/+59
| |
* | Added more individual audit handling, primarily involving the userReed Garmsen2015-10-141-5/+51
| |
* | Added more supported audits to audit logReed Garmsen2015-10-141-73/+140
| |
* | Finished structure for formatting audits and began writing individual ↵Reed Garmsen2015-10-141-61/+132
| | | | | | | | formatting for each audit
* | Initial changes to audit log along with structure for handling different ↵Reed Garmsen2015-10-141-16/+75
|/ | | | audit types
* Fixed overwritten CSS class in the sidebarhmhealey2015-10-141-1/+1
|
* Merge pull request #1046 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-145-24/+31
|\ | | | | Multiple UI Improvements
| * Multiple UI ImprovementsAsaad Mahmood2015-10-145-24/+31
| |
* | Merge release branch 'release-1.1.0'Christopher Speller2015-10-143-18/+50
|\ \ | |/ |/|
| * Fix webhook name not overriding in LHS and update webhook help text.JoramWilander2015-10-132-8/+40
| |
| * Fixing user settings dialog so it desn't ask you to check your email unless ↵Christopher Speller2015-10-131-10/+10
| | | | | | | | you changed it
* | Merge pull request #993 from apaatsio/bootstrap-help-blockChristopher Speller2015-10-143-3/+3
|\ \ | | | | | | Use help-block class from Bootstrap
| * | Use help-block class from BootstrapAntti Ahti2015-10-093-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-followupJoram Wilander2015-10-131-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 usernamehmhealey2015-10-131-6/+8
| | | |
* | | | Merge pull request #1017 from stasvovk/PLT-589Joram Wilander2015-10-132-4/+8
|\ \ \ \ | | | | | | | | | | PLT-589: changed Admin to Team Admin in Manage Team members
| * \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-137-57/+71
| |\ \ \ \
| * \ \ \ \ Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589Stas Vovk2015-10-132-3/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into PLT-589Stas Vovk2015-10-122-3/+1
| | |\ \ \ \ \
| * | | | | | | replaced constructions like user.roles === 'admin' by ↵Stas Vovk2015-10-132-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Utils.isAdmin(user.roles) in manage members
| * | | | | | changed Admin to Team Admin in admin consoleStas Vovk2015-10-121-1/+3
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into PLT-589Stas Vovk2015-10-123-8/+3
| |\ \ \ \ \ \
| * | | | | | | changed Admin to Team Admin in Manage Team membersStas Vovk2015-10-121-1/+3
| | | | | | | |
* | | | | | | | Merge pull request #1038 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-133-2/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Multiple Ui Improvements
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 19:28:01 +0000