Skip to content

GitLab

Switch branch/tag
  1. 25 Aug, 2021 5 commits
  3. 24 Aug, 2021 10 commits
  5. 23 Aug, 2021 4 commits
  7. 22 Aug, 2021 1 commit
  9. 20 Aug, 2021 9 commits
  11. 19 Aug, 2021 8 commits
    • Asaad Mahmood's avatar
      MM-37697 - Updating favicons (#8660) · dbba16f5
      Asaad Mahmood authored 
      Automatic Merge
      dbba16f5
    • Pablo Andrés Vélez Vidal's avatar
      MM-38011 - select enterprise for first subscribe (#8642) · a53565d8
      Pablo Andrés Vélez Vidal authored 
      

* MM-38011 - select enterprise for first subscribe

* fix circle ci config values

* return current subscribed product when in free trial

* fix isFreeTrial condition

* add previous logic for upgrade validation
Co-authored-by: default avatarPablo Velez Vidal <pablo.velez@mattermost.com>
Co-authored-by: default avatarMattermod <mattermod@users.noreply.github.com>
      a53565d8
    • Saturnino Abril's avatar
      follow up fix to finding spec files (#8650) · b8336bc7
      Saturnino Abril authored
      b8336bc7
    • Kyriakos Z's avatar
      MM-36234,MM-37030,MM-37031: CRT, desktop notification settings (#8515) · 76f71e5b
      Kyriakos Z authored 
      * MM-36234: CRT, desktop notification settings

This commit makes needed changes to desktop notifications depending on
CRT preference.
Adds a new `user.notify_props` setting called `desktop_threads`,
which can be either ALL or MENTION with a default set to ALL.

More info: https://mattermost.atlassian.net/browse/MM-36234



* Fixes typo and tests

* Fixes tests

* Fixes: notify CRT should regard if thread is open

* Click on Desktop notification

Clicking on a desktop notification when CRT is 'on' and the post is a
reply should redirect the user to the permalink of the reply.

* Fixes tests

* Removes some logic on CRT replies desktop notifications

Thread followers that have CRT on and should receive a desktop
notification are added by the server in the mentions array.
So on CRT 'on' replies we disregard channel specific settings for
notifications, and we follow the desktop ones.

* Fixes lint issues

* Email threads notification setting

* Add push notification setting for CRT

* Fixes linting issue

* Fixes according the server PR

The websocket event sends now both mentions and followers,
de-duplicate and notify them all.

* Fixes permalink to DM/GM from desktop notification

* Excludes non followers from receiving desktop notifications

If a user had the notify level set to 'all' they would get notifications
even for non-following threads.

This commit fixes that by checking if the user is in the "followers"
array.

* Support opening the thread on desktop app notification

Clicking on a notification that regards a reply to a thread,
and when the user has CRT set to ON, should open the corresponding
thread in desktop app as well as the browser.

This is done by passing the url to push to the "browser" along side the
notification.  The url depends on whether the user has CRT ON and
whether the post is a reply or not.

* Checks URL passed from desktop

* url param is known from 4.7.2 and forth

* Fixes linting issue
Co-authored-by: default avatarMattermod <mattermod@users.noreply.github.com>
Co-authored-by: default avatarKyriakos Ziakoulis <koox00@Kyriakoss-MacBook-Pro.local>
      76f71e5b
    • Jesús Espino's avatar
      Moving ModalController aside the GlobalHeader (#8621) · 8ef00976
      Jesús Espino authored 
      Automatic Merge
      8ef00976
    • Michel Engelen's avatar
      MM-37600 - disable global header in mobile web views (small viewports) (#8561) · 4c4693fb
      Michel Engelen authored 
      

* added a very basic implementation of the compass-components package

* moved compass-components for ProductSwitcher to separate component

* added correct usage of element in Grid component and cleaned up comments

* added generic type to the Grid component to fix typing issue

* added return type to GlobalHeader component

* added new compass-components release from npmjs

* stuff happened

* bumped compasss-component package version to 0.2.3

* some changes and version bump of compass-components

* fix build, update compass components, theme tweak

* revert compass components integration test code ...

... to the bare minimum, we will revisit in future pr's

* update comment for temp theme implementation

* move things around

* Align items in global header

* Switch to using @mattermost/compass-icons package

# Conflicts:
#	package-lock.json
#	package.json

* style overrides for legacy ui when GH is active

* add structure, compartmentalize and tweak layout (#8512)

* Add functionality to header buttons

* fix lint errors

* refactor search bar

* Added tooltips

* fix tooltips

* fix tests

* WIP - status dropdown

* Move team menu

* ix type error

* Fix up product switcher menu

* initial compass theme provider

* adjust theme colours specifically for GH

Will need to redo once compass components are used in other areas

* hide GH using CSS instead of `isMobile`

If a browser window starts narrow enough to be considered "mobile", the GH will be missing if the window is manually resized larger than "mobile" width.

* wip: move rhs up next to channel header

* add icons /w cds icon component

* gh should be on top of the channel view

* eslint fixes

* add back search bar in mobile view

* PR feedback - DEVS

* Address final comments

* deactivated global header display by checking UserAgent.isMobile before getting and returning the stored values

* added isMobile check in the selector as well

* removed product switcher folder

* added a new UserAgent function `isMobileWeb`

* replaced calls to `UserAgent.isMobile()` with the new `UserAgent.isMobileWeb()`

* removed CSS hiding of global header

* adjusted the small viewport size check

* adjusted isMobile checks in state-prop mapping for user-settings

* adjusted inline comment

* fixed a boolean error in the global header selector

* PR review remarks

* fixed a missing replacement
Co-authored-by: default avatarDean Whillier <dean@whillier.com>
Co-authored-by: default avatarNevyana Angelova <nevyangelova@Nevyanas-MacBook-Pro.local>
Co-authored-by: default avatarDean Whillier <deanwhillier@users.noreply.github.com>
Co-authored-by: default avatarNevyana Angelova <nevyangelova@Nevyanas-MBP.fritz.box>
Co-authored-by: default avatarMattermod <mattermod@users.noreply.github.com>
      4c4693fb
    • Pablo Andrés Vélez Vidal's avatar
      Mm 37657 migrate cloud purchase screens to new branding (#8573) · d9a9a50c
      Pablo Andrés Vélez Vidal authored 
      

* MM-37657 - migrate cloud purchase screens to new branding

* Add images to the process payment page

* address UX pr comments

* fix images alignment

* fix linter
Co-authored-by: default avatarPablo Velez Vidal <pablo.velez@mattermost.com>
      d9a9a50c
    • Michel Engelen's avatar
      only show "integration" and "marketplace" in messaging (#8575) · 5fbb04a7
      Michel Engelen authored 
      * hides `integration` and `marketplace` items from ProductSwitcher menu

* moved the definition of `isMessaging` to the `ProductSwitcher` and added `isMessaging` as a prop to `ProductSwitcherMenu`

* fixed a typo in `currentProductID`

* PR review remarks
      5fbb04a7
  13. 18 Aug, 2021 3 commits
    • Saturnino Abril's avatar
      add ability to include or exclude test files (#8628) · 810427cf
      Saturnino Abril authored
      810427cf
    • Harrison Healey's avatar
      MM-32342 Remove old sidebar (#8503) · a79d2e7f
      Harrison Healey authored 
      * MM-32342 Remove LegacySidebar component

* MM-32342 Remove deprecated settings from UserSettingsSidebar

* MM-32342 Remove references to old sidebar from ChannelHeader

* MM-32342 Remove references to old sidebar from DataPrefetch

* MM-32342 Remove references to old sidebar from mattermost-redux

* MM-32342 Remove references to old sidebar from web app redux

* MM-32342 Remove EnableLegacySidebar from client config

* MM-32342 Remove code for old sidebar analytics

* MM-32342 Remove old sidebar selectors from LeaveTeamModal

* MM-32342 Remove channel selectors only used by old sidebar

* MM-32342 Remove unused selectors

* MM-32342 Remove legacyMakeFilterAutoclosedDMs

* MM-32342 Remove code for favourites preferences

* MM-32342 Remove unneded code for making DMs visible

* MM-32342 Remove old autoclosing DMs code

* Remove getSidebarPreferences

* Remove leftover comment and unused selector

* Update E2E tests relying on old sidebar

* Remove System Console settings and type definitions for deprecated settings

* Fix bad merge

* Remove a few more instances of deprecated settings

* Fix i18n

* Remove lingering reference to getAllRecentChannels
      a79d2e7f
    • Dean Whillier's avatar
      [MM-37157, MM-37159] Add new branding graphics welcome to MM, tips & next... · cab89f38
      Dean Whillier authored 
      [MM-37157, MM-37159] Add new branding graphics welcome to MM, tips & next steps and shared background (#8605)

* add new branding graphics for tips & next steps

* remove old graphic

* update welcome to mattermost graphic

* make background pill symbol reusable

* ios still works with y scrolling set to auto

- the empty scrollbar was unecessarily showing on desktop, setting this back to 'auto' fixes that and still work on iOS devices per my local testing because `-webkit-overflow-scrolling: touch;` seems to be enough to fix the iOS scrolling bug
      cab89f38