Skip to content

Commit

Permalink
Merge branch 'master' into fix_ocado_links
Browse files Browse the repository at this point in the history
  • Loading branch information
faucomte97 authored Sep 30, 2024
2 parents 9ac53e6 + 84c327f commit 3f6cc35
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,10 @@ If applicable, add screenshots to help explain your problem.
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Good Places to Start**

_Link to a specific directory / file / line that would be a good place to
start working on this task. The more specific the better._

**Additional context**
Add any other context about the problem here.
7 changes: 5 additions & 2 deletions .github/ISSUE_TEMPLATE/new_task.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ about: A template for a new task

## Task Description



## Acceptance Criteria
- [ ] ...
- [ ] ...

## Good Places to Start

_Link to a specific directory / file / line that would be a good place to
start working on this task. The more specific the better._

### Analytics Requirements
- [ ] ...

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.25 on 2024-09-27 16:04

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('common', '0054_delete_aimmo_models'),
]

operations = [
migrations.AlterField(
model_name='schoolteacherinvitation',
name='token',
field=models.CharField(max_length=88),
),
]
2 changes: 1 addition & 1 deletion cfl_common/common/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def get_queryset(self):


class SchoolTeacherInvitation(models.Model):
token = models.CharField(max_length=32)
token = models.CharField(max_length=88)
school = models.ForeignKey(
School,
related_name="teacher_invitations",
Expand Down
2 changes: 1 addition & 1 deletion portal/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "7.3.4"
__version__ = "7.3.5"

0 comments on commit 3f6cc35

Please sign in to comment.