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.

Sign up for GitHub

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

Jump to bottom

merge develop into main #42

Merged
merged 2 commits into from
Jul 22, 2024
Merged

merge develop into main #42

merged 2 commits into from
Jul 22, 2024

Conversation

stefanvit
Copy link
Collaborator

Description

Please provide a summary of the pull request and the issue it resolves. Please add necessary details, context, dependencies, explanation of when review is needed (see next section), etc.

Resolves #(add issue number here and remove parentheses)

Review Time Estimate

Please give your idea of how soon this pull request needs to be reviewed by selecting one of the options below. This can be based on the criticality of the issue at hand and/or other relevant factors.

  • Immediately
  • Within a week
  • When possible

Type of changes

Please select a relevant option:

  • Bug fix (non-breaking change which fixes an issue).
  • New feature (non-breaking change which adds functionality).
  • Breaking change (fix or feature that would cause existing functionality to not work as expected).
  • Other (any another change that does not fall in one of the above categories.)

Checklist:

Please select all applicable options:

  • I have signed the Rokwire Contributor License Agreement (CLA). (Any contributor who is not an employee of the University of Illinois whose official duties include contributing to the Rokwire software, or who is not paid by the Rokwire project, needs to sign the CLA before their contribution can be accepted.)
  • I have updated the CHANGELOG.
  • I have read the Contributor Guidelines.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • My change requires updating the documentation.
  • I have made necessary changes to the documentation.
  • I have added tests related to my changes.
  • My changes generate no new warnings.
  • New and existing unit tests pass locally with my changes.
  • Any dependent changes have been merged and published in downstream modules.

stefanvit and others added 2 commits July 22, 2024 14:49
@stefanvit
[ID-38]Start/end date (#41)
24ff6f2 
* set the Changelog.md

* set start_date and end_date fields if they are missing

* set the docs

* remove unused code

* make start_date and end_date int in the model

* set start_date and end date

* add start_date and end_date to updateSurvey

* set the POST /surveys

* fix PUT admin/surveys

* time filter for survey

* set request as not required

* add filter for start_date and end_date filter for GET surveys

* mockery

* set request body as nullable

* fix filter

* fix app and org id filter

---------

Co-authored-by: Stefan Vitanov <[email protected]>
update the version to 1.5.0
b3fbd86
@stefanvit stefanvit requested a review from shurwit as a code owner July 22, 2024 11:51
@stefanvit stefanvit merged commit 3ac7a3c into main Jul 22, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shurwit shurwit Awaiting requested review from shurwit shurwit is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@stefanvit