Skip to content
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

Addition of timekeeping policy #1099

Merged
merged 24 commits into from
Apr 12, 2024
Merged

Addition of timekeeping policy #1099

merged 24 commits into from
Apr 12, 2024

Conversation

prasuna-m
Copy link
Contributor

@prasuna-m prasuna-m commented Apr 5, 2023

@prasuna-m prasuna-m requested a review from a team as a code owner April 5, 2023 18:27
@dmundra
Copy link
Collaborator

dmundra commented Apr 5, 2023

@prasuna-m thank you for creating this and it is looking good. Here is the preview of the page https://civicactions-handbook--1099.org.readthedocs.build/en/1099/company-policies/timekeeping-policies/

I do have following feedback:

  • Can you change the title of this pull request from 'Prasuna m patch 1' to something like 'Addition of timekeeping policy'?
  • Review the problems and suggestions in the 'File changes' tab. I think the use of headers could be adjusted. Definitely touch base with @ContentBrewmaster to work on the content. Also see https://squidfunk.github.io/mkdocs-material/reference/admonitions/ as an example to add a block around the policy date.
  • When you can also add the new page to .config/mkdocs.yml file to add the file to the navigation?

@prasuna-m prasuna-m changed the title Prasuna m patch 1 Addition of timekeeping policy Apr 5, 2023
@prasuna-m prasuna-m requested a review from a team as a code owner April 5, 2023 21:47
@prasuna-m
Copy link
Contributor Author

@dmundra, Thanks for your comments. I have made the changes you have suggested. Please review when you get a chance.

Btw, the Admonition block as mentioned in the link didn't work. So, I put the policy date in a table similar to the one that was used in the code-of-conduct.md page.

@dmundra
Copy link
Collaborator

dmundra commented Apr 6, 2023

@dmundra, Thanks for your comments. I have made the changes you have suggested. Please review when you get a chance.

Thank you @prasuna-m for fixing the header errors so that is looking good to me. I will approve but this will still need legal approval to be mergeable. Also differ to @ContentBrewmaster for content conversation.

Btw, the Admonition block as mentioned in the link didn't work. So, I put the policy date in a table similar to the one that was used in the code-of-conduct.md page.

Whoops that is my fault, admonition takes additional configuration. We can look at that later if the feature is desired.

Copy link
Collaborator

@dmundra dmundra left a comment

Choose a reason for hiding this comment

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

Approving the menu change and no merge blocking errors in the content. Differ to @marctjones and @ContentBrewmaster for content changes.

@ContentBrewmaster
Copy link
Contributor

ContentBrewmaster commented Apr 6, 2023

@dmundra I'm meeting with Prasuna and Montana this afternoon to review style considerations.

@ContentBrewmaster
Copy link
Contributor

Sent recommended edits to policy and new FAQ content to Marc and Elizabeth this morning for review.

@dmundra dmundra force-pushed the prasuna-m-patch-1 branch 2 times, most recently from e0cc141 to 86c1f96 Compare May 5, 2023 22:59
@dmundra dmundra force-pushed the prasuna-m-patch-1 branch from 86c1f96 to 7815f15 Compare May 11, 2023 16:22
@civicactionsbot civicactionsbot requested review from a team as code owners June 13, 2023 14:21
@ContentBrewmaster
Copy link
Contributor

This addition dependent on separate branch for new timekeeping guidance #1194

Copy link
Contributor

@ContentBrewmaster ContentBrewmaster left a comment

Choose a reason for hiding this comment

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

Pending decision to release policy and new timesheet guidance together.

@dmundra dmundra force-pushed the prasuna-m-patch-1 branch from ad1806f to 822aedb Compare June 13, 2023 22:16
@grugnog grugnog requested a review from marctjones October 5, 2023 19:45
@dmundra dmundra force-pushed the prasuna-m-patch-1 branch from be3ae3d to 54e9e2b Compare March 19, 2024 21:00
@prasuna-m prasuna-m requested a review from a team as a code owner March 25, 2024 15:02
@elizabethraley elizabethraley merged commit f5c8e77 into master Apr 12, 2024
10 of 11 checks passed
@elizabethraley elizabethraley deleted the prasuna-m-patch-1 branch April 12, 2024 21:44
@dmundra dmundra mentioned this pull request Jun 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants