Patrick Altman
|
cb4b0fac38
|
Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility
Conflicts:
symposion/boxes/urls.py
symposion/cms/urls.py
symposion/conference/urls.py
symposion/proposals/models.py
symposion/proposals/urls.py
symposion/reviews/urls.py
symposion/schedule/models.py
symposion/schedule/urls.py
symposion/speakers/urls.py
symposion/sponsorship/urls.py
symposion/teams/urls.py
|
2014-12-15 15:15:46 -06:00 |
|
Carlos Henrique Romano
|
36ab6d599f
|
Fix flake8 warnings
|
2014-07-30 15:19:26 -03:00 |
|
Martin Brochhaus
|
5c07d3e945
|
Django 1.6 compatibility
|
2014-01-11 14:50:04 +08:00 |
|
James Tauber
|
7fe481ee98
|
implemented team accept/reject
|
2012-08-02 19:09:44 -04:00 |
|
James Tauber
|
2c69596ec6
|
implemented promote to / demote from manager
|
2012-08-02 13:17:16 -04:00 |
|
James Tauber
|
1bfd0cc2f0
|
implemented team apply
|
2012-08-01 22:59:41 -04:00 |
|
James Tauber
|
a4dea58195
|
implemented join/leave teams
|
2012-08-01 22:49:27 -04:00 |
|
James Tauber
|
3998fe3369
|
properly link to and control access to team detail page
|
2012-08-01 21:59:23 -04:00 |
|
James Tauber
|
86a346f628
|
view and url from team detail page
|
2012-07-28 18:30:00 -04:00 |
|