Merge branch 'master' into permfix

WPI-LNL · Aug 24, 2015 · 6e63ebf · 6e63ebf
2 parents d6dc405 + bd20342
commit 6e63ebf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: python
 
 cache:

diff --git a/meetings/forms.py b/meetings/forms.py
@@ -53,7 +53,7 @@ def __init__(self, *args, **kwargs):
         )
         super(MeetingAdditionForm, self).__init__(*args, **kwargs)
 
-    duration = NaturalDurationField(human_values=True)
+    duration = NaturalDurationField(human_values=True, required=True)
     attendance = AutoCompleteSelectMultipleField('Users', required=False)
     datetime = SplitDateTimeField(required=True, initial=datetime.datetime.today())
     location = forms.ModelChoiceField(queryset=Location.objects.filter(available_for_meetings=True), label="Location",