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

Merge hotfix 2.6.3 develop #1868

Merged
merged 36 commits into from
Oct 24, 2023

Conversation

MarkLark86
Copy link
Collaborator

No description provided.

marwoodandrew and others added 30 commits March 17, 2023 08:37
…uperdesk#1772)

* ui: PlanningAPI updates

* api: Add priority to ContentProfiles

* ui: Add priority to ContentProfiles

* api/ui: Add priority to search

* ui: Default values

* ui: fix unit tests

* api: Add behave tests for search

* fix: Getting profiles by ID not working when using system default profiles
* change limit when calling onclusive api

use 1000 instead of 100 to do less pagination,
also fetch some extra items to avoid possible gaps.

SDCP-684
* fix date filtering for all day events

when making a query also do a query for all_day events
using only date part of the given date, but it must be
first converted to local time using client timezone so
it will the date user sees in the UI.

also tweak the way the all_day events are assigned to
dates in the UI based on newsroom code.

SDCP-682
- keep timestamp for next run based on current start
- look for timezone not only using name but also offset
- increase buffer when getting updates (not clear if the timestamps
  should be utc or local, so add some extra time
- for events with no end time set it to start time and not some fake
  end time which might make it go visible on a next day

SDCP-688 SDCP-690
mostly related to events with `no_end_time` flag
which have same end timestamp as start one.

SDCP-680
when the event started during the hour when there was daylight
savings switch for a timezone, so rather work with utc date.

SDCP-688
* fix event date not visible in preview

that was the case for events with no end time
and same timezone as local one for user.

SDCP-690

* add missing end date for multi day events with no end time
… location info [SDCP-692] (superdesk#1794)

* fix : Some events ingested from Onclusive do not contain the complete location info [SDCP-692]

* update testcases

* parse location.location field

* fix black

* update logic
those are currently using London timezone, not utc.
so it's consistent with manually created events

SDCP-696
use `/date` api instead of `/between`
and log imported events into a text file so we can
check that if needed.

SDCP-699
…y posted (superdesk#1802)

Multiple posts will still occur if a Calendar or Agenda is to be added in the ingest rule (due to the separation of ingest, and executing routing rules)
* fix server requirements

* fix e2e core server version
…erdesk#1816)

* fix(api): Allow dates.tz to have a null value

* Add tests
so we can check logs in case some event is missing

CPCN-380
@MarkLark86 MarkLark86 requested a review from petrjasek October 20, 2023 04:07
@MarkLark86
Copy link
Collaborator Author

@petrjasek The only thing I'm not 100% sure about is the onclusive ingest, and the group dates (front end). Could you double check those please. Everything else seemed straightforward

@petrjasek
Copy link
Member

checked those, looks good

@MarkLark86 MarkLark86 merged commit b4b6421 into superdesk:develop Oct 24, 2023
14 checks passed
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.

5 participants