Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Cherry pick 4023 #4075

Merged
merged 22 commits into from
Jul 13, 2016
Merged

Cherry pick 4023 #4075

merged 22 commits into from
Jul 13, 2016

Conversation

chadwhitacre
Copy link
Contributor

@chadwhitacre chadwhitacre commented Jul 6, 2016

#3994

#4074 (diff) — #4076

Brings work from #4023 over into the rebuild of the previous Team takes UI.

@chadwhitacre
Copy link
Contributor Author

Tests are failing, will fix up in additional commits.

@chadwhitacre chadwhitacre force-pushed the cherry-pick-4023 branch 2 times, most recently from d264f26 to 1d484ad Compare July 6, 2016 22:27
@chadwhitacre
Copy link
Contributor Author

Previous head was d264f26.

@chadwhitacre chadwhitacre mentioned this pull request Jul 7, 2016
1 task
This works around a bug in Sphinx where the print function under Python
2.7 prevents class attributes from showing up in documentation. I want
to be able to document some attributes on the Team class.
This gives us more control. Rarely is alphabetical order the right sort
order.
Conflicts:
	sql/branch.sql
The page is broken, but that's okay because no-one will see it until we
set available.
Bring this back as "Distributing" and "Surplus" once we have those
computed values tight.
 - Teams are no longer participants, so we don't need the IS_PLURAL
   checks or show_as_team
 - Teams can no longer have the ~owner as a member
 - We don't want the hard global member limit anymore
 - Typecheck is out of fashion
 - We don't want to clobber the Team __init__
Conflicts:
	gratipay/models/team/mixins/takes.py
@chadwhitacre chadwhitacre merged commit 004e235 into master Jul 13, 2016
@chadwhitacre chadwhitacre deleted the cherry-pick-4023 branch July 14, 2016 21:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant