Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 871
    • Issues 871
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 55
    • Merge Requests 55
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !486

Closed
Opened 1 week ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: (feat): Minds Pro (development branch) - Release 2

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b epic/minds-pro origin/epic/minds-pro

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/minds-pro-stable
git merge --no-ff epic/minds-pro

Step 4. Push the result of the merge to GitLab

git push origin minds-pro-stable

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge epic/minds-pro into minds-pro-stable
  • Email patches
  • Plain diff
Pipeline #77407150 canceled for f89d3b67 on epic/minds-pro
            Requires 2 more approvals from Devs and Deployers.
            Brian Hatchet
            Brian Hatchet
            Ben Hayward
            Ben Hayward
            Martin Santangelo
            Martin Santangelo
            Mark Harding
            Mark Harding
            Juan Manuel Solaro
            Juan Manuel Solaro

            Closed by Emiliano Balbuena 2 hours ago

            The changes were not merged into minds-pro-stable

            • Discussion 0
            • Commits 1
            • Pipelines 62
            • Changes 22
            • Loading...
            • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 1 week ago

              added Product::Pro Squad::Yellow scoped labels

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • cc328524 - (feat) Add ellipsis menu that contains common channel actions

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 1 week ago

              added 1 commit

              • 4e8253fb - (wip): Pro home

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • d51cd653 - (feat): added background overlay colour

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • e601de33 - (feat): only show categories underneath navbar if we're on a list view

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • f5ec17bf - 1 commit from branch minds-pro-stable

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 5b34538b - (prototype) Subscribe button with counter on nav bar

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • a46285be - (fix): tweaked styling for search results

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 39305f72 - (fix): show categories check

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 1aac4212 - (fix): tweaked spacing for categories

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 7daa1778 - (fix): uppercase text for navbar and categories

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 7165cacb - (feat): uppercase text for footer

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 1 week ago

              added 1 commit

              • d7276c2e - (proto): Pro home

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 0fc6f00e - (fix) hide subscribe button when logged user is the same as pro channel

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • bee56996 - (fix): re-styled "showing results for: (...)"

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 1 week ago

              added 1 commit

              • a1a65be8 - (fix): Minor style tweaks

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • bda7eb6c - (feat) styling for subscribe button

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 10a89a2e - (feat): rename 'groups' to 'communities'

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 43fcf513 - (chore) change margin and text alignment for tags filter in mobile view

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 9416818b - (chore) increase footer padding and margin on mobile view

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • c545917f - (chore) remove title and heading from Pro homepage

              Compare with previous version

            • Marcelo Rivera @eiennohi added 2 commits 1 week ago

              added 2 commits

              • c809c2b3 - (feat): introduced "all" category
              • 754b5bf0 - (feat): hashtag filtering via url

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 7faa4b3b - (fix): send null child params when on home

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • d533ef85 - (fix): run change detection after shouldShowCategories()

              Compare with previous version

            • Emiliano Balbuena @edgebal added 2 commits 1 week ago

              added 2 commits

              • 1466efd3 - (feat): Pro homepage content
              • 01017e31 - (feat): Pro homepage mobile view

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 1 week ago

              added 1 commit

              • e12f59de - (chore): Pro homepage

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 9e79064c - (feat) show modal to unsubscribe when clicking on subscribe button

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 75c04dfa - (feat): revamped group tiles

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 8bc3030a - (fix): project structure

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 738fa536 - (feat): generic hashtags component

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • e1c35377 - (feat): generic hashtags comp

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 week ago

              added 1 commit

              • 653b8976 - (fix): a couple of fixes regarding categories component

              Compare with previous version

            • Emiliano Balbuena @edgebal added 6 commits 1 week ago

              added 6 commits

              • 5a56e77c - (chore): Remove "Featured Content" title
              • 358613e7 - (fix): Feeds modal
              • be8ff599 - (chore): Anchor modals to Pro channel component
              • bd5332cc - (chore): Re-style subscribe button
              • f12a2fe6 - (feat): Global open() service for Pro channel entities/tiles
              • ed718d77 - (chore): Code style tweaks

              Compare with previous version

              Toggle commit list
            • Marcelo Rivera @eiennohi added 2 commits 6 days ago

              added 2 commits

              • a438de31 - (fix): 'all' hashtag shouldn't appear in the url
              • cf28722e - (refactor): moved categories to list component

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 6 days ago

              added 1 commit

              • 1d2fbf2b - (fix): removed setChildParams call

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 6 days ago

              added 1 commit

              • 16b4e3e2 - (fix): removed 2nd row

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 6 days ago

              added 1 commit

              • b0bf7542 - (fix): Remove unused property

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 6 days ago

              added 1 commit

              • a9b9db6c - (fix): hide categories in the communities section

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 6 days ago

              added 1 commit

              • 0d8d3dff - (feat): don't show hashtags in communities

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 6 days ago

              added 1 commit

              • d04327b2 - (fix): minor code style tweak

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 6 days ago

              added 1 commit

              • de16602a - (fix): minor code style tweak

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 5 days ago

              added 1 commit

              • c98824ab - (feat): open blogs in a modal

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 5 days ago

              added 1 commit

              • 0ef0cb96 - (feat): namespace pro CSS variables

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 5 days ago

              added 1 commit

              • bb33aef2 - (fix): keep spacing when hiding categories

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 5 days ago

              added 1 commit

              • 1d950b69 - (wip): Pro standalone mode prototype

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 5 days ago

              added 1 commit

              • 66e6f1f5 - (wip): Remove Minds bars on standalone mode

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 2 days ago

              added 1 commit

              • b69644b1 - (wip): Homepage categories

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 1 day ago

              added 1 commit

              • 1a8353f0 - (refactor): Homepage (Mk2)

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 1 day ago

              added 1 commit

              • 94aa955e - (chore): Always show View channel button; tweak spinner style

              Compare with previous version

            • Emiliano Balbuena @edgebal added 46 commits 1 day ago

              added 46 commits

              • d675e05b - (fix): if error (due to potential cookie blocking), then report error
              • a0b70491 - (feat): add e2e for cypress
              • 12578c8b - (chore): do not install cypress on all npm install, just on e2e
              • 14da30ea - (chore): use chrome vs electron for tests
              • d6cab552 - (feat): some changes to the ci flow, test against chrome and base image
              • d9e35526 - (fix): duplicated variables
              • 11800810 - (fix): specify cypress binary as variable
              • d2a4fe13 - (chore): remove double e2e block
              • 5e3aa0b0 - (fix): bad paths for cypress artifacts
              • a8b4cc9a - (feat): infinite newsfeed scrolls - closes engine#692 (closed)
              • 4bbb05e5 - (chore): remove 40 post boost cap
              • 14aa9c6d - (fix): prevent fetching the entire feed to refresh when simply scrolling
              • 4f14088f - (chore): show boosts every 5 slots, vs 8
              • d10d7bf3 - Sprint/KiltedKoala: Added infinite scroll to group feed
              • 4be406ce - Merge branch 'fix/infinite-group-feed-691' into 'master'
              • 59048205 - [Sprint/KiltedKoala] (fix): blog e2e test
              • 9c9d23d9 - Merge branch 'fix/blogs-e2e-test' into 'master'
              • 2ff49568 - (chore): remove 10k boosts
              • 79c1eb43 - Merge branch 'chore/remove-10k-boosts' into 'master'
              • b0ed28f7 - [Sprint/KiltedKoala] (fix): e2e tests
              • 6d942fb6 - Merge branch 'fix/e2e-tests-issues' into 'master'
              • f6536e03 - (chore): disable view debouncer
              • 5b0bed2d - [Sprint/KiltedKoala] (feat): e2e tweaks
              • 14a72a8a - Merge branch 'feat/e2e-tweaks' into 'master'
              • 44f93840 - (feat): boost feed is back
              • c8af9c69 - (chore): reduce 500ms scroll wait to 100ms
              • 2fc2fc95 - (chore): clear boost feed on refresh
              • eedf72d4 - (fix): feeds service should be public in boost feed component
              • 4a252ac8 - (fix): some minor tweaks to fetching of boosts to aid with delivery
              • ebf9ba5c - Sprint/JollyJellyfish: Update share modal
              • 89b011cd - Merge branch 'feat/update-share-buttons-1532' into 'master'
              • 1a04dcd1 - Revert "Testing fdesc"
              • 2e95c013 - Merge branch 'feat/fdesc-hook-1608' into 'master'
              • ed5c797d - Sprint/KiltedKoala: Added in wire transaction e2e test #1641 (closed)
              • bfd7f8ed - Merge branch 'feat/wire-e2e-1641' into 'master'
              • fa9d8d65 - Sprint/KiltedKoala: Added in comment-tree e2e tests #1635 (closed)
              • c55bb642 - Merge branch 'feat/comment-tree-e2e-1635' into 'master'
              • 30f6bcee - Sprint/KiltedKoala: Added e2e tests for onboarding #1639 (closed)
              • c3300d5b - Merge branch 'feat/onboarding-e2e-1639' into 'master'
              • 442c8ce9 - Sprint/KiltedKoala: Added e2e tests for boost impressions #1634 (closed)
              • ef9383fc - Merge branch 'feat/boost-impressions-1634' into 'master'
              • 3c09991d - Sprint/KiltedKoala: Added e2e test for boost rejection in console #1633 (closed)
              • 39b6fcb6 - Merge branch 'feat/boost-console-e2e-1633' into 'master'
              • e98051fe - Sprint/KiltedKoala: Added in e2e for addition and deletion of remind. #1637 (closed)
              • 268165b1 - Merge branch 'feat/remind-e2e-1637' into 'master'
              • 9d6853cd - Merge remote-tracking branch 'origin/master' into epic/minds-pro

              Compare with previous version

              Toggle commit list
            • Marcelo Rivera @eiennohi added 3 commits 1 day ago

              added 3 commits

              • a95d6472 - (feat): generic draggable list
              • 9d9d04a5 - (fix): remove list of tags used for debugging
              • b3e268a5 - (chore): comment-out new draggable list in pro settings for now

              Compare with previous version

            • Marcelo Rivera @eiennohi added 3 commits 1 day ago

              added 3 commits

              • ae8272cf - (feat): disable juryduty in pro
              • 486b3e25 - (feat): disable onboarding for pro standalone
              • 6800f609 - (feat): add X button to categories and footer items

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 1 day ago

              added 1 commit

              • c312a29b - (fix): forgot to commit package-lock.json

              Compare with previous version

            • Emiliano Balbuena @edgebal added 3 commits 1 day ago

              added 3 commits

              • afcbb3b1 - (feat): List loader
              • f5791df9 - (chore): Center and stylize categories; fix all list modal
              • 07253475 - (chore): Ditch top tiles extra margin

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 9 hours ago

              added 1 commit

              • abc2e709 - (feat): disable notifications on Pro standalone

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 7 hours ago

              added 1 commit

              • edf9fb7f - (fix): disable messenger for pro standalone

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 5 hours ago

              added 1 commit

              • 4939e408 - (feat): ability to either signup or login in pro

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 5 hours ago

              added 1 commit

              • 13406213 - (feat): ability to either signup or login in pro

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 5 hours ago

              added 1 commit

              • 181879d1 - (feat): redirect to normal login if not on standalone

              Compare with previous version

            • Marcelo Rivera @eiennohi added 1 commit 5 hours ago

              added 1 commit

              • 0764c503 - (feat): moved subscription component to its own folder

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 2 hours ago

              added 1 commit

              • f89d3b67 - (wip): Inject Pro on users

              Compare with previous version

            • Emiliano Balbuena @edgebal closed 2 hours ago

              closed

            • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
            Please register or sign in to reply
            Assignee
            Emiliano Balbuena's avatar Emiliano Balbuena @edgebal
            Assign to
            None
            Milestone
            None
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            2
            Labels
            Product::Pro Squad::Yellow
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            9
            9 participants
            user avatar
            Brian Hatchet
            user avatar
            Ben Hayward
            user avatar
            Martin Santangelo
            user avatar
            Mark Harding
            user avatar
            Juan Manuel Solaro
            user avatar
            Olivia Madrid
            user avatar
            Guy Thouret
            Reference: minds/front!486