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 |
|
Brian Rosner
|
aad54984c5
|
avoid the extra SELECT
|
2012-09-15 17:47:59 -06:00 |
|
Brian Rosner
|
bb2ffd2df0
|
fixed team membership views to work non-POST
|
2012-09-15 17:32:43 -06:00 |
|
Brian Rosner
|
cee36ad983
|
modified copy for invite form on team to read more clearly
|
2012-08-22 15:56:22 -06:00 |
|
Luke Hatcher
|
7f0c8496c7
|
fix email bug with teams
|
2012-08-14 17:22:54 -04:00 |
|
James Tauber
|
0dbcbea100
|
added manager permissions
|
2012-08-07 23:28:15 -04:00 |
|
James Tauber
|
fad06ab1c1
|
staff can't apply unless it's by application
|
2012-08-03 01:24:43 -04:00 |
|
James Tauber
|
5fed9fef17
|
added basic contrib.messages to teams
|
2012-08-03 01:11:33 -04:00 |
|
James Tauber
|
16630a6db3
|
don't show team under available if you have an invitation
|
2012-08-03 00:56:52 -04:00 |
|
James Tauber
|
da9db62b9a
|
invitees can now accept an invitation
|
2012-08-03 00:33:28 -04:00 |
|
James Tauber
|
4272c8f8a8
|
implemented invitations
|
2012-08-03 00:21:22 -04: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
|
7db401e9a2
|
show members and applicants on team detail page
|
2012-08-02 13:03:16 -04:00 |
|
James Tauber
|
e96e416bdc
|
fixed polarity problem in is_staff check
|
2012-08-02 10:46:37 -04:00 |
|
James Tauber
|
7de1763de0
|
team permission checks now let staff in
|
2012-08-02 10:27:34 -04:00 |
|
James Tauber
|
eb2382d3ac
|
staff can now see all teams on dashboard
|
2012-08-02 10:17:01 -04:00 |
|
James Tauber
|
9a23c142e8
|
tweaked available teams tag to avoid overlap
|
2012-08-01 23:02:53 -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
|
4f888ffd57
|
include state in team detail context vars
|
2012-08-01 22:28:57 -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
|
40f4d1bb8d
|
display available teams on dashboard and remove debugging print
|
2012-08-01 21:49:54 -04:00 |
|
James Tauber
|
6e67b50501
|
added available teams template tag
|
2012-08-01 21:39:00 -04:00 |
|
Luke Hatcher
|
5dfd74c360
|
permissions backend based on team membership
|
2012-07-31 15:24:26 -04:00 |
|
James Tauber
|
86a346f628
|
view and url from team detail page
|
2012-07-28 18:30:00 -04:00 |
|
James Tauber
|
a907b78bd1
|
added helper method to determine team membership state for a user
|
2012-07-28 18:29:19 -04:00 |
|
James Tauber
|
283ac696ef
|
teams model tweaks and initial dashboard
|
2012-07-28 18:10:15 -04:00 |
|
James Tauber
|
69d3df83c1
|
initial team models and admin
|
2012-07-28 17:05:01 -04:00 |
|