Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Maják
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

dfcc96c6

Commit dfcc96c6 authored 1 year ago by Tomáš Valenta

Downloads
- Plain Diff

resolve conflict

parents 3bae4aac 1a4d0953

No related branches found

No related tags found

2 merge requests!787Release,!749Add personal calendars, move from requests-cache to Django cache

Pipeline #12339 failed 1 year ago

Stage: build

Changes 13
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 0 additions, 6 deletions

.gitignore
.isort.cfg 1 addition, 1 deletion

.isort.cfg
calendar_utils/migrations/0004_auto_20220505_1228.py 1 addition, 1 deletion

calendar_utils/migrations/0004_auto_20220505_1228.py
calendar_utils/models.py 1 addition, 1 deletion

calendar_utils/models.py
calendar_utils/parser.py 1 addition, 1 deletion

calendar_utils/parser.py
district/migrations/0109_districtpersonpage_ical_calendar_url.py 10 additions, 5 deletions

...t/migrations/0109_districtpersonpage_ical_calendar_url.py
instagram_cache.sqlite 0 additions, 0 deletions

instagram_cache.sqlite
requirements/base.in 1 addition, 1 deletion

requirements/base.in
requirements/base.txt 11 additions, 13 deletions

requirements/base.txt
requirements/dev.txt 1 addition, 1 deletion

requirements/dev.txt
shared/models.py 1 addition, 1 deletion

shared/models.py
tests/calendar_utils/conftest.py 1 addition, 1 deletion

tests/calendar_utils/conftest.py
tests/calendar_utils/test_parser.py 2 additions, 4 deletions

tests/calendar_utils/test_parser.py

with 31 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Pirátský GitLab - Home of the CopyLeft