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 888
    • Issues 888
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 47
    • Merge Requests 47
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • 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
  • !507

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

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

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 #79243968 failed for bb55de59 on epic/minds-pro
              Requires 2 more approvals from Devs and Deployers.
              Brian Hatchet
              Brian Hatchet
              Juan Manuel Solaro
              Juan Manuel Solaro
              Guy Thouret
              Guy Thouret
              Mark Harding
              Mark Harding
              Martin Santangelo
              Martin Santangelo

              Closed by Emiliano Balbuena 9 minutes ago

              The changes were not merged into minds-pro-stable

              • Discussion 0
              • Commits 88
              • Pipelines 30
              • Changes 606+
              • Loading...
              • Emiliano Balbuena @edgebal added 2 commits 1 week ago

                added 2 commits

                • a23a1366 - (fix): Fix standalone vs Minds auth redir
                • 10dd32d2 - (chore): Workaround for incompatible routing techniques

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • 4e5d6aef - (chore): Owner/Standalone links

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • 598fed50 - (chore): AOT-compatible Pro routes

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                added 1 commit

                • c8067eb0 - (fix): don't show subtext in tiles

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                added 1 commit

                • 8844ac61 - (fix): remove donate component and its routes

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • 5200343a - (chore): Feedback

                Compare with previous version

              • Emiliano Balbuena @edgebal added 3 commits 1 week ago

                added 3 commits

                • 0692030d - (fix): Navbar skewed on Firefox
                • 7e0f76a3 - (feat): Homepage categories
                • 430dc28f - (chore): Revamp subscribe button

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                added 1 commit

                • ca14d23c - (refactor): Bigger tiles

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                added 1 commit

                • c29c1678 - (fix): correctly style search input

                Compare with previous version

              • Emiliano Balbuena @edgebal added 41 commits 2 days ago

                added 41 commits

                • ce8f950a - (fix): Boost marketing hero overlay correctly positioned
                • 99603881 - (fix): user's own avatar not blurry on newsfeed
                • 12fd31a8 - (chore): Stop tooltip cutoff on referrals dashboard on mobile
                • 0d69d125 - Sprint/KiltedKoala: Media modal
                • 13c6f471 - Merge branch 'feat/media-modal-1539' into 'master'
                • 4d4b5217 - (chore): update media modal page
                • 9c57ecf8 - Merge branch 'chore/referral-tooltip-cutoff-1552' into 'master'
                • c71e2be4 - Sprint/LuckyLizard: Changed ng test reporter for clearer output.
                • 7806119a - Merge branch 'chore/change-test-reporter-1745' into 'master'
                • c70ca1f0 - Merge branch 'fix/blurry-avatar-1746' into 'master'
                • 7ba536e1 - Sprint/LuckyLizard: Removed redirect on failed password reset.
                • 8f58bb2e - Merge branch 'fix/password-reset-725' into 'master'
                • 4a15081e - Merge branch 'fix/boost-mkting-overlay-1733' into 'master'
                • 0e26962a - Sprint/KiltedKoala: Fix/video pause on rotate #1418
                • e2eccb3a - Merge branch 'fix/video-pause-on-rotate-1418' into 'master'
                • 37ac7b64 - (rollback): Regression created where newsfeeds blow up - #1766 (closed)
                • ec161448 - (feat): sentry for angular
                • 2a24666e - (fix): do not throw error for missing entity, log in console
                • 50ef4b8a - (chore): reduce console log output from sockets
                • 90756b9e - (fix): indexOf null error when iterating over no blocked users
                • c4f8e4b0 - (chore): temporarily remove the 1y filter
                • 6a48c5b1 - (chore): use exact paths for source maps
                • d4461b15 - (fix): if no markers, do not iterate
                • 32c6b462 - Sprint/LuckyLizard: Play videos within activity if not canary
                • e5686249 - Merge branch 'fix/video-play-outside-canary-1761' into 'master'
                • 9035e762 - Revert "(fix): do not throw error for missing entity, log in console"
                • d0de483e - (fix): prevent blowup when XSRF token is now provided
                • c77f67f0 - Sprint/LuckyLizard: Mobile page redesign 1619
                • 357faf4a - Merge branch 'feat/mobile-redesign-1619' into 'master'
                • ba0b7d4d - (chore): Polyfill padStart on older browsers
                • 44d6df20 - (chore): Use local fontawesome 4.7
                • 5b8a296b - (chore): use yaml templates and introduce cleanup job for review sites
                • 30bd18e5 - Merge branch 'chore/improve-review-ci' into 'master'
                • 673e6d5f - Merge branch 'chore/local-fontawesome' into 'master'
                • ddbce043 - Merge branch 'fix/padstart-polyfill' into 'master'
                • c5af19bb - Sprint/LuckyLizard: Stop media modals in mobile
                • 07a087a5 - Merge branch 'fix/no-mobile-modal-1800' into 'master'
                • cb6d64cb - (fix): use correct service name with deployments
                • eccb8c13 - (chore): use pipeline id vs commit id
                • 5ed6e576 - Merge branch 'fix/use-pipeline-id-vs-commit' into 'master'
                • 6e709649 - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                Compare with previous version

                Toggle commit list
              • Emiliano Balbuena @edgebal added 1 commit 1 day ago

                added 1 commit

                • 342d9e3d - (wip): Modal service with root element

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 1 day ago

                added 1 commit

                • 5597f068 - (fix): styles should be below images for tiles

                Compare with previous version

              • Emiliano Balbuena @edgebal added 3 commits 1 day ago

                added 3 commits

                • 484be860 - (feat): Tile ratio settings
                • c50c926c - (feat): Multiline headline setting
                • aaa69902 - (refactor): Login/Register screen and multi-line headline

                Compare with previous version

              • Emiliano Balbuena @edgebal added 2 commits 1 day ago

                added 2 commits

                • 4ef18a69 - (feat): media modal for pro
                • d68bccd6 - Merge branch 'feat/media-modal-for-pro' into 'epic/minds-pro'

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 1 day ago

                added 1 commit

                • 70937b66 - (chore): Tile tweaks

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 1 day ago

                added 1 commit

                • 640d2ce0 - (fix): modals issues

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 23 hours ago

                added 1 commit

                • 2ee36af5 - (fix): blog tiles should open the modal. moved behaviour to the tile itself

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 23 hours ago

                added 1 commit

                • 7a86f2e5 - (feat): Destroy session server-side

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 22 hours ago

                added 1 commit

                • 54b11bef - (feat): Apply Pro tile ratio

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 22 hours ago

                added 1 commit

                • cb4d12d8 - (fix): Images should be fit to cover

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 21 hours ago

                added 1 commit

                • beede53c - (fix): Truncate titles to 2 lines

                Compare with previous version

              • Marcelo Rivera @eiennohi added 2 commits 21 hours ago

                added 2 commits

                • ca8eb460 - (fix): click on video tiles
                • da9f4630 - Merge branch 'epic/minds-pro' of https://gitlab.com/minds/front into epic/minds-pro

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 5 hours ago

                added 1 commit

                • af8f9600 - (refactor): Infinite modals

                Compare with previous version

              • Emiliano Balbuena @edgebal added 1 commit 5 hours ago

                added 1 commit

                • 2de08fc1 - (chore): Fix infinite loader; style tweaks

                Compare with previous version

              • Marcelo Rivera @eiennohi added 2 commits 3 hours ago

                added 2 commits

                • 8e4096b1 - (feat): media modal should support blogs
                • b7bcce4a - Merge branch 'epic/minds-pro' of https://gitlab.com/minds/front into epic/minds-pro

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 3 hours ago

                added 1 commit

                • 6b39b58b - (fix): removed clear search

                Compare with previous version

              • Marcelo Rivera @eiennohi added 1 commit 3 hours ago

                added 1 commit

                • 325b52f6 - (fix): brought back search, but remove parameters when clearing search

                Compare with previous version

              • Marcelo Rivera @eiennohi added 2 commits 1 hour ago

                added 2 commits

                • 4a3d0af6 - (fix): media modal blog route
                • eb5c7bd3 - (feat): redirect to respective entities' pages when on mobile

                Compare with previous version

              • Emiliano Balbuena @edgebal added 10 commits 10 minutes ago

                added 10 commits

                • b5425583 - (chore): increase canary to 12 hours
                • 60c33a5b - Sprint/LuckyLizard: Fixed tablet bug causing chat to jump offscreen on scroll #1477
                • 9f4057ca - Merge branch 'fix/tablet-group-chat-1477' into 'master'
                • 242b8b57 - Revert "Merge branch 'fix/tablet-group-chat-1477' into 'master'"
                • c32c2e25 - Merge branch 'revert-9f4057ca' into 'master'
                • 7af0e9d3 - (chore): introduce linting to frontend
                • d69d2bd0 - Merge branch 'chore/lint' into 'master'
                • 9976672d - (chore): Lint
                • 6c56d7cc - Merge remote-tracking branch 'origin/master' into epic/minds-pro
                • bb55de59 - (fix): Bad merge

                Compare with previous version

                Toggle commit list
              • Emiliano Balbuena @edgebal closed 9 minutes 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
              0
              Labels
              None
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              9
              9 participants
              user avatar
              Brian Hatchet
              user avatar
              Juan Manuel Solaro
              user avatar
              Guy Thouret
              user avatar
              Mark Harding
              user avatar
              Martin Santangelo
              user avatar
              Marcelo Rivera
              user avatar
              Olivia Madrid
              Reference: minds/front!507