Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
gajim
gajim
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 194
    • Issues 194
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 20
    • Merge Requests 20
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • gajim
  • gajimgajim
  • Merge Requests
  • !701

Open
Opened Sep 20, 2020 by Daniel Brötzmann@wurstsalatDeveloper
  • Report abuse
Report abuse

Check out, review, and merge locally

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

git fetch "https://dev.gajim.org/wurstsalat/gajim.git" "groupchat-manage"
git checkout -b "wurstsalat/gajim-groupchat-manage" FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout "master"
git merge --no-ff "wurstsalat/gajim-groupchat-manage"

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.

WIP: GroupChatControl: Add management and avatar selector pages

  • Overview 0
  • Commits 2
  • Pipelines 8
  • Changes 3

This adds a management page and an avatar selector page to the GroupchatControl.

Manage page:

  • select avatar
  • name and description
  • change subject
  • advanced config
  • destroy chat

Avatar selector page:

  • new AvatarSelector widget for avatar cropping

What needs to be done: set name and description when saving

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: gajim/gajim!701
Source branch: groupchat-manage