Merge remote-tracking branch 'origin/master' into fix/433 (4987d738) · Commits · SMASCH / scheduling-system · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

scheduling-system
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- External wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

4987d738

Commit 4987d738 authored 3 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into fix/433

parents 66adca2e 0d088106

No related branches found

Tags v1.1.1

1 merge request!332fix #433 Search form should always redirect to web.views.kit_requests

Pipeline #45574 passed 3 years ago

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 18 additions, 14 deletions

CHANGELOG
smash/web/api_views/daily_planning.py 14 additions, 3 deletions

smash/web/api_views/daily_planning.py
smash/web/static/js/daily_planning.js 1 addition, 0 deletions

smash/web/static/js/daily_planning.js
smash/web/templates/doctors/add_holiday.html 15 additions, 1 deletion

smash/web/templates/doctors/add_holiday.html
smash/web/tests/api_views/test_daily_planning.py 46 additions, 3 deletions

smash/web/tests/api_views/test_daily_planning.py

with 94 additions and 21 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