Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								f126330390 
								
							 
						 
						
							
							
								
								Handles unicode strings properly.  
							
							 
							
							
							
						 
						
							2016-07-04 22:18:34 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								6ebd0f0905 
								
							 
						 
						
							
							
								
								snoops  
							
							 
							
							
							
						 
						
							2016-07-04 16:28:31 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								6811708b33 
								
							 
						 
						
							
							
								
								Adds a view that returns all proposals in CSV format.  
							
							 
							
							... 
							
							
							
							Fixes  #27  
							
						 
						
							2016-07-04 16:10:02 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Scott Bragg 
								
							 
						 
						
							
							
							
							
								
							
							
								7225dcd660 
								
							 
						 
						
							
							
								
								Merge pull request  #22  from lca2017/chrisjrn/21-chairs-can-see-own-proposals  
							
							 
							
							... 
							
							
							
							Lets programme chairs see their own proposals. 
							
						 
						
							2016-06-29 22:26:46 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								d4230feab0 
								
							 
						 
						
							
							
								
								#16  adds view for jumping to a random proposal  
							
							 
							
							
							
						 
						
							2016-06-29 16:00:07 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								d43d42bbc3 
								
							 
						 
						
							
							
								
								Fixes   #21  — the check_speaker argument to proposals_generator is *false* for section chairs.  
							
							 
							
							
							
						 
						
							2016-06-29 15:16:24 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								7f3ed91dae 
								
							 
						 
						
							
							
								
								vote_count now only counts non-abstaining votes.  Fixes   #19  
							
							 
							
							
							
						 
						
							2016-06-19 18:39:07 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								14dea7eafa 
								
							 
						 
						
							
							
								
								Fixes deletion of reviews  
							
							 
							
							
							
						 
						
							2016-06-19 18:38:14 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								57acd04852 
								
							 
						 
						
							
							
								
								Removes a block of egregious stupidity from update_vote and replaces with something that actually works  
							
							 
							
							
							
						 
						
							2016-06-19 18:37:54 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								d305cd8c13 
								
							 
						 
						
							
							
								
								Requires comments for non-abstain votes only  
							
							 
							
							
							
						 
						
							2016-06-18 17:07:21 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								6e133970d9 
								
							 
						 
						
							
							
								
								Removes div-by-zero error if the first vote is an abstention  
							
							 
							
							
							
						 
						
							2016-06-18 17:01:56 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								47a6f212f2 
								
							 
						 
						
							
							
								
								Add display of scores to the review list  
							
							 
							
							
							
						 
						
							2016-06-18 13:13:18 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								28592e352c 
								
							 
						 
						
							
							
								
								More changes that make abstention work  
							
							 
							
							
							
						 
						
							2016-06-18 13:07:13 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Christopher Neugebauer 
								
							 
						 
						
							
							
							
							
								
							
							
								be4404c602 
								
							 
						 
						
							
							
								
								#2  Adds abstain vote type and revises vote score to account for abstention.  
							
							 
							
							
							
						 
						
							2016-06-18 11:40:18 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Scott Bragg 
								
							 
						 
						
							
							
							
							
								
							
							
								ce122994cc 
								
							 
						 
						
							
							
								
								Changed admin to the 'can_manage' permission and added an is_manager to the page context  
							
							 
							
							
							
						 
						
							2016-06-13 21:32:55 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Scott Bragg 
								
							 
						 
						
							
							
							
							
								
							
							
								acc1b1490e 
								
							 
						 
						
							
							
								
								Update css_class methods to use new vote scoring (removed VOTE_ZERO)  
							
							 
							
							
							
						 
						
							2016-06-13 20:46:13 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Scott Bragg 
								
							 
						 
						
							
							
							
							
								
							
							
								f1f29c6f61 
								
							 
						 
						
							
							
								
								Replaced +1/+0/-0/-1 voting with +2/+1/-1/-2 (fixes lca2017/symposion/#1)  
							
							 
							
							
							
						 
						
							2016-06-10 15:29:09 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martey Dodoo 
								
							 
						 
						
							
							
							
							
								
							
							
								78d13a9ffa 
								
							 
						 
						
							
							
								
								Fix queryset used in "Not Reviewed" view.  
							
							 
							
							... 
							
							
							
							The `speaker` field on the `Proposal` model corresponds to a `Speaker`,
not a `User`, so the old queryset created a ValueError. 
							
						 
						
							2016-03-10 20:35:41 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								7b77b9aa29 
								
							 
						 
						
							
							
								
								Drop deprecated url patterns format  
							
							 
							
							
							
						 
						
							2016-02-27 16:54:42 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								031ee3807e 
								
							 
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2015-10-16 19:54:11 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								11f697d137 
								
							 
						 
						
							
							
								
								Massively upgrade symposion  
							
							 
							
							... 
							
							
							
							* Remove markitup (to be replaced with Ace editor)
* Use DUA decorators
* Removed custom signup bits
* Upgraded dependencies
* Added migrations
* Namespaced template locations
* Removed html5parser/sanitizer (for now) - parsing functionality
should be moved out entirely to a hooks
* Replaced ProposalScoreExpression object with a  function that returns
F() expressions 
							
						 
						
							2015-10-16 12:37:35 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								67433cacb4 
								
							 
						 
						
							
							
								
								Merge branch 'i18n-all' of  https://github.com/miurahr/symposion  into miurahr-i18n-all  
							
							 
							
							... 
							
							
							
							Conflicts:
	symposion/boxes/models.py
	symposion/conference/models.py
	symposion/schedule/models.py
	symposion/speakers/models.py
	symposion/sponsorship/admin.py
	symposion/sponsorship/models.py
	symposion/teams/models.py 
							
						 
						
							2015-09-08 15:07:24 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hiroshi Miura 
								
							 
						 
						
							
							
							
							
								
							
							
								3207621058 
								
							 
						 
						
							
							
								
								i18n all part  
							
							 
							
							... 
							
							
							
							- forms for labels and helps
- views for success or warning messages
- apps and models verbose_names for admin
Signed-off-by: Hiroshi Miura <miurahr@linux.com> 
							
						 
						
							2015-08-03 23:37:33 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hiroshi Miura 
								
							 
						 
						
							
							
							
							
								
							
							
								a95825ede8 
								
							 
						 
						
							
							
								
								python3 compatibility  
							
							 
							
							... 
							
							
							
							- Things are suggested in python3 porting guide.
https://docs.djangoproject.com/en/1.8/topics/python3/ 
     1. adding ```from django.utils.encoding import
     python_2_unicode_compatible```
     2. ``` __str__``` instead of ```__unicode__```
     https://docs.djangoproject.com/en/1.8/topics/python3/#str-and-unicode-methods 
     3. Adding ```from __future__ import unicode_literals``` at the top
     of your Python modules
     https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals 
     4. Removing the `u` prefix before unicode strings;
     https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals 
- also closed  #66 
Signed-off-by: Hiroshi Miura <miurahr@linux.com> 
							
						 
						
							2015-08-03 23:32:25 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								86669ee3d5 
								
							 
						 
						
							
							
								
								Merge pull request  #79  from miurahr/show-review-result  
							
							 
							
							... 
							
							
							
							admin: show review result 
							
						 
						
							2015-06-18 23:00:27 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hiroshi Miura 
								
							 
						 
						
							
							
							
							
								
							
							
								45706074d6 
								
							 
						 
						
							
							
								
								admin: show review result  
							
							 
							
							... 
							
							
							
							Signed-off-by: Hiroshi Miura <miurahr@linux.com> 
							
						 
						
							2015-06-12 08:07:49 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hiroshi Miura 
								
							 
						 
						
							
							
							
							
								
							
							
								3dd2f14f72 
								
							 
						 
						
							
							
								
								multiple recipients for email  
							
							 
							
							... 
							
							
							
							Signed-off-by: Hiroshi Miura <miurahr@linux.com> 
							
						 
						
							2015-06-12 08:04:22 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								71e9ca11bd 
								
							 
						 
						
							
							
								
								Namespace the apps  
							
							 
							
							
							
						 
						
							2014-12-18 08:19:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								5f311ca7bd 
								
							 
						 
						
							
							
								
								Replace dotted notation FKs with actual objects  
							
							 
							
							
							
						 
						
							2014-12-18 08:19:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								b694901831 
								
							 
						 
						
							
							
								
								Remove migrations  
							
							 
							
							... 
							
							
							
							These migrations were written for South. Now that we have Django 1.7,
we will just use Django migrations once we hit a 1.0 release. 
							
						 
						
							2014-12-18 08:19:01 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								f3614fcf52 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/pyohio/symposion  into pyohio-master  
							
							 
							
							... 
							
							
							
							Conflicts:
	README.md
	symposion/boxes/urls.py
	symposion/cms/urls.py
	symposion/proposals/actions.py
	symposion/proposals/urls.py
	symposion/proposals/views.py
	symposion/reviews/tests.py
	symposion/reviews/urls.py
	symposion/reviews/views.py
	symposion/schedule/forms.py
	symposion/schedule/models.py
	symposion/schedule/views.py
	symposion/speakers/fixture_gen.py
	symposion/sponsorship/urls.py
	symposion/templates/cms/file_create.html
	symposion/templates/cms/file_index.html
	symposion/templates/conference/user_list.html
	symposion/templates/dashboard.html
	symposion/templates/emails/proposal_new_message/message.html
	symposion/templates/emails/proposal_updated/message.html
	symposion/templates/emails/speaker_addition/message.html
	symposion/templates/emails/speaker_invite/message.html
	symposion/templates/proposals/_pending_proposal_row.html
	symposion/templates/proposals/_proposal_fields.html
	symposion/templates/proposals/_proposal_row.html
	symposion/templates/proposals/proposal_cancel.html
	symposion/templates/proposals/proposal_detail.html
	symposion/templates/proposals/proposal_edit.html
	symposion/templates/proposals/proposal_speaker_manage.html
	symposion/templates/proposals/proposal_submit.html
	symposion/templates/reviews/_review_table.html
	symposion/templates/reviews/base.html
	symposion/templates/reviews/result_notification.html
	symposion/templates/reviews/result_notification_prepare.html
	symposion/templates/reviews/review_admin.html
	symposion/templates/reviews/review_assignment.html
	symposion/templates/reviews/review_detail.html
	symposion/templates/reviews/review_review.html
	symposion/templates/reviews/review_stats.html
	symposion/templates/schedule/_edit_grid.html
	symposion/templates/schedule/_grid.html
	symposion/templates/schedule/_slot_edit.html
	symposion/templates/schedule/presentation_detail.html
	symposion/templates/schedule/schedule_list.html
	symposion/templates/speakers/speaker_create.html
	symposion/templates/speakers/speaker_edit.html
	symposion/templates/speakers/speaker_profile.html
	symposion/templates/sponsorship/add.html
	symposion/templates/sponsorship/apply.html
	symposion/templates/sponsorship/detail.html
	symposion/templates/sponsorship/list.html
	symposion/templates/teams/team_detail.html 
							
						 
						
							2014-12-15 16:07:37 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Patrick Altman 
								
							 
						 
						
							
							
							
							
								
							
							
								2f89311d42 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/KyivPy/symposion  into KyivPy-master  
							
							 
							
							... 
							
							
							
							Conflicts:
	symposion/cms/urls.py
	symposion/proposals/urls.py
	symposion/proposals/views.py
	symposion/reviews/urls.py
	symposion/schedule/urls.py
	symposion/sponsorship/urls.py 
							
						 
						
							2014-12-15 15:26:57 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								f557337433 
								
							 
						 
						
							
							
								
								Increase code complexity in travis configuration  
							
							 
							
							... 
							
							
							
							Also mark the view reported as too complex with a FIXME, so we can refactor it
when possible. 
							
						 
						
							2014-07-31 08:57:45 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Carlos Henrique Romano 
								
							 
						 
						
							
							
							
							
								
							
							
								36ab6d599f 
								
							 
						 
						
							
							
								
								Fix flake8 warnings  
							
							 
							
							
							
						 
						
							2014-07-30 15:19:26 -03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Volodymyr Hotsyk 
								
							 
						 
						
							
							
							
							
								
							
							
								7596729ec1 
								
							 
						 
						
							
							
								
								Update to Django=1.6  
							
							 
							
							
							
						 
						
							2014-07-05 16:11:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									David Ray 
								
							 
						 
						
							
							
							
							
								
							
							
								5b853f9300 
								
							 
						 
						
							
							
								
								Fixes   #11  
							
							 
							
							
							
						 
						
							2014-06-19 23:55:15 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									David Ray 
								
							 
						 
						
							
							
							
							
								
							
							
								f369e1d8ad 
								
							 
						 
						
							
							
								
								Merge pull request  #4  from pyohio/future-django  
							
							 
							
							... 
							
							
							
							Changes for Django 1.5+ 
							
						 
						
							2014-01-16 05:17:42 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									David Ray 
								
							 
						 
						
							
							
							
							
								
							
							
								5d4b81ae86 
								
							 
						 
						
							
							
								
								Merge pull request  #5  from pyohio/update-requirements  
							
							 
							
							... 
							
							
							
							Update requirements 
							
						 
						
							2014-01-16 05:14:04 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									David Ray 
								
							 
						 
						
							
							
							
							
								
							
							
								132ce087e5 
								
							 
						 
						
							
							
								
								Merge pull request  #2  from pyohio/1-south-support  
							
							 
							
							... 
							
							
							
							Adding South Support; Work on #1  
							
						 
						
							2014-01-15 12:43:22 -08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rebecca Lovewell 
								
							 
						 
						
							
							
							
							
								
							
							
								2413421324 
								
							 
						 
						
							
							
								
								Remove old tests file  
							
							 
							
							
							
						 
						
							2014-01-15 09:58:20 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rebecca Lovewell 
								
							 
						 
						
							
							
							
							
								
							
							
								e799ead094 
								
							 
						 
						
							
							
								
								Remove outdated fixture_gen files  
							
							 
							
							... 
							
							
							
							http://github.com/alex/fixture_generator  has not been updated since
Django 1.2. 
							
						 
						
							2014-01-15 09:58:20 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rebecca Lovewell 
								
							 
						 
						
							
							
							
							
								
							
							
								84bd8f8971 
								
							 
						 
						
							
							
								
								Update urls import format  
							
							 
							
							
							
						 
						
							2014-01-15 09:35:36 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									David Ray 
								
							 
						 
						
							
							
							
							
								
							
							
								ef66c7ed12 
								
							 
						 
						
							
							
								
								Adding South Support; Work on  #1  
							
							 
							
							
							
						 
						
							2014-01-14 09:47:49 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rebecca Lovewell 
								
							 
						 
						
							
							
							
							
								
							
							
								5e5de6c6ea 
								
							 
						 
						
							
							
								
								Pyflakes clean across the entire project  
							
							 
							
							
							
						 
						
							2014-01-13 16:49:40 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Brochhaus 
								
							 
						 
						
							
							
							
							
								
							
							
								5c07d3e945 
								
							 
						 
						
							
							
								
								Django 1.6 compatibility  
							
							 
							
							
							
						 
						
							2014-01-11 14:50:04 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Taavi Burns 
								
							 
						 
						
							
							
							
							
								
							
							
								e180c7f00b 
								
							 
						 
						
							
							
								
								Adds a manage.py script to assign reviewers to talks.  
							
							 
							
							... 
							
							
							
							Requires that a 'reviewers' group exist, and that there are people assigned to it (otherwise it won't find any reviewers to add!).
It will assign up to 3 reviewers, where those reviewers are NOT one of the speakers, and that reviewer has not opted out of reviewing that talk. It will choose random reviewers from those with the fewest existing not-opted-out assignments. 
							
						 
						
							2013-06-25 22:53:18 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Brian Rosner 
								
							 
						 
						
							
							
							
							
								
							
							
								6c1cfd1a53 
								
							 
						 
						
							
							
								
								cleaned up code style  
							
							 
							
							
							
						 
						
							2013-06-11 11:10:29 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									florapdx 
								
							 
						 
						
							
							
							
							
								
							
							
								306dc683b8 
								
							 
						 
						
							
							
								
								removed proposalbase import from previous version  
							
							 
							
							
							
						 
						
							2013-04-29 14:14:47 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									florapdx 
								
							 
						 
						
							
							
							
							
								
							
							
								22b7265649 
								
							 
						 
						
							
							
								
								removed user_reviews template tag; now being handled by review_section view  
							
							 
							
							
							
						 
						
							2013-04-29 14:13:10 -07:00