Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bringing fork up to date #1

Merged
merged 21 commits into from
Mar 25, 2019
Merged

Bringing fork up to date #1

merged 21 commits into from
Mar 25, 2019

Commits on Mar 19, 2019

  1. Added join/list public/private teams permissions (#2393)

    * Added join/list public/private teams permissions
    
    * Only show in the list the listable and joinable teams
    
    * Join directly to team instead of using an invitation
    
    * Removing other usage of InviteId to join teams
    
    * Fixing tests
    
    * Updated mattermost-redux dependency
    
    * Fixing test name
    jespino committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    d78337c View commit details
    Browse the repository at this point in the history
  2. MM-12488: Adds groups search and filters. (#2461)

    * MM-12488: Adds groups search and filters.
    
    * MM-12488: Removes return value.
    
    * MM-12488: Changes to filter and search UX.
    
    * MM-12488: Updates snaps.
    
    * MM-12488: Fix for JS error.
    
    * MM-12488: Decrease state updates.
    
    * MM-12488: Reusing some keys.
    
    * MM-12488: Extract regex creation.
    
    * MM-12488: Uses constant keycode.
    
    * MM-12488: Fix for pagination.
    
    * MM-12488: Adds tests.
    
    * MM-12488: Adds parameters to search function.
    
    * MM-12488: Removes knowledge of contents of filters div. Removes some calls to .
    
    * MM-12488: Snap update.
    
    * MM-12488: Removes unused param.
    
    * MM-12488: Cancels native click event properly.
    
    * MM-12488: Removes unnecessary global flag from regex. Tests that flags are compared case-insensitively.
    mkraft authored and jespino committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    764c126 View commit details
    Browse the repository at this point in the history
  3. Remove period from OAuth apps description in Main Menu > Integrations (

    …#2518)
    
    * Remove period from OAuth apps description in Main Menu > Integrations
    
    * Update integrations.jsx
    jasonblais authored and mgdelacroix committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    b0ad1fb View commit details
    Browse the repository at this point in the history
  4. [MM-14253] Modify Elasticsearch admin console messages to reference u…

    …sers and channels (#2486)
    
    * Adds a flag to autocomplete users and channels using elasticsearch in the config
    
    * Wording changes
    
    * [MM-14253] Modify Elasticsearch admin console messages to reference users and channels
    mgdelacroix committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    abf1cdd View commit details
    Browse the repository at this point in the history
  5. MM-13634 Fix error message when drag and dropping folders (#2449)

    * Fix error message when drag and dropping folders
    
    * Update generic failed upload error message
    
    * Remove unused localization string
    jwilander committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    2ddd75a View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2019

  1. [MM-14356] Some strings in Channel Settings aren't localizable (#2484)

    * [MM-14356] Some strings in Channel Settings aren't localizable
    
    * use `<FormattedMessage>` to translate `globalNotifyLevel`
    * add localized strings for `ignoreChannelMentions`
    * add localized strings for notification “levels” such as Default, All, Mention, and None
    * removed `({notifyLevel})` from translation json files as this value won’t be sent any longer as part of this string
    * updated test snapshot
    
    * Remove `notifyLevel` from Korean language file
    
    * Add German translation from community
    
    * Remove translation strings
    
    Remove translation strings to allow translation server to handle.
    bradjcoughlin authored and sudheerDev committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    be23c33 View commit details
    Browse the repository at this point in the history
  2. [MM-14571] Add e2e to test @mentions notifications (#2507)

    * [MM-14571] Add e2e to test @mentions notifications
    
    * [MM-14571] Cleanup fixture usage, use async/await in plugin
    
    * [MM-14571] Lock down axios version to current version
    
    * [MM-14571] Rename post message as file
    
    * [MM-14571] Additional work based on feedback
    
    * Remove dupe id in channel header
    * Add channelid to header
    * Update snapshot
    * Clean up test
    * Add cypress command for getting channel id
    
    * [MM-14571] scroll element into view before clicking
    
    * [MM-14571] scroll another element into view before clicking
    
    * [MM-14571] Remove unneccessary scrollIntoView()
    thekiiingbob authored and sudheerDev committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    1796712 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b696197 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c55a82e View commit details
    Browse the repository at this point in the history
  5. UI Automation: Write an automated test for Mobile using cypress. Dele…

    …te a parent message that has a reply: Reply RHS (#2421)
    d28park authored and saturninoabril committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    3ed1e03 View commit details
    Browse the repository at this point in the history
  6. MM-14350: Fixes relative link under custom subpath. (#2511)

    * MM-14350: Adds a translation values parameter to AdminPanel.
    
    * MM-14350: Prefixes relative URL with site url to work under custom subpath.
    mkraft committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    c071663 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    543c0cd View commit details
    Browse the repository at this point in the history
  8. MM-14500 Fix for pop caused by size_aware_image (#2469)

    * MM-13099 Use size_aware_image component for when loading images in posts (#2334)
    * MM-13099 Use size_aware_image component for all instances for loading images in webapp.
    * Removing getFileDimensionsForDisplay in favour of  SizeAwareImage as it would be reliable in preventing
      scroll pop
    * Add a fallback for svg as older version do not have dimentions
    MM-14500 Fix for pop caused by size_aware_image
    
      * Use svg for creating placeholder instead of canvas and dataUrl
        Change to inline-block for hover css shadow effect
        Add defensive check for dimensions
    
    Removing display: inline-flex as it causes svg in the placeholder to not take the available space
    Have to move border hioghlight to img tags as div is display block by default so shows border for the entire
    box instead of just the image
    
    Update snapshots and fix lint
    
    * Fix review comments
    sudheerDev authored and hmhealey committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    ee41ff2 View commit details
    Browse the repository at this point in the history
  9. [MM-14491] avoid hiding the popover when the cursor is moved away fro…

    …m the link to the popover (#2472)
    kosgrz authored and hanzei committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    320995d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    38b9bd9 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. added marked commit that fixes formatted embedded link to italicize w…

    …hen surrounded by asterisks (#2516)
    saturninoabril committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    c426e3a View commit details
    Browse the repository at this point in the history
  2. MM-14358 - E2E Test for "Message Draft Pencil Icon visible in channel…

    … switcher" (#2490)
    
    * [MM-14358] add E2E test for message draft pencil icon visible in channel switcher
    
    * fix E2E test
    kelvintyb authored and saturninoabril committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    3380271 View commit details
    Browse the repository at this point in the history
  3. Add (SAML|LDAP|Email) Login Button Color Configurations (#2502)

    * Add (SAML|LDAP|Email) Login Button Color Configurations
    
    * casing and permalinks
    
    * add trailing colons to experimental page
    
    * hide experimental ldap group sync if not licensed for same
    
    * reformat admin_console_index.test.jsx
    
    * update search tests to reflect experimental updates
    lieut-data committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    a242f14 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2019

  1. [MM-14375] Fix flaky test on collapsed specs and separated markdown s…

    …pecs (#2527)
    
    * fix flaky test of collapsed spec and pull out markdown into separate spec
    
    * removed commented line
    saturninoabril authored and migbot committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    4b3ada3 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2019

  1. Configuration menu
    Copy the full SHA
    89e0e82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ff2190a View commit details
    Browse the repository at this point in the history