Vik Paruchuri
f8b5e67363
Text and styling cleanup
2013-08-15 14:52:51 -04:00
Vik Paruchuri
a084d4486d
Get rid of labels
2013-08-15 14:28:52 -04:00
Vik Paruchuri
ac4d312415
Make rubric text generic, fix right arrow
2013-08-15 14:26:42 -04:00
marco
72bb93d436
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-15 13:57:05 -04:00
marco
7865fbe0df
cleaned up padding for peer review training and grading states, removed extraneous response label,fixed style issue on rubric for peer grading where rubric items had a background color overridding the intended style
2013-08-15 13:56:17 -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
Vik Paruchuri
6f657c1124
Import to fix internationalization
2013-08-15 10:30:16 -04:00
Adam Palay
4855fd5af4
turn off i18n
2013-08-14 17:03:21 -04:00
Jay Zoldak
c65c9eb069
Merge pull request #657 from edx/zoldak/fix-i18n-enroll
...
The enrollment_action value enroll should not be translated.
2013-08-14 13:18:00 -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
marco
c9807db308
styling of peer review interface for students along with minimal adjustments to the staff grading interface as well. added internationalization of peer grading strings.
2013-08-14 14:12:04 -04:00
David Ormsbee
57a8063517
Merge pull request #651 from edx/ormsbee/enrollment_modes
...
Add mode and is_active to CourseEnrollment, shift enrollment logic to model
2013-08-14 10:45:27 -07: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
Jay Zoldak
6416a21aa5
Merge branch 'release'
2013-08-14 12:11:52 -04:00
Adam Palay
72fdc414ca
change FEEDBACK_SUBMISSION_EMAIL to @example.com in dev settings
2013-08-14 10:57:03 -04:00
Adam Palay
5fd09ca1ee
add dummy FEEDBACK_SUBMISSION_EMAIL for debugging
2013-08-14 10:09:01 -04:00
Adam Palay
970f5f60d3
fix syntax error in help_modal
2013-08-14 10:08:54 -04:00
Adam Palay
6594401d2f
if mktg, redirects faq to mktg. else, to '/help'
2013-08-14 10:05:26 -04:00
Valera Rozuvan
99ae63777e
Removed unnecessary tabindex = 0 from <a /> - they get it by default.
2013-08-14 11:51:15 +03:00
Valera Rozuvan
05539b1bbe
Removed unnecessary tabindex -1 from Video template.
2013-08-14 10:51:45 +03:00
marco
3a970d1490
restyled controls area for motion through multiple scored peer reviews
2013-08-13 20:56:53 -04:00
Adam Palay
172d415929
add dummy FEEDBACK_SUBMISSION_EMAIL for debugging
2013-08-13 16:13:42 -04:00
Adam Palay
307d27db9a
fix syntax error in help_modal
2013-08-13 16:13:42 -04:00
Adam Palay
4fc8aaab02
if mktg, redirects faq to mktg. else, to '/help'
2013-08-13 16:13:42 -04:00
Miles Steele
5410e43694
Merge pull request #660 from edx/feature/msteele/enable-dev
...
Enable instructor dashboard in lms/envs/dev
2013-08-13 12:23:34 -07:00
marco
ab81000665
visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins.
2013-08-13 14:42:34 -04:00
Adam
8951ab7a66
Merge pull request #650 from edx/fix/adam/i18n-templates
...
Fix/adam/i18n templates
2013-08-13 08:39:46 -07:00
Adam Palay
5d8e07eb63
replace html strings wtih tokens in templates
2013-08-13 11:30:51 -04:00
Adam Palay
5d4edc61a7
add settings.PLATFORM_NAME to password_reset_confirm context
2013-08-13 11:30:51 -04:00
Adam Palay
5ed8d557c2
put wiki templates back into Django templating
2013-08-13 11:30:51 -04:00
Adam Palay
39b829761a
fix password reset templates
2013-08-13 11:30:51 -04:00
Adam Palay
5a7b72667e
replace html strings wtih tokens in templates
2013-08-13 11:19:58 -04:00
Miles Steele
47ae2f6429
enable instructor dashboard in lms/envs/dev
2013-08-13 11:05:20 -04:00
Jay Zoldak
c09da60fe3
The enrollment_action value enroll should not be translated.
2013-08-13 08:43:09 -04:00
Adam Palay
f9ab433e26
add settings.PLATFORM_NAME to password_reset_confirm context
2013-08-12 17:58:31 -04:00
Adam Palay
18a979bb4d
put wiki templates back into Django templating
2013-08-12 16:42:07 -04:00
Adam Palay
13d54c0dd7
fix password reset templates
2013-08-12 15:57:27 -04:00
Adam Palay
431eb8f4e7
remove 'preview' from urls in enrollment emails sent while previewing a course
2013-08-12 14:28:15 -04:00
Adam
0db8ad28dc
Merge pull request #640 from edx/adam/i18n-bug-fixes
...
instructor dash fixes
2013-08-12 11:16:22 -07: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
e6d44f5ae7
Merge pull request #626 from edx/feature/msteele/instrdash
...
Enable beta dashboard, add copy, add i18n
2013-08-12 10:38:26 -07:00
Miles Steele
43afb9a940
fix i18n
2013-08-12 13:21:46 -04:00
Adam Palay
b2b574ffb6
instructor dash fixes
2013-08-12 11:36:26 -04: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
