Diana Huang
af76997ccd
Add in a uniqueness constraint on mode, course, and currency.
2013-08-16 15:26:57 -04:00
JonahStanley
43bee86074
Tightened up wording
2013-08-16 11:08:05 -04:00
JonahStanley
967fdee6bc
Made filling field a bit safer
2013-08-16 10:55:14 -04:00
JonahStanley
97f70e8598
Fixed wording to better reflect BDD specs
2013-08-16 10:52:20 -04:00
JonahStanley
fc67c2ee6b
Wrote preliminary help modal acceptance tests
2013-08-16 10:36:12 -04:00
Adam Palay
8aee225136
in grading, if problem cannot be created, return score as none
2013-08-16 10:25:38 -04:00
Chris Dodge
61219169d4
change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration
2013-08-15 22:58:04 -04:00
Chris Dodge
5ee5beafbe
fix bad merge conflict resolution
2013-08-15 22:58:03 -04:00
Chris Dodge
aa8b054590
fix missed conflict resolution
2013-08-15 22:58:03 -04:00
Chris Dodge
5298f54f4c
fix tests
2013-08-15 22:58:02 -04:00
Chris Dodge
cff93d324b
WIP
2013-08-15 22:58:02 -04:00
Chris Dodge
82988972ad
WIP: added a get_modulestore_type. Added some unit tests. changed over the isinstance() with respect to modulestores to use this get_modulestore_type()
2013-08-15 22:58:02 -04:00
Diana Huang
c8fdf6ad29
Add in tests for the marketing site button.
2013-08-15 16:34:48 -04:00
Diana Huang
6db1f6a6c0
Add new column to CourseMode table for currencies
2013-08-15 16:34:48 -04:00
Diana Huang
4946fbcd5b
Change registration button based on number of modes.
2013-08-15 16:34:48 -04:00
David Ormsbee
59c2bb18ef
Bare bones outline of ID verification templates
2013-08-15 14:20:36 -04:00
David Ormsbee
d84f764840
Basic first commit of Photo ID Verification model and test code
2013-08-15 13:18:04 -04:00
Vik Paruchuri
9211a38374
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-08-15 11:36:11 -04:00
Vik Paruchuri
c9e0d36d16
Merge pull request #621 from edx/fix/vik/oe-issues
...
Fix/vik/oe issues
2013-08-15 08:27:34 -07:00
Diana Huang
7d44379c99
Add admin site for CourseMode
2013-08-14 15:13:11 -04:00
Diana Huang
22b1ef3472
Initial migrations for course modes
2013-08-14 14:40:17 -04:00
Diana Huang
6c6ba54e84
Create Course Modes django app
2013-08-14 14:40:17 -04:00
David Ormsbee
3ce87583ab
Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.
...
Features coming down the pipe will want to be able to:
* Refer to enrollments before they are actually activated (approval step).
* See what courses a user used to be enrolled in for when they re-enroll in
the same course, or a different run of that course.
* Have different "modes" of enrolling in a course, representing things like
honor certificate enrollment, auditing (no certs), etc.
This change adds an is_active flag and mode (with default being "honor").
The commit is only as large as it is because many parts of the codebase were
manipulating enrollments by adding and removing CourseEnrollment objects
directly. It was necessary to create classmethods on CourseEnrollment to
encapsulate this functionality and then port everything over to using them.
The migration to add columns has been tested on a prod replica, and seems to be
fine for running on a live system with single digit millions of rows of
enrollments.
2013-08-14 13:23:06 -04:00
ichuang
a5bb971c9b
add static_asset_path metadata to course, and honor its use in link rewriting
2013-08-12 20:26:20 +00:00
Adam Palay
431eb8f4e7
remove 'preview' from urls in enrollment emails sent while previewing a course
2013-08-12 14:28:15 -04:00
Lyla Fischer
e817fb4ca1
Merge pull request #637 from edx/vaxxxa/videoalpha_to_video
...
Migration videoalpha module to one main video module
2013-08-12 10:56:12 -07:00
Miles Steele
b1074ff1ac
add i18n
2013-08-12 11:25:26 -04:00
Anton Stupak
74f3595d54
Add acceptance tests for checking rendering.
2013-08-12 14:32:15 +03:00
Peter Fogg
e20acee4c4
Working on Videoalpha test fix.
...
Fixed all common and LMS tests.
The tests were failing because XMLDescriptor adds in some attributes
to _model_data, such as `xml_attributes`, that aren't necessary. The
solution is to handle all XML parsing in VideoDescriptor. There's
still one test failing in CMS, which has to do with metadata being
saved. I'm still working out how to update it in such a way that it
doesn't fail, but still tests something meaningful.
2013-08-12 14:32:15 +03:00
Anton Stupak
d846462ce9
Migrate acceptance tests: old Video -> new Video.
2013-08-12 14:32:07 +03:00
Vasyl Nakvasiuk
b33b5c7bd4
Python: videoalpha -> video.
2013-08-12 14:31:48 +03:00
Vasyl Nakvasiuk
28b0ba5e10
Migrate video tests to videoalpha tests, remove video tests.
2013-08-12 14:31:47 +03:00
Miles Steele
25d45b8578
Merge pull request #574 from edx/feature/msteele/instrdash
...
Add cronjob analytics to instructor dashbaord
2013-08-09 10:26:50 -07:00
Vik Paruchuri
5d16bc9eb6
Remove ad-hoc patch for xblock issue
2013-08-09 11:24:07 -04:00
Vik Paruchuri
e4bcfa5c21
Fix indents and copy behavior
2013-08-08 19:31:34 -04:00
Vik Paruchuri
687ab3ddae
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
common/lib/xmodule/xmodule/peer_grading_module.py
lms/templates/combinedopenended/combined_open_ended.html
lms/templates/combinedopenended/combined_open_ended_status.html
lms/templates/combinedopenended/openended/open_ended.html
lms/templates/combinedopenended/openended/open_ended_rubric.html
lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
2013-08-08 19:03:46 -04:00
JonahStanley
5a579921f2
Fixed stylistic things and no longer skipped tests in firefox
2013-08-08 13:24:28 -04:00
JonahStanley
38c2997fcf
Added a comment on the features that will not work on firefox
2013-08-08 13:24:27 -04:00
JonahStanley
7056c80319
Fixed most of the lms tests to work on firefox
2013-08-08 13:24:25 -04:00
Miles Steele
7fe9f70ab3
fix test mocking
2013-08-08 13:16:49 -04:00
Miles Steele
4afde4dd79
add proxied analytics graphs, refactor analytics
2013-08-08 13:16:48 -04:00
Miles Steele
fb8c84a516
add analytics proxy endpoint
2013-08-08 13:16:47 -04:00
Vik Paruchuri
bd9097596c
Remove annoying rubric parsing error, redo how notifications work
2013-08-08 13:16:32 -04:00
Jay Zoldak
006b90af9f
Modify cms acceptance tests to use auto_auth workflow.
2013-08-08 12:08:25 -04:00
Vik Paruchuri
17c77dd157
Merge pull request #392 from edx/fix/vik/answer-unknown
...
Simplify save_grade and pass through answer_unknown
2013-08-08 07:28:03 -07:00
Vik Paruchuri
306649f6ad
Fix test
2013-08-08 08:34:39 -04:00
Vasyl Nakvasiuk
ae8b2c883c
add Word Cloud acceptance tests
2013-08-07 15:46:27 +03:00
Kristin
16b5b95128
Merge pull request #506 from edx/ksteph/bugfix_offline_gradecalc
...
Fix offline_gradecalc
2013-08-06 14:53:30 -07:00
David Baumgold
b69be70f65
Merge pull request #575 from edx/db/integrate-jsonresponse
...
Integrate JsonResponse into lms/djangoapps/instructor/views/api.py
2013-08-06 11:55:49 -07:00
David Baumgold
714d3b9662
pylint fixes
2013-08-06 14:36:13 -04:00
