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 863
    • Issues 863
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 51
    • Merge Requests 51
  • 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
  • !494

Open
Opened 1 week ago by Juan Manuel Solaro@juanmsolaro
  • Report abuse
Report abuse

WIP: epic/post-scheduler

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/post-scheduler origin/epic/post-scheduler

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff epic/post-scheduler

Step 4. Push the result of the merge to GitLab

git push origin master

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/post-scheduler into master
The source branch is 39 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #77399519 passed with warnings for 8aa592f5 on epic/post-scheduler
            Requires 2 more approvals from Devs and Deployers.
            Brian Hatchet
            Brian Hatchet
            Martin Santangelo
            Martin Santangelo
            Mark Harding
            Mark Harding
            Emiliano Balbuena
            Emiliano Balbuena
            Olivia Madrid
            Olivia Madrid
            There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally
            You can merge this merge request manually using the
            • Discussion 13
            • Commits 8
            • Pipelines 8
            • Changes 19
            10/13 threads resolved
            • Loading...
            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 week ago

              added 1 commit

              • 3d3b9987 - (feat) add tooltip to show date

              Compare with previous version

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

              added 1 commit

              • 79d4c893 - (feat) add custom time when posting, creating and editing blog and when editing activity

              Compare with previous version

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

              added 1 commit

              • 032af961 - (fix) change property name and add mock component to spec tests

              Compare with previous version

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

              added 1 commit

              • 01a4158c - (fix) change format of time created property

              Compare with previous version

            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Emiliano Balbuena
              Emiliano Balbuena @edgebal started a thread on an old version of the diff 4 days ago
              Resolved by Juan Manuel Solaro 1 day ago
            • Juan Manuel Solaro @juanmsolaro added 1 commit 1 day ago

              added 1 commit

              • ff0c90e4 - (fix) adapt code to reviews

              Compare with previous version

            • Juan Manuel Solaro @juanmsolaro resolved all threads 1 day ago

              resolved all threads

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

              added 1 commit

              • 4c47ed6c - (feat) add view and styles for scheduled activities count

              Compare with previous version

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

              added 1 commit

              • 8aa592f5 - (feat) filter activities by time_created to get scheduled

              Compare with previous version

            • Mark Harding
              Mark Harding @markeharding started a thread on the diff just now
              src/app/common/components/poster-date-selector/poster-date-selector.component.ts
              1 import { Component, EventEmitter, Input, Output } from '@angular/core';
              2 import { DatePipe } from '@angular/common';
              3
              4 @Component({
              5 moduleId: module.id,
              6 selector: 'm-poster-date-selector',
              7 template: `
              8 <div class="m-poster-date-selector--input" [class.selected]="hasDateSelected()" mdl-datetime-picker [date]="date" (dateChange)="onDateChange($event)">
              • Mark Harding
                Mark Harding @markeharding · just now
                Owner

                Lets move to .html file

              • Please register or sign in to reply
            • Mark Harding
              Mark Harding @markeharding started a thread on the diff just now
              src/app/common/components/sort-selector/sort-selector.component.scss
              1 1 m-sort-selector {
              2 display: flex;
              • Mark Harding
                Mark Harding @markeharding · just now
                Owner

                Why are we removing this?

              • Please register or sign in to reply
            • Mark Harding
              Mark Harding @markeharding started a thread on the diff just now
              src/app/modules/blogs/blog.scss
              301 301
              302 302 m-wire-threshold-input {
              303 303 position: relative;
              304 padding: 8px;
              • Mark Harding
                Mark Harding @markeharding · just now
                Owner

                this doesn't look related to post scheduler?

              • Please register or sign in to reply
            • 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
            0 Assignees
            None
            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
            Martin Santangelo
            user avatar
            Mark Harding
            user avatar
            Emiliano Balbuena
            user avatar
            Olivia Madrid
            user avatar
            Guy Thouret
            user avatar
            Ben Hayward
            Reference: minds/front!494