Jean Manuel Nater
799b938d5b
Merge branch 'master' into jnater/courseware_tests
2013-06-24 17:24:42 -04:00
mlsteele
88060c0590
Merge pull request #144 from edx/fix/msteele/instructor_tests
...
fix gradebook tests
2013-06-21 19:16:09 -07:00
Jean Manuel Nater
1b94050ef6
Merge branch 'master' into jnater/courseware_tests
...
Conflicts:
lms/djangoapps/open_ended_grading/tests.py
2013-06-21 16:38:31 -04:00
Jean Manuel Nater
9bfddd4891
Addressed pull request feedback.
2013-06-21 14:05:57 -04:00
Ned Batchelder
61b53713d2
Remove unused imports from lms, as detected by pylint.
2013-06-19 16:56:34 -04:00
Miles Steele
7fb9bfd685
fix test string comparison
2013-06-13 10:25:36 -04:00
Miles Steele
0825319cc7
fix gradebook tests
2013-06-12 13:16:08 -04:00
dcadams
0b4e03e8bc
Merge pull request #66 from edx/feature-dcadams-usermanagement
...
Feature user-management autoenroll
2013-06-10 10:10:57 -07:00
Greg Price
625a9581eb
Fix XSS vulnerability in instructor dashboard
2013-06-07 10:23:03 -04:00
dcadams
a8ec1ca9d5
Modified code such that non-logged in student activates correctly.
2013-06-04 17:08:34 -07:00
dcadams
1ea6545556
Worked on reducing pep8 violations.
2013-06-04 14:17:13 -07:00
dcadams
56f81fb104
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
2013-06-04 10:29:04 -07:00
dcadams
67356cdcc8
Merge of master to get Jenkins running.
2013-05-15 09:54:53 -07:00
dcadams
5e75e91322
Takes care of Victor's comments on the PR.
...
Note, the students_lc list is used in _do_enroll_students when overload
= True so it needs to be left in.
2013-05-13 13:20:37 -07:00
dcadams
2ef3bcc92d
Commit just to get Jenkins to rerun.
2013-05-08 14:52:18 -07:00
dcadams
dcabac8edf
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
2013-05-08 14:48:29 -07:00
Chris Dodge
5ba22ec89b
fix another broken test
2013-05-06 16:56:37 -04:00
Greg Price
0f7378a171
Modify UserFactory to create a profile for the user
...
This allows specification of profile parameters when creating a user. Because
the profile contents are always accessed from the database, the user must be
saved to the database before the profile is created. This means that the
profile cannot be created if the user is merely being built (and not saved)
rather than created.
2013-05-03 10:31:35 -04:00
dcadams
6a1a907339
Fix pep8 violations.
2013-04-30 11:48:23 -07:00
dcadams
aa4b61180c
Some cleanup.
2013-04-29 10:03:11 -07:00
dcadams
c64f0b1a18
Modifications to instructor dashboard - enrollment tab:
...
- Remove single enrollment/unenrollment
- Make unenrollment work with multi-email listbox.
- Provide checkbox for auto-enroll on activate if user not yet signed
up.
- Enroll student when activating if auto-enroll flag set.
2013-04-29 09:38:10 -07:00
Calen Pennington
6c7c49e6bd
Fix pep8 violations
2013-04-17 11:07:58 -04:00
Calen Pennington
904ec5d88b
Shorten long line
2013-04-17 10:05:43 -04:00
Calen Pennington
6644b78819
Fix gradebook when using grade cutoffs other than A/B/C
2013-04-16 11:38:58 -04:00
