Code

6.2.0#182

Code

Merged

somewes merged 27 commits intomasterambitioninc/django-entity:masterfrom developambitioninc/django-entity:developCopy head branch name to clipboardOct 31, 2023

+310-24

Commits

Commits on Aug 29, 2023

• intersection memberships

  somewes

  committed
  b2843d7

Commits on Aug 30, 2023

• proof of concept

  somewes

  committed
  ae1d4bf

Commits on Sep 19, 2023

• import validation error

  

  Kris Plunkett

  committed
  0c66781

Commits on Sep 20, 2023

• Add docker setup and docs for local development

  

  Kris Plunkett

  committed
  ae0ffcc

Commits on Sep 21, 2023

• add sort order to entity group membership and update migration order

  

  Kris Plunkett

  committed
  3b8d9d7

• use one migration and fix the db

  

  Kris Plunkett

  committed
  9f40ecf

• more local dev edits

  

  Kris Plunkett

  committed
  9860fd3

• undo local dev stuff

  

  Kris Plunkett

  committed
  4d72cf4

Commits on Sep 22, 2023

• Merge pull request #176 from somewes/feature/membership-types

  Show description for 08b08ba
  

  Kris Plunkett

  authored
  08b08ba

• undo local migration rename

  

  Kris Plunkett

  committed
  ce31472

• Merge pull request #178 from kjplunkett/feature/membership-types_entity_group_model_changes

  Show description for 9d96e4a
  somewes

  authored
  9d96e4a

Commits on Sep 26, 2023

• rework full set ids

  somewes

  committed
  3739d30

• update num queries

  somewes

  committed
  a93c1f7

• update queries

  somewes

  committed
  be5fbbe

Commits on Oct 3, 2023

• Merge pull request #175 from somewes/feature/membership-types

  Show description for dff089f
  somewes

  authored
  dff089f

• set as alpha version

  somewes

  committed
  10e119b

• Merge branch 'feature/custom_logic' of https://github.com/ambitioninc/django-entity into feature/membership-types

  somewes

  committed
  28e8854

• update publish.py

  somewes

  committed
  8663e95

Commits on Oct 30, 2023

• catch and handle exception

  somewes

  committed
  addb899

• final version

  somewes

  committed
  e7ec5ec

• Merge pull request #179 from somewes/feature/membership-types

  Show description for dce797f
  somewes

  authored
  dce797f

• order by sort order and id

  somewes

  committed
  e1a9146

Commits on Oct 31, 2023

• Merge pull request #180 from somewes/feature/membership-types

  Show description for 5248804
  somewes

  authored
  5248804

• beta version for now

  somewes

  committed
  972391a

• final version

  somewes

  committed
  a09544f

• Merge pull request #181 from somewes/feature/membership-types

  Show description for a79d90e
  somewes

  authored
  a79d90e

• Merge pull request #177 from ambitioninc/feature/custom_logic

  Show description for c975fbd
  somewes

  authored
  c975fbd