summaryrefslogtreecommitdiffstats
path: root/webapp
Commit message (Collapse)AuthorAgeFilesLines
* Fixing ids for selenium (#5874)Corey Hulen2017-03-241-1/+1
|
* PLT-5281 error messages contain a link to documentation about reserved words ↵Ari Autio2017-03-243-7/+13
| | | | | | | | | | (#5530) * PLT-5281 error messages contain a link to documentation about reserved words * Updated comments per PM review * Proposed fix to review comments
* Check if LHS DM list needs updating on channel switch and channel members ↵Joram Wilander2017-03-242-1/+4
| | | | fetch (#5861)
* PLT-5879: User email notification settings disabling. (#5837)George Goldberg2017-03-242-1/+35
| | | | When Email Notifications are turned off server wide, don't allow the user to configure their email notification preferences.
* PLT-5910: Fix Channel header menu in Town Square. (#5831)George Goldberg2017-03-241-21/+21
|
* PLT-5907: Fix Create Channel in More Channels dialog. (#5830)George Goldberg2017-03-241-8/+4
|
* Fix LHS group message sorting (#5812)Joram Wilander2017-03-241-2/+19
|
* Ticket 4665 - Emoji Picker (#5157)bonespiked2017-03-2428-53/+4827
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * #4665 Added EmojiPicker Work primarily by @broernr-de and @harrison on pre-release.mattermost.com * Final fixes to handle custom emojis from internal review and single merge error * ESLint fixes * CSS changes and other code to support emoji picker in reply window * Fix for file upload and emoji picker icon positions on post and comment. RHS emoji picker appearing see-through at this time. * Fix for two ESLint issues. * covered most of feedback: RHS emoji picker looks correct color-wise RHS emoji picker dynamically positions against height of thread size (post + reply messages) escape closes emoji window search box focused on open ESLint fixes against other files oversized emoji preview fixes * Adding in 'outside click' eventing to dismiss the emoji window * Changing some formatting to fix mismatch between my local eslant rules and jenkins. * adding alternative import method due to downstream testing errors * yet another attempt to retain functionality and pass tests - skipping import of browser store * fix for feedback items 5 and 7: * move search to float on top with stylistic changes * whitespace in the header (+1 squashed commit) Squashed commits: [6a26d32] changes that address items 1, 2, 6, 8, and 9 of latest feedback * Fix for attachment preview location on mobile * Fix for latest rounds of feedback * fixing eslint issue * making emojipicker sprite based, fixing alignments * Fix for emoji quality, fixing some behavior (hover background and cursor settings) undoing config changes * Preview feature for emojis * Adjustments to config file, and changing layout/design of attachment and emoji icon. * manual revert from master branch for config.json * reverting paperclip and fixing alignments. Additionally fixing inadvertent display of picker on mobile. * CSS changes to try to fix the hover behavior - currently working for emoji picker (when enabled), but hover for attachment isn't working * Made suggested changes by jwilander except for jQuery removal * Adding hover for both icons * removal of some usages of jQuery * Fix for two layout issues on IE11/Edge * UI improvements for emoji picker * Fix for many minor display issues * fix for additional appearance items * fix to two minor UI items * A little extra padding for IE11 * fix for IE11 scroll issue, and removing align attribute on img tag which was throwing js error * fixes some display issues on firefox * fix for uneven sides of emojis * fix for eslint issues that I didn't introduce * fix for missing bottom edge of RHS emojipicker. also fixing text overlapping icons on text area (including RHS) * Update "emoji selector" to "emoji picker" * changes for code review - removal of ..getDOMNode - use sprite imagery for emoji preview - remove lastBlurAt from state as it wasn't used * fixes for: - fake custom emoji preview in picker - RHS scrollbar on preview * fix for minor alignment of preview emoji
* Update default town square purpose (#5810)Ryan Wang2017-03-242-4/+18
|
* Add file attachment to search result (#5806)VeraLyu2017-03-241-0/+12
|
* Fixed mobile search focus - keyboard collapse/focus (#5766)Saturnino Abril2017-03-245-120/+132
|
* Fixing issue with ids for selenium (#5859)Corey Hulen2017-03-233-3/+12
| | | | | | * Fixing issue with ids for selenium * removing comment
* Adding a last message id for selenium testing (#5840)Corey Hulen2017-03-235-3/+14
|
* PLT-5755: Infrastructure for Component Testing. (#5814)George Goldberg2017-03-2337-798/+1392
| | | | | | | | | | This migrates the existing webapp tests to using Jest and Enzyme. The infrastructure is put in place for React component testing, and a few simple example component tests are implemented. This also adds snapshot testing of components, coverage checking for the webapp (although that is not yet integrated to Coveralls), and the ability to run npm run test:watch to automatically re-run affected tests when working on the webapp codebase.
* Merge branch 'release-3.7'George Goldberg2017-03-231-1/+1
|\
| * Fix telemetry. (#5841)George Goldberg2017-03-221-1/+1
| |
* | PLT-5913: Remove id from heading markdown compilation (#5782)VeraLyu2017-03-232-4/+3
| | | | | | | | | | Id for heading markdown is unnecessary as we didn't attach any style/effect on that id, and it also introduce duplicate id. So remove it from heading markdown generatiing.
* | PLT-5669: Change format of timestamp of access history (#5646)VeraLyu2017-03-232-15/+22
| | | | | | | | Add new line for timestamp and forbid wrap for ip and sessionid of access history to prevent unnecessary line wrap.
* | fix - make loginId always lowercase (#5613)Carlos Tadeu Panato Junior2017-03-231-1/+1
| |
* | translations PR 20170320 (#5819)enahum2017-03-2110-66/+126
| |
* | Add IDs to Team Settings, Channel Settings, Account Settings (Display & ↵Eric Sethna2017-03-2111-3/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Advanced) (#5823) * Add IDs to Channel Notification Preferences * Add IDs to Display Settings * Add ID to language dropdown * Add Ids * Add ids * Add Ids * Add Ids * Add Ids * Add Id * Add Ids * Add Ids * Fix duplicate Id
* | translations PR 20170316 (#5791)enahum2017-03-209-55/+135
| |
* | Revert "PLT-3181 Added crossorigin='anonymous' to all external images ↵Harrison Healey2017-03-207-15/+5
| | | | | | | | | | (#5774)" (#5815) This reverts commit 24848f9d6a92eb1e09189c358636fd1ba32fa6d6.
* | Remove blue bar from link previews (#5673)Ryan Wang2017-03-201-0/+3
| |
* | Update pinned posts help text (#5811)Jason Blais2017-03-202-4/+11
| | | | | | | | | | | | | | | | * Update pinned posts help text * Update en.json * Fix id
* | Split delete modal trigger for reuse (#5740)VeraLyu2017-03-195-65/+133
| | | | | | | | Spllit delete modal trigger for reuse and make emoji delete to use this modal trigger.
* | Fxing buildChristopher Speller2017-03-171-1/+1
| |
* | Merge branch 'release-3.7' into master.George Goldberg2017-03-1740-293/+393
|\|
| * PLT-5804 Fix email blue error not showing up (#5749)Joram Wilander2017-03-141-1/+1
| |
| * Report correct session for React Native app (#5734)enahum2017-03-131-2/+2
| |
| * translations PR 20170309 (#5710)enahum2017-03-1011-225/+239
| |
| * PLT-5792 Fixed all ephemeral posts using system message icons (#5709)Harrison Healey2017-03-101-3/+1
| |
| * Fix user list updating when removing a user from team (#5712)Joram Wilander2017-03-101-2/+2
| |
| * PLT-5772: Use standardised javascript method instead of Chrome-only one. (#5708)George Goldberg2017-03-091-1/+1
| |
| * Fix posts from your own webhook not showing as unread until refresh (#5703)Joram Wilander2017-03-092-2/+6
| |
| * Fix GMs showing up on refresh after being hidden (#5702)Joram Wilander2017-03-092-1/+5
| |
| * Multiple bug fixes (#5699)Asaad Mahmood2017-03-095-4/+15
| | | | | | | | | | | | * Multiple bug fixes * Fixing modal on mobile
| * Remove race between clearing lists and search requests (#5686)Joram Wilander2017-03-095-10/+15
| |
| * Fix MFA page showing up when not active on account switch (#5687)Joram Wilander2017-03-092-3/+3
| |
| * PLT-5769 Translations filenames and values consistent (#5689)enahum2017-03-093-2/+2
| |
| * Bug fixes (#5682)Asaad Mahmood2017-03-081-0/+7
| | | | | | | | | | | | * PLT-5740 - Fixing overlapping attachment icon * PLT-5748 - Scroll not visible in RHS IE11
| * Ui improvements and bug fixes (#5677)Asaad Mahmood2017-03-086-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-5565 - Fixing theme colors not updating * PLT-4721 - Removing status ind for system messages * PLT-5735 - Fixing ellipsis in firefox * PLT-5010 - Removing extra space in channel modal * PLT-5584 - Inline image overrning edit textarea * PLT-5475 - Fixing tutorials on mobile * PLT-5142 - Disabling poitner events for status * PLT-5728 - Fixing emoji highlight on hover
| * Add sync logic for DMs/GMs when network reconnects (#5676)Joram Wilander2017-03-085-24/+74
| |
* | Ui improvements (#5755)Asaad Mahmood2017-03-1714-56/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-5816 - Flagged posts tooltip fix * PLT-5766 - Link previews appearing outside the box * PLT-5795 - Fixing alignment user list in channel * PLT-5818 - Reset password error not aligned * PLT-5837 - Adjusting image preview max height * PLT-5778 - Updating word break for paragraphs * PLT-5848 - Updating label for file error * PLT-5846 - Markdown tables extra border on mobile * PLT-5662 - Pinned post UI improvement * Fixing eslint error * Updating tooltip eslint issue * PLT-5832 - Removing error styling on labels
* | 'Other words' for mentions no longer includes '@username' (#5746)Ryan Wang2017-03-171-0/+3
| |
* | Add IDs for Account Settings > Notifications (#5788)Eric Sethna2017-03-163-0/+28
| | | | | | | | | | | | | | | | | | | | * Add IDs for desktop notification settings * Add IDs for email notifications * Add IDs to user notification settings * Add close button ID
* | Fixing ids for UI automation (#5772)Corey Hulen2017-03-162-3/+26
| |
* | PLT-3181 Added crossorigin='anonymous' to all external images (#5774)Harrison Healey2017-03-167-5/+15
| | | | | | | | | | | | | | | | * PLT-3181 Added crossorigin='anonymous' to all external images * Fixed image unit tests * Added crossorigin='anonymous' to a few more places
* | Sort favorite channels alphabetically regardless of type (#5739)Ryan Wang2017-03-161-6/+8
| |
* | Add IDs to Security > password fields (#5777)lindalumitchell2017-03-161-0/+3
| |