Skip to content

Adding catalog numbers to a series #1392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

bahoss
Copy link
Contributor

@bahoss bahoss commented May 13, 2020

Fixes #1341

@bahoss bahoss requested a review from php-coder as a code owner May 13, 2020 12:42
@mystamps-bot
Copy link

mystamps-bot commented May 13, 2020

1 Message
📖 @bahoss thank you for the PR! All quality checks have been passed! Next step is to wait when @php-coder will review this code

Generated by 🚫 Danger

Copy link
Owner

@php-coder php-coder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few minor comments.

@bahoss bahoss force-pushed the adding-catalog-numbers-to-a-series branch 2 times, most recently from 95886c0 to f323ddc Compare May 19, 2020 07:17
@@ -32,7 +32,7 @@
public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";

// MUST be updated when any of our resources were modified
public static final String RESOURCES_VERSION = "v0.4.3.2";
public static final String RESOURCES_VERSION = "v0.4.3.4";
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means that you have to rebase your branch on top of master.

  1. sync master with php-coder/master
$ git checkout master
$ git fetch upstream
$ git merge upstream/master
$ git push
  1. do rebase
$ git rebase master adding-catalog-numbers-to-a-series
$ git push -f

If you encounter any errors, post them here.

@bahoss bahoss force-pushed the adding-catalog-numbers-to-a-series branch 3 times, most recently from 357291e to cbcd61d Compare May 20, 2020 19:47
public static final String RESOURCES_VERSION = "v0.4.3.3";
=======
public static final String RESOURCES_VERSION = "v0.4.3.4";
>>>>>>> task: implement AddCatalogNumbersForm
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, you forgot to remove fragments after a conflict. Please, edit this file and just change v0.4.3.3 to v0.4.3.4

public static final String RESOURCES_VERSION = "v0.4.3.3";
=======
public static final String RESOURCES_VERSION = "v0.4.3.4";
>>>>>>> task: implement AddCatalogNumbersForm

// CheckStyle: ignore LineLength for next 14 lines
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you and another line, this comment should be updated to ignore 15 lines.

@bahoss bahoss force-pushed the adding-catalog-numbers-to-a-series branch from cbcd61d to 487ef61 Compare May 21, 2020 06:34
Copy link
Owner

@php-coder php-coder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't look on it deeply yet but the tests have been passed, I don't see anything that should be fixed. The markup will be modified anyway later. So, it's LGTM!

Thank you! :shipit:

@php-coder php-coder merged commit 487ef61 into php-coder:master May 21, 2020
@php-coder
Copy link
Owner

php-coder commented May 21, 2020

@bahoss Great work! Thank you for your patience! I've added your contribution to https://github.com/php-coder/mystamps/wiki/team-members and I can congratulate you with 5 merged PRs!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add UI for adding catalog numbers to a series
3 participants