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 864
    • Issues 864
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 46
    • Merge Requests 46
  • 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
  • !459

Merged
Opened 2 weeks ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

WIP: (feat): Minds Pro (development branch)

Edited 1 day ago by Emiliano Balbuena

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 #75237120 passed for 07925b33 on epic/minds-pro
          Requires 2 more approvals from Devs and Deployers.
          Marcelo Rivera
          Marcelo Rivera
          Martin Santangelo
          Martin Santangelo
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Ben Hayward
          Ben Hayward

          Merged by Emiliano Balbuena 3 hours ago

          The changes were merged into minds-pro-stable with 07925b33

          Pipeline #75238872 passed for 07925b33 on minds-pro-stable
                  • Discussion 0
                  • Commits 11
                  • Pipelines 76
                  • Changes 16
                  • Loading...
                  • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                    added 1 commit

                    • 575782fe - (wip): Pro Subscription component

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 2 weeks ago

                    added 1 commit

                    • f75490da - (feat): Show newsfeed banner

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 2f56ef5f - (feat): pro channel page

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • d596bad0 - (wip): Load channel and content tiles

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 2 commits 1 week ago

                    added 2 commits

                    • cec64bf7 - (chore): Unwanted change
                    • 74d12411 - (wip): Smarter list

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • 8a0715ea - (wip): Pro channel

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • b56aeedb - (wip): Donate placeholder

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 357f9802 - (feat): media & blog tile

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 8d48e842 - (feat): media & blog tile

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 3 commits 1 week ago

                    added 3 commits

                    • 13685d2f - (fix): styling issues for See More when it's the second element
                    • a2154205 - (fix): hide feeds link for now
                    • fee7b64b - (feat): groups tile

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 0eb81114 - (fix): AOT issue

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • b285e84a - (feat): custom styling

                    Compare with previous version

                  • Emiliano Balbuena @edgebal assigned to @edgebal 1 week ago

                    assigned to @edgebal

                  • Emiliano Balbuena @edgebal added Product::Pro Squad::Yellow scoped labels 1 week ago

                    added Product::Pro Squad::Yellow scoped labels

                  • Emiliano Balbuena @edgebal added 1 commit 1 week ago

                    added 1 commit

                    • 4238b53f - (wip): Pro settings; style tweaks

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 2627066f - (feat): add background color

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 3 commits 1 week ago

                    added 3 commits

                    • ff1cac4b - (feat) hamburguer menu and signup styling
                    • 3114e437 - (feat) show a prompt if feed is empty
                    • d69985bb - (feat) no feed prompt when feeds are empty

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 3 commits 1 week ago

                    added 3 commits

                    • 050dad42 - (feat) hamburguer menu and signup styling
                    • f6c99f2b - (feat) show a prompt if feed is empty
                    • ea86543f - (chore): No content message

                    Compare with previous version

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

                    added 1 commit

                    • 1d37ca04 - (feat) see more and empty feed will not appear at the same time

                    Compare with previous version

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

                    added 1 commit

                    • 8598213b - (feat) styling for searchbar

                    Compare with previous version

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

                    added 1 commit

                    • 50b35ede - (feat) refine styles for tiles component

                    Compare with previous version

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

                    added 1 commit

                    • 7ed2ae0e - Top bar logo should nav to Pro root

                    Compare with previous version

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

                    added 1 commit

                    • 2931f0b8 - (fix) view on minds should correctly take to channel

                    Compare with previous version

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

                    added 1 commit

                    • 6962a892 - (feat) Link logged in avatar to minds.com user's profile

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 2 commits 1 week ago

                    added 2 commits

                    • bc2bfed2 - (feat): responsive list
                    • 19edd43a - (feat): return see more to the list, moved subscription to component

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • 70352c30 - (feat): see more needs to have a min height when it's the only one in the line

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 7 commits 1 week ago

                    added 7 commits

                    • 50b35ede - (feat) refine styles for tiles component
                    • 7ed2ae0e - Top bar logo should nav to Pro root
                    • 2931f0b8 - (fix) view on minds should correctly take to channel
                    • 6962a892 - (feat) Link logged in avatar to minds.com user's profile
                    • 8907968c - Merge branch 'epic/minds-pro' of https://gitlab.com/Minds/front into epic/minds-pro
                    • 44f9bd9e - Merge branch 'epic/minds-pro' of https://gitlab.com/Minds/front into epic/minds-pro
                    • 576ddb35 - (feat) styles with settings variables

                    Compare with previous version

                    Toggle commit list
                  • Marcelo Rivera @eiennohi added 2 commits 1 week ago

                    added 2 commits

                    • 1db23dd3 - (fix): reformatted styles
                    • 1dd01ea1 - (feat): signup headline should come from backend

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 2 commits 1 week ago

                    added 2 commits

                    • 1e1fa82a - (feat): collapse nav items and show inside hamburguer menu
                    • 69b8e283 - (fix): correct h1 style for donate screen

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 week ago

                    added 1 commit

                    • ac29029a - (fix): better padding for topbar

                    Compare with previous version

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

                    added 1 commit

                    • 6b4aef46 - (feat) Hot/Top/Latest selector for content

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 30 commits 1 week ago

                    added 30 commits

                    • 6b4aef46...1da91eb3 - 29 commits from branch master
                    • 2372bfbe - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                    Compare with previous version

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

                    added 1 commit

                    • 27d976b3 - fix) use excerpt for tiles subtext when the entity is a blog

                    Compare with previous version

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

                    added 1 commit

                    • b9544544 - (fix) use class getter instead of protected property to get username

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 6 days ago

                    added 1 commit

                    • 71d19ae8 - (feat) implement footer

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 6 days ago

                    added 1 commit

                    • af0b4e55 - (feat): feeds

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 6 days ago

                    added 1 commit

                    • 5421183a - (fix): moved algorithm to a queryParam

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 6 days ago

                    added 1 commit

                    • 4cea763a - (fix): moved algorithm to a queryParam

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 6 days ago

                    added 1 commit

                    • 4dc1b9ee - (fix): moved algorithm to a queryParam

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 6 days ago

                    added 1 commit

                    • d1a0aad3 - (feat): donate screen

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 6 days ago

                    added 1 commit

                    • 64dc813e - (fix): hidden feeds for now

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                    added 1 commit

                    • d3790189 - (feat): Footer settings

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                    added 1 commit

                    • 7eaba2e0 - (feat): Logo GUID setting field

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 6 days ago

                    added 1 commit

                    • 775befda - (fix): group tiles should expand

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 6 days ago

                    added 1 commit

                    • 98504306 - (chore): Style tweak; comment out algo selector

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 6 commits 6 days ago

                    added 6 commits

                    • 98504306...b2d8c141 - 5 commits from branch master
                    • cda6282c - Merge remote-tracking branch 'origin/master' into epic/minds-pro

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 2 commits 5 days ago

                    added 2 commits

                    • 3d677a02 - (fix): fixed algorithm in navbar links
                    • 94a13843 - (fix): list redirect

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 5 days ago

                    added 1 commit

                    • 83040178 - (feat) ability to search in feeds

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 2 days ago

                    added 1 commit

                    • b269fe66 - (feat) add clear search button

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 2 days ago

                    added 1 commit

                    • 698e92a6 - (chore) disable algorithm functionality

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 2 days ago

                    added 1 commit

                    • 03d2e294 - (feat): footer

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 2 days ago

                    added 1 commit

                    • cb24152a - (fix): footer elements should wrap

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 2 days ago

                    added 1 commit

                    • b80396da - (chore) remove outline from active logo link

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 2 days ago

                    added 1 commit

                    • 172d7204 - (chore) Remove tile bottom border

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 2 days ago

                    added 1 commit

                    • da9dd1e5 - (chore) Narrow tiles

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 2 days ago

                    added 1 commit

                    • 621496c3 - (fix) "See More" will be displayed only if there is more content

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 2 days ago

                    added 1 commit

                    • 5230e5d6 - (feat): modal for Emi

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 2 days ago

                    added 1 commit

                    • a024e0b1 - (fix): send entity

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 2 days ago

                    added 1 commit

                    • 535395df - (fix): send entity

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 2 days ago

                    added 1 commit

                    • 68383004 - (fix): send entity

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 2 days ago

                    added 1 commit

                    • 01e94fd6 - (feat): placeholder media modal

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 day ago

                    added 1 commit

                    • 84892778 - (wip): See more feed list

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 day ago

                    added 1 commit

                    • dc7d1f70 - (fix): Feeds service getters

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 3 commits 1 day ago

                    added 3 commits

                    • fdc50f77 - (fix): Media modal prototype loader and title
                    • 6af26f2c - (chore): See more styling
                    • 487a9ad3 - (chore): Narrow footer

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 1 day ago

                    added 1 commit

                    • dd17b1a8 - (fix): Feed fixes

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 2 commits 1 day ago

                    added 2 commits

                    • 443374c9 - (fix): further decrease tile height (except first two)
                    • d20d7ed4 - (feat): open blogs in new tab on click

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 2 commits 1 day ago

                    added 2 commits

                    • ec1cd6a4 - [Sprint/KiltedKoala] (fix): see more tile sometimes appears when it shouldn't
                    • 790cce4b - Merge branch 'fix/see-more-tile-issue' into 'epic/minds-pro'

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 1 commit 1 day ago

                    added 1 commit

                    • 2e410a3f - (fix): styles for tiles

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 2 commits 1 day ago

                    added 2 commits

                    • 05827b04 - (feat) add social icons and text to footer
                    • 056abd51 - Merge branch 'footer-social-icons-and-text' into 'epic/minds-pro'

                    Compare with previous version

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

                    added 1 commit

                    • 0889ccd9 - (feat) set window title for pro settings and pro channel

                    Compare with previous version

                  • Emiliano Balbuena @edgebal changed title from WIP: (feat): Minds Pro to WIP: (feat): Minds Pro (development branch) 1 day ago

                    changed title from WIP: (feat): Minds Pro to WIP: (feat): Minds Pro (development branch)

                  • Emiliano Balbuena @edgebal changed target branch from master to minds-pro-stable 1 day ago

                    changed target branch from master to minds-pro-stable

                  • Emiliano Balbuena @edgebal added 1 commit 1 day ago

                    added 1 commit

                    • 097f990a - (chore): In-call feedback

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 19 hours ago

                    added 1 commit

                    • c4249f31 - (feat): Tag list

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 2 commits 9 hours ago

                    added 2 commits

                    • 7100b349 - (feat): click behaviour for list modal
                    • 3d87b567 - (feat): style see more modal

                    Compare with previous version

                  • Marcelo Rivera @eiennohi added 2 commits 8 hours ago

                    added 2 commits

                    • a19b3758 - (feat): style media modal
                    • b8b013ac - (fix): title

                    Compare with previous version

                  • Juan Manuel Solaro @juanmsolaro added 1 commit 6 hours ago

                    added 1 commit

                    • c3cc56c3 - (chore) Remove user avatar, login/signup and hamburger menu from pro top bar

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 2 commits 3 hours ago

                    added 2 commits

                    • 091acaf8 - (feat): Color scheme settings
                    • 7be57ec0 - (feat): Apply dark or light color scheme, regardless of the global

                    Compare with previous version

                  • Emiliano Balbuena @edgebal added 1 commit 3 hours ago

                    added 1 commit

                    • 07925b33 - (fix): Search box styling

                    Compare with previous version

                  • Emiliano Balbuena @edgebal merged 3 hours ago

                    merged

                  • 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
                  7
                  7 participants
                  user avatar
                  Marcelo Rivera
                  user avatar
                  Martin Santangelo
                  user avatar
                  Mark Harding
                  user avatar
                  Brian Hatchet
                  user avatar
                  Ben Hayward
                  user avatar
                  Emiliano Balbuena
                  user avatar
                  Juan Manuel Solaro
                  Reference: minds/front!459

                  Revert this commit

                  This will create a new commit in order to revert the existing changes.

                  Switch branch
                  Cancel
                  A new branch will be created in your fork and a new merge request will be started.

                  Cherry-pick this commit

                  Switch branch
                  Cancel
                  A new branch will be created in your fork and a new merge request will be started.