Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
510 commits 2 branches 0 tags 57 MiB
Commit graph

324 commits

Author SHA1 Message Date
Luke Hatcher
fe29c708b9 no models in markupfield land 2012-08-30 22:57:58 -04:00
Luke Hatcher
40aede0839 add foreign key to presentation 2012-08-30 22:55:44 -04:00
Luke Hatcher
7e7d85c7e7 add section property to proposalbase 2012-08-30 22:55:20 -04:00
Luke Hatcher
4ecb2272df change to onetoone 2012-08-30 22:46:23 -04:00
Luke Hatcher
5b7087f478 add proposal base to presentation 2012-08-30 22:43:43 -04:00
Luke Hatcher
82754d2342 enable proposal acceptance 2012-08-30 22:37:01 -04:00
Luke Hatcher
7324d03031 add presentation model 2012-08-30 22:37:01 -04:00
James Tauber
5c1916352c include class indicating slot kind 2012-08-30 22:31:59 -04:00
James Tauber
b4ec8dc29b only show add if the slot is for a talk 2012-08-30 22:26:37 -04:00
James Tauber
358b466d17 Merge branch 'master' into new-schedule 2012-08-30 21:10:46 -04:00
Luke Hatcher
11502f4804 expand emails to all reviewers and commenters 2012-08-30 14:10:32 -04:00
Luke Hatcher
34a9d07bb7 remove old css 2012-08-30 14:07:15 -04:00
Brian Rosner
2c954c3a05 Fixed slot rooms by using database more natively 2012-08-30 11:52:11 -06:00
James Tauber
38e2124c64 work in progress improvements to schedule edit styling 2012-08-30 12:26:41 -04:00
James Tauber
95d182e528 use full span12 on schedule edit 2012-08-30 12:17:10 -04:00
James Tauber
746e34cf3c work in progress on schedule edit template 2012-08-30 03:14:46 -04:00
Brian Rosner
3ade1c5516 Fixed typo in method name 2012-08-30 01:04:08 -06:00
Brian Rosner
44d0ea6f2b Moved colspan to slot in TimeTable 2012-08-30 01:02:49 -06:00
Brian Rosner
d7b3696c6e Fixed room lookup bug 2012-08-30 00:58:16 -06:00
Brian Rosner
69097d86c9 Fixed rooms queryset to be ordered 2012-08-30 00:57:02 -06:00
Brian Rosner
14f43da962 Corrected naming 2012-08-30 00:53:31 -06:00
Brian Rosner
7601791e8c Fixed tons of little bugs 2012-08-30 00:52:50 -06:00
Brian Rosner
f3e9cc9a5d Added TimeTable 2012-08-30 00:51:07 -06:00
Brian Rosner
bec6903ca1 Fixed slug bug 2012-08-30 00:23:49 -06:00
Brian Rosner
0a4e626dfe Started detail and edit views with slug field to Schedule 2012-08-30 00:21:48 -06:00
Brian Rosner
77dc781e0d Improved schedule models and behavior 
This allows for full slot creation now.
 2012-08-29 23:58:03 -06:00
Brian Rosner
143dbbce28 added schedule models (not fully complete) 2012-08-29 19:53:15 -06:00
Luke Hatcher
53923c5a7a add tabletools 2012-08-27 14:33:41 -04:00
Luke Hatcher
17e9016981 add datatables and tabletools 2012-08-27 14:32:59 -04:00
Luke Hatcher
6bfd617e99 add message to reviewers when proposal is updated 2012-08-27 14:12:19 -04:00
Luke Hatcher
2da59c13bf bump version 2012-08-25 20:01:48 -04:00
Luke Hatcher
54991cd4d1 only run generator on proposals with a selected status 2012-08-25 20:00:13 -04:00
Luke Hatcher
6ee3ff5d45 use generator to ensure proposals are filtered by speaker 2012-08-25 19:54:17 -04:00
Luke Hatcher
d427ef2941 proposal_count is unused 2012-08-25 19:52:58 -04:00
Luke Hatcher
1cb22cea95 restrict status view to reviewers 2012-08-25 19:52:07 -04:00
Luke Hatcher
86b698a228 bump version 2012-08-25 19:04:32 -04:00
Luke Hatcher
8bd7998034 add proposal leave template 2012-08-24 11:46:17 -04:00
Brian Rosner
32155ff1ea added Speaker Bio to proposal display fields 2012-08-22 16:32:47 -06:00
Brian Rosner
be877c19d6 spelt out Additional 2012-08-22 16:29:12 -06:00
Brian Rosner
70351b3714 moved Audience Level to a more logical spot in _proposal_fields 2012-08-22 16:28:42 -06:00
Brian Rosner
a9aff9d637 bumped version to 1.0b1.dev11 2012-08-22 16:01:24 -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
4aab28c8ef always use user_display for comments 2012-08-17 15:38:23 -04:00
Luke Hatcher
6ded9f0b14 fix user display issue with proposal comments 2012-08-17 15:19:01 -04:00
Luke Hatcher
445e628d64 bump version 2012-08-14 18:49:18 -04:00
Luke Hatcher
d3b7de4890 move comment form below conversation 2012-08-14 18:48:50 -04:00
Luke Hatcher
aec89beaaa use proposals base for all proposals templates 2012-08-14 18:41:18 -04:00
Luke Hatcher
b05b389320 bump version 2012-08-14 17:25:52 -04:00
Luke Hatcher
0ea559bae1 include documents 2012-08-14 17:22:55 -04:00
Luke Hatcher
8457c8d5ac remove second additional notes 2012-08-14 17:22:55 -04:00
Luke Hatcher
7a9c01c11a fix label so it isn't cut off 2012-08-14 17:22:54 -04:00
Luke Hatcher
6d7971e097 fix addl speaker display 2012-08-14 17:22:54 -04:00
Luke Hatcher
c7dd6e6f8d add section to review_section context 2012-08-14 17:22:54 -04:00
Luke Hatcher
7f0c8496c7 fix email bug with teams 2012-08-14 17:22:54 -04:00
Luke Hatcher
69663679cc fix dashboard issue 2012-08-14 17:22:54 -04:00
Luke Hatcher
7b4c5cd205 add review message form 2012-08-14 17:22:54 -04:00
James Tauber
e00b646f20 added method for determining if section is open for proposals and redirect away from form if not 2012-08-14 17:09:51 -04:00
Luke Hatcher
25a8088984 dev5 2012-08-14 16:28:13 -04:00
James Tauber
553b47dc30 ready for 1.0b1.dev4 release 2012-08-14 15:53:16 -04:00
James Tauber
0aca96152f made voting threshold configurable 2012-08-14 15:52:23 -04:00
Luke Hatcher
2789537cb4 bump version 2012-08-14 04:50:29 -04:00
Luke Hatcher
35d8945a68 add prefixes to auth forms 2012-08-14 04:48:39 -04:00
Luke Hatcher
d0a68ffd82 include templates in build 2012-08-14 04:36:46 -04:00
Luke Hatcher
20cf024bf1 add blank models.py to symposion 2012-08-14 04:20:46 -04:00
Luke Hatcher
bf02e5eb9f dev versions 2012-08-14 03:59:18 -04:00
Luke Hatcher
3d68af9796 add reviews app 2012-08-14 03:54:45 -04:00
Luke Hatcher
67bca7473b add default templates 2012-08-14 03:49:57 -04:00
Luke Hatcher
02d9fc0518 add setup.py 2012-08-14 01:30:26 -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
Luke Hatcher
584392e897 sponsor signals to handle benefits 2012-07-18 19:24:46 -04:00
Luke Hatcher
53e37d6ec0 properties for logo and listing text benefits 2012-07-18 19:23:59 -04:00
Luke Hatcher
02a8e274f7 update admin views for sponsors 2012-07-18 19:22:41 -04:00
Luke Hatcher
4be04a3800 don't allow adding documents to cancelled proposals 2012-07-18 19:22:29 -04:00
Luke Hatcher
07e98036b7 handle cases where USE_X_ACCEL_REDIRECT is not defined 2012-07-18 19:21:50 -04:00
Luke Hatcher
63d07f8db3 mark strings for i18n 2012-07-18 19:21:21 -04:00
Luke Hatcher
55ec9b745a add our more liberal markdown parser to symposion 2012-07-18 19:20:51 -04:00
Luke Hatcher
6cf7a62da1 track revisions for proposals, boxes and add reversion admin to all 2012-07-18 19:19:59 -04:00
Luke Hatcher
022d62721d fix pycon imports 2012-07-13 21:45:13 -04:00
Luke Hatcher
836166f4b3 remove extra speaker profile fields 2012-07-13 21:43:08 -04:00
James Tauber
9d367667f2 got sponsorship app flow working, adding missing templates, etc 2012-07-13 08:59:25 -04:00
James Tauber
dc11411a4a added first pass of documentation about proposals 2012-07-12 16:38:42 -04:00
James Tauber
81853ece30 made biography optional and cleaned up speaker code a little 2012-07-12 15:53:44 -04:00
James Tauber
3ffcc4da7c first pass at merging pycon's sponsorship app with more basic symposion one 2012-07-12 15:17:49 -04:00
Luke Hatcher
d31953b544 bring over forms and views form pycon for now 2012-07-12 01:32:07 -04:00
Luke Hatcher
db95cb6180 add utils 2012-07-12 01:20:55 -04:00
Luke Hatcher
7596922f4d add proposals app from pycon 2012-07-12 00:38:39 -04:00
Luke Hatcher
2b7f5546a0 add speakers app from pycon 2012-07-12 00:38:24 -04:00
Luke Hatcher
76c4a7b79c update conferences app 2012-07-12 00:38:01 -04:00
Luke Hatcher
1f59ffa489 update project layout 2012-07-11 18:51:09 -04:00
Luke Hatcher
2665fd5758 update cms/boxes to pycon parity 2012-07-10 18:18:48 -04:00
Luke Hatcher
b06daba446 Merge branch 'master' into cms-features 
* master:
  added BSD license
  Update master
  use django-forms-bootstrap
  fixed account links on homepage
  fixed staticfiles settings
  removed homepage use of ifsetting_tag
  updated urls
  updated templates
  updated imports to reflect new layout
  updated imports to reflect new layout
  updated settings
  updated manage.py
  updated requirements to 1.4 / DUA and latest versions
  updated project layout for 1.4 (without content changes)

Conflicts:
	requirements/base.txt
	symposion/settings.py
	symposion_project/urls.py
 2012-07-10 15:35:30 -04:00
James Tauber
1191608a8a use django-forms-bootstrap 2012-05-29 21:50:46 -04:00
James Tauber
44fb5325f1 fixed account links on homepage 2012-05-29 15:34:14 -04:00
James Tauber
9477c92abf fixed staticfiles settings 2012-05-29 15:30:35 -04:00
James Tauber
6160ede722 removed homepage use of ifsetting_tag 2012-05-29 15:17:08 -04:00
James Tauber
02319e51c8 updated urls 2012-05-29 15:16:41 -04:00
James Tauber
303877add6 updated templates 2012-05-29 15:12:22 -04:00
James Tauber
4b87c51251 updated imports to reflect new layout 2012-05-29 15:12:03 -04:00
James Tauber
c9e600e42c updated imports to reflect new layout 2012-05-29 15:08:05 -04:00
James Tauber
fc69aa85e8 updated settings 2012-05-29 15:06:24 -04:00
James Tauber
09aa60777f updated project layout for 1.4 (without content changes) 2012-05-29 14:53:04 -04:00