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

Release Team Slots #5151

Merged
merged 150 commits into from
Aug 18, 2022
Merged

Release Team Slots #5151

merged 150 commits into from
Aug 18, 2022

Commits on Jun 22, 2022

  1. Add TeamSlots

    @gannetson
    gannetson committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    d9264e2 View commit details
    Browse the repository at this point in the history

  2. Hide delete button on subsequent tabs

    @gannetson
    gannetson committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    716f23c View commit details
    Browse the repository at this point in the history

  3. Tweak admin

    @gannetson
    gannetson committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    cfb5243 View commit details
    Browse the repository at this point in the history

  4. Improve admin and add migrations

    @gannetson
    gannetson committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    c6b450d View commit details
    Browse the repository at this point in the history

  5. Brush up serializers

    @gannetson
    gannetson committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    664ca3b View commit details
    Browse the repository at this point in the history

  6. More fixing of serializers

    @gannetson
    gannetson committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    0e97b6d View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. Only open teams

    @gannetson
    gannetson committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    0067133 View commit details
    Browse the repository at this point in the history

  2. Fix teams overview

    @gannetson
    gannetson committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    f234ba1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'hotfix/team-lists' into story/BB-20007-add-slot-to-peri… 

    …od-activity
    @gannetson
    gannetson committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    ac1ec93 View commit details
    Browse the repository at this point in the history

  4. Add duration

    @gannetson
    gannetson committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    a576c11 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2022

  1. Add tests for loading teams

    @gannetson
    gannetson committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    4cf3ef9 View commit details
    Browse the repository at this point in the history

  2. Add test for creating teamslot

    @gannetson
    gannetson committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    8ebd6ca View commit details
    Browse the repository at this point in the history

  3. Complete test

    @gannetson
    gannetson committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    6f1a1aa View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2022

  1. Fix trigger

    @gannetson
    gannetson committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    ecee68c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2022

  1. Fix some serializers and such

    @gannetson
    gannetson committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    db051a9 View commit details
    Browse the repository at this point in the history

  2. Add endpoint that allows filtering teams on slots

    @eodolphi
    eodolphi committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    5569242 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. Force current user in triggers... :-(

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    e871240 View commit details
    Browse the repository at this point in the history

  2. Fix more tests

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    f776ce0 View commit details
    Browse the repository at this point in the history

  3. include team slot in response

    @eodolphi
    eodolphi committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    9fe9df6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/story/BB-20007-add-slot-to-perio… 

    …d-activity' into story/BB-20007-add-slot-to-period-activity-load-teams
    @manuel-goodup
    manuel-goodup committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    b7b81a0 View commit details
    Browse the repository at this point in the history

  5. Fix accepting team

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    9804dd0 View commit details
    Browse the repository at this point in the history

  6. Last tests... pretty please...

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    1bc67de View commit details
    Browse the repository at this point in the history

  7. Make sure we do'n screw up participants

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    bfd0d80 View commit details
    Browse the repository at this point in the history

  8. Fix tests

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    8c192a5 View commit details
    Browse the repository at this point in the history

  9. Remove obsolete test

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    83d1a8d View commit details
    Browse the repository at this point in the history

  10. Fix serializer

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    f5cfd66 View commit details
    Browse the repository at this point in the history

  11. Fix some serializer/view for teams

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    6979cee View commit details
    Browse the repository at this point in the history

  12. Don't show unscheduled teams as past

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    83262fc View commit details
    Browse the repository at this point in the history

  13. Fix team filter

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    74e332d View commit details
    Browse the repository at this point in the history

  14. Fix permissions

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    8316148 View commit details
    Browse the repository at this point in the history

  15. Fix filter

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    506e7a5 View commit details
    Browse the repository at this point in the history

  16. Automatically set activity based on team

    @gannetson
    gannetson committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    6a7ebcb View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Add tests for filtering, add back teams link to activity

    @eodolphi
    eodolphi committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    0edf0d1 View commit details
    Browse the repository at this point in the history

  2. Add permissions in migration

    @eodolphi
    eodolphi committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    7939801 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Small tweak for TeamSlotSerializer

    @eodolphi
    eodolphi committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    f83e939 View commit details
    Browse the repository at this point in the history

  2. Fix filtering teams

    @gannetson
    gannetson committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    202dbcc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'story/BB-20007-add-slot-to-period-activity-load-teams' … 

    …of github.com:onepercentclub/bluebottle into story/BB-20007-add-slot-to-period-activity-load-teams
    @gannetson
    gannetson committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    d2ac7be View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2022

  1. Merge branch 'story/BB-20007-add-slot-to-period-activity' into releas… 

    …e/team-slots
    @gannetson
    gannetson committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    ef60568 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'hotfix/team-serializer-stuff' into release/team-slots

    @gannetson
    gannetson committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    1b01504 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'story/BB-20007-add-slot-to-period-activity-load-teams' … 

    …into release/team-slots
    @gannetson
    gannetson committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    4a45e8e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into merge/all-team-slot-branches

    @gannetson
    gannetson committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    3fac21a View commit details
    Browse the repository at this point in the history

  5. Fix permission

    @gannetson
    gannetson committed Jul 5, 2022
    Configuration menu
    Copy the full SHA
    81717b0 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2022

  1. Merge pull request #5149 from onepercentclub/merge/all-team-slot-bran… 

    …ches

Merge/all team slot branches
    @gannetson
    gannetson committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    7047386 View commit details
    Browse the repository at this point in the history

  2. Add specific team member serializer

    @gannetson
    gannetson committed Jul 6, 2022
    Configuration menu
    Copy the full SHA
    54730b5 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. Merge branch 'hotfix/keep-participants' into hotfix/team-member-seria… 

    …lizer-fix
    @gannetson
    gannetson committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    133f3f6 View commit details
    Browse the repository at this point in the history

  2. Add filter for teams in review

    @gannetson
    gannetson committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    d4db7ec View commit details
    Browse the repository at this point in the history

  3. Fix serializer

    @gannetson
    gannetson committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    faddf40 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. Remove unuseful check

    @gannetson
    gannetson committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    2c4525e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5154 from onepercentclub/hotfix/team-member-seria… 

    …lizer-fix

Add specific team member serializer
    @gannetson
    gannetson committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    f1611e2 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Show team activity label in activity list overview

    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    a841c37 View commit details
    Browse the repository at this point in the history

  2. Remove unused code

    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    4552b0a View commit details
    Browse the repository at this point in the history

  3. Add test

    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    635cd51 View commit details
    Browse the repository at this point in the history

  4. Clear obsolete migration

    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    84d6bc0 View commit details
    Browse the repository at this point in the history

  5. Clear more migrations

    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    2f89681 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5157 from onepercentclub/ticket/BB-20092-team-act… 

    …ivity-label

Show team activity label in activity list overview
    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    63b7d5a View commit details
    Browse the repository at this point in the history

  7. Try to omit migrations

    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    54c92bb View commit details
    Browse the repository at this point in the history

  8. Ignore

    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    284789e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #5158 from onepercentclub/hotfix/clean-up-and-cove… 

    …rage

Hotfix/clean up and coverage
    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    8a98169 View commit details
    Browse the repository at this point in the history

  10. Add message to team slot

    @gannetson
    gannetson committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    79f0301 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. Add tests

    @gannetson
    gannetson committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    1d8ea53 View commit details
    Browse the repository at this point in the history

  2. Add more triggers

    @gannetson
    gannetson committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    399f2cb View commit details
    Browse the repository at this point in the history

  3. Fix test import

    @gannetson
    gannetson committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    37abd2a View commit details
    Browse the repository at this point in the history

  4. Change team/slot status when date changes

    @gannetson
    gannetson committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    25ab335 View commit details
    Browse the repository at this point in the history

  5. Fix tests

    @gannetson
    gannetson committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    a8cc32f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5159 from onepercentclub/cleanup/skip-migrations 

    Cleanup/skip migrations
    @gannetson
    gannetson committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    ea65946 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2022

  1. Add is_complete prop to team

    @gannetson
    gannetson committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    a592dfd View commit details
    Browse the repository at this point in the history

  2. Make team changed trigger less greedy

    @gannetson
    gannetson committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    936ac36 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5165 from onepercentclub/story/BB-20225-change-te… 

    …am-status-when-date-changes

Story/bb 20225 change team status when date changes
    @gannetson
    gannetson committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    fd0f052 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5166 from onepercentclub/story/BB-20226-triggers-… 

    …for-team-member-status

Story/bb 20226 triggers for team member status
    @gannetson
    gannetson committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    1e97225 View commit details
    Browse the repository at this point in the history

  5. No activity on team member serializer

    @gannetson
    gannetson committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    f4d6e9e View commit details
    Browse the repository at this point in the history

  6. Fix tests

    @gannetson
    gannetson committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    f5a7fbc View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Fix some team related serializers

    @gannetson
    gannetson committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    13458b8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release/team-slots' into hotfix/… 

    …team-members-loop
    @gannetson
    gannetson committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    4f481a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2022

  1. Fix some views

    @gannetson
    gannetson committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    0741dc5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5167 from onepercentclub/hotfix/team-members-loop 

    No activity on team member serializer
    @gannetson
    gannetson committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    7f71518 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2022

  1. Add Teams sheet when activity is a team activity. 

    Also make it possible to override the XlS generation method in
ExportView
    @eodolphi
    eodolphi committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    9db5957 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. Fix duration in excel exports

    @eodolphi
    eodolphi committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    4783a1c View commit details
    Browse the repository at this point in the history

  2. Remove location from required fields for team slots

    @eodolphi
    eodolphi committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    11599eb View commit details
    Browse the repository at this point in the history

  3. Use normal validation for team slots

    @eodolphi
    eodolphi committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    f021d05 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. Merge branch 'master' into release/team-slots-merge-master-07-22

    @eodolphi
    eodolphi committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    d58d3fa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5171 from onepercentclub/feature/team-slot-valida… 

    …tion

Use normal validation for team slots
    @eodolphi
    eodolphi committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    5833378 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5173 from onepercentclub/release/team-slots-merge… 

    …-master-07-22

Release/team slots merge master 07 22
    @eodolphi
    eodolphi committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    5e52e17 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. Escape invalid chars for sheet names

    @gannetson
    gannetson committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    bd8b564 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. Merge pull request #5170 from onepercentclub/ticket/BB-20022-add-team… 

    …-sheet-in-export

Add Teams sheet when activity is a team activity.
    @gannetson
    gannetson committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    d519817 View commit details
    Browse the repository at this point in the history

  2. Tweak serializers

    @gannetson
    gannetson committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    09e1194 View commit details
    Browse the repository at this point in the history

  3. Another tweak

    @gannetson
    gannetson committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    80fde43 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'hotfix/team-serializer-optimisations' into release/team… 

    …-slots
    @gannetson
    gannetson committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    982201a View commit details
    Browse the repository at this point in the history

  5. Right json type

    @gannetson
    gannetson committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    4c3b826 View commit details
    Browse the repository at this point in the history

  6. Add right serializer for activity

    @gannetson
    gannetson committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    efc4d3d View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Fix tests

    @gannetson
    gannetson committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    aaafddb View commit details
    Browse the repository at this point in the history

  2. No unreviewed teams on unscheduled api response

    @gannetson
    gannetson committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    cfff264 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. Merge pull request #5174 from onepercentclub/hotfix/team-serializer-o… 

    …ptimisations

Tweak serializers
    @manuel-goodup
    manuel-goodup committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    ff68dd3 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. Add location to mycontributor slot

    @gannetson
    gannetson committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    d49c553 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release/team-slots' into hotfix/… 

    …team-filter
    @gannetson
    gannetson committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    5498974 View commit details
    Browse the repository at this point in the history

  3. Don't show cancelled adn withdrawn teams

    @gannetson
    gannetson committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    52d4911 View commit details
    Browse the repository at this point in the history

  4. Delete participants with team

    @gannetson
    gannetson committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    9e15e40 View commit details
    Browse the repository at this point in the history

  5. Don't notify act manager on team member withdrawal

    @gannetson
    gannetson committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    5d368ac View commit details
    Browse the repository at this point in the history

  6. Reject team when captain is rejected

    @gannetson
    gannetson committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    69643a2 View commit details
    Browse the repository at this point in the history

  7. Fix and extend tests

    @gannetson
    gannetson committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    10ede6c View commit details
    Browse the repository at this point in the history

  8. Fix test

    @gannetson
    gannetson committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    3515058 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Fix typo in test

    @gannetson
    gannetson committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    3deeefa View commit details
    Browse the repository at this point in the history

  2. Change email for team joined + test

    @gannetson
    gannetson committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    bfd6c10 View commit details
    Browse the repository at this point in the history

  3. Fix transitions around team withdrawal

    @gannetson
    gannetson committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    c3e0729 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. Fix test and get keepdb from settings

    @gannetson
    gannetson committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    18b4a7d View commit details
    Browse the repository at this point in the history

  2. Change settings

    @gannetson
    gannetson committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    72c123a View commit details
    Browse the repository at this point in the history

  3. Fix filter on status

    @eodolphi
    eodolphi committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    446c109 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5179 from onepercentclub/hotfix/BB-20347-add-loca… 

    …tion-to-my-slot

Add location to mycontributor slot
    @eodolphi
    eodolphi committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    ebf0a58 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #5180 from onepercentclub/hotfix/BB-20336-delete-p… 

    …articipants-with-team

Delete participants with team
    @eodolphi
    eodolphi committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    dbef69e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5182 from onepercentclub/hotfix/BB-20314-only-not… 

    …ify-team-captain

Hotfix/bb 20314 only notify team captain
    @eodolphi
    eodolphi committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    20b3331 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'release/team-slots' into hotfix/BB-20353-reject-team-wh… 

    …en-cpt-is-rejected
    @gannetson
    gannetson committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    43efdb6 View commit details
    Browse the repository at this point in the history

  8. Fix some triggers

    @gannetson
    gannetson committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    8a2303b View commit details
    Browse the repository at this point in the history

  9. Fix statusses differently

    @gannetson
    gannetson committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    8d6a16e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #5183 from onepercentclub/hotfix/BB-20353-reject-t… 

    …eam-when-cpt-is-rejected

Reject team when captain is rejected
    @gannetson
    gannetson committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    1d6d26f View commit details
    Browse the repository at this point in the history

  11. changed one email

    @Pieter-Rees
    Pieter-Rees committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    e771515 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #5184 from onepercentclub/hotfix/BB-20295-change-e… 

    …mail-content

Change email for team joined + test
    @gannetson
    gannetson committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    d72cc53 View commit details
    Browse the repository at this point in the history

  13. added team captain name and made the messages complete

    @Pieter-Rees
    Pieter-Rees committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    5a82ba3 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. Fix succeed flow

    @gannetson
    gannetson committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    95fa0f0 View commit details
    Browse the repository at this point in the history

  2. Fix tests

    @gannetson
    gannetson committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    d2fe15d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5175 from onepercentclub/hotfix/team-filter 

    Hotfix/team filter
    @gannetson
    gannetson committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    7224e8a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5187 from onepercentclub/hotfix/BB-20361-no-doubl… 

    …e-succeed-clicking

Fix succeed flow
    @gannetson
    gannetson committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    be3d3c6 View commit details
    Browse the repository at this point in the history

  5. Add tests for accept mails

    @gannetson
    gannetson committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    c18a0bb View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. Fix template

    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    60ad228 View commit details
    Browse the repository at this point in the history

  2. Fix team accepted message

    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    ed3f46a View commit details
    Browse the repository at this point in the history

  3. Close blocktrans block correctly

    @eodolphi
    eodolphi committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    8dba5c8 View commit details
    Browse the repository at this point in the history

  4. Also fix custom message for team reject

    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    3dc7d68 View commit details
    Browse the repository at this point in the history

  5. Fix test

    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    4a7ac13 View commit details
    Browse the repository at this point in the history

  6. Fix one more test

    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    108d351 View commit details
    Browse the repository at this point in the history

  7. Do not point team ical link to date activity slot ical url

    @eodolphi
    eodolphi committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    06b39c6 View commit details
    Browse the repository at this point in the history

  8. Fix test

    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    ab1cf3b View commit details
    Browse the repository at this point in the history

  9. More test to be fixed

    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    7aa41d1 View commit details
    Browse the repository at this point in the history

  10. Fix tests

    @eodolphi
    eodolphi committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    bfe6f7e View commit details
    Browse the repository at this point in the history

  11. Merge pull request #5189 from onepercentclub/bugfix/BB-20318-team-acc… 

    …ept-reject-mails

Bugfix/bb 20318 team accept reject mails
    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    bd50a53 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #5191 from onepercentclub/hotfix/team-ical-link 

    Do not point team ical link to date activity slot ical url
    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    4c70bff View commit details
    Browse the repository at this point in the history

  13. Merge pull request #5186 from onepercentclub/bugfix/BB-20315-email-copy 

    Bugfix/bb 20315 email copy
    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    9105a72 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #5193 from onepercentclub/master 

    Drin
    @gannetson
    gannetson committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    61e125f View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. Merge pull request #5195 from onepercentclub/master 

    Master in release
    @gannetson
    gannetson committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    3f865d5 View commit details
    Browse the repository at this point in the history

  2. Succeed team members + tests

    @gannetson
    gannetson committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    e9fa27f View commit details
    Browse the repository at this point in the history

  3. Fix tests

    @gannetson
    gannetson committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    f9a47d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. Merge pull request #5196 from onepercentclub/bugfix/add-transitions 

    Succeed team members + tests
    @gannetson
    gannetson committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    c5e106e View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. Fix mails for joining a team

    @gannetson
    gannetson committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    773bd23 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. Fix more emails and triggers

    @gannetson
    gannetson committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    fae79e3 View commit details
    Browse the repository at this point in the history

  2. Re-add teams field in serializer. This fixes the info block for team … 

    …activities
    @eodolphi
    eodolphi committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    febba5c View commit details
    Browse the repository at this point in the history

  3. Change time slot mail

    @gannetson
    gannetson committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    27624d8 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/release/team-slots' into bugfix/… 

    …BB-20459-style-email
    @gannetson
    gannetson committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    767b1ba View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Fix trigger

    @gannetson
    gannetson committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    a8f01a8 View commit details
    Browse the repository at this point in the history

  2. Fix more tests

    @gannetson
    gannetson committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    4cee191 View commit details
    Browse the repository at this point in the history

  3. Fix more messages and tests

    @gannetson
    gannetson committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    7e6efb4 View commit details
    Browse the repository at this point in the history

  4. Fix some mails

    @gannetson
    gannetson committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    e6884eb View commit details
    Browse the repository at this point in the history

  5. Merge branch 'bugfix/BB-20459-style-email' into bugfix/BB-20448-join-… 

    …team-mails
    @gannetson
    gannetson committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    21e02cf View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5200 from onepercentclub/bugfix/BB-20448-join-tea… 

    …m-mails

Fix mails for joining a team
    @gannetson
    gannetson committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    aac6f8f View commit details
    Browse the repository at this point in the history