Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,765 Commits 1 Branch 0 Tags
2249692f9a7168e2b60be9fe65dfb1ca3d1058d8
Commit Graph

5758 Commits

Author SHA1 Message Date
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
Carlos Andrés Rocha
4e0f3d0791 Merge pull request #706 from rocha/enable-django-nose-for-all 
Enable the django_nose app by default
 2013-08-16 11:29:43 -07: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
cf715cb727 fix pylint violations 2013-08-15 22:58:04 -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
Chris Dodge
b5253b52b6 add a set_modulestore_configuration to the modulestore interface. This can be used to pass in settings run the Django tier 2013-08-15 22:56:32 -04:00
Chris Dodge
6f11b98b4f initial commit for a mixed module store which can interoperate with both XML and Mongo module stores 2013-08-15 22:56:32 -04:00
Carlos Andrés Rocha
bbfe3662e2 Enable the django_nose app by default 
The django_nose it is very useful, even outside the test
environment. For example, it lets you to easily run test from
manage.py without additional changes to the test packages.
 2013-08-15 19:31:30 -04:00
JonahStanley
a067fb58d6 Workaround for issue 
Better wording of commit

Workaround for issue

Better wording of commit

Fixed spacing
 2013-08-15 16:59:30 -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
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
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
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
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
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
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