Chris Dodge
352e56eb4e
address some pylint violations in the mixedmodulestore build report
2013-08-19 23:40:46 -04:00
Jonah Stanley
73ad057eff
Merge pull request #710 from edx/jonahstanley/help-acceptance-test
...
Jonahstanley/help acceptance test
2013-08-19 14:02:29 -07:00
Adam Palay
cb3429570c
set first FAQ link to mktg webiste too
2013-08-19 16:34:17 -04:00
Adam
bd45103fe9
Merge pull request #728 from edx/fix/adam/dash-delete
...
fixes delete state on dashboard
2013-08-19 07:45:59 -07:00
Diana Huang
9469991f52
Merge pull request #713 from edx/diana/button-updates
...
Drupal side Register button updates
2013-08-19 07:28:45 -07:00
Brian Talbot
fc4eb3786a
mktg - revised sass/css for iframed button to match styles/consistency
2013-08-19 10:25:29 -04:00
Adam Palay
2e47d61cef
fixes delete state on dashboard
2013-08-19 10:22:42 -04:00
JonahStanley
ce5d9b93b1
Added the full range of help modal options
...
Fixed pylint violations
2013-08-19 09:56:57 -04:00
chrisndodge
7aa4418934
Merge pull request #723 from edx/fix/cdodge/bad-links-can-cause-exception-on-rewrite
...
Fix/cdodge/bad links can cause exception on rewrite
2013-08-19 06:33:55 -07:00
Anton Stupak
7a68516d12
Fix formatting.
2013-08-19 10:39:52 +03:00
Anton Stupak
a921e44aa3
Fix steps.
2013-08-19 10:39:52 +03:00
Anton Stupak
d848477596
Remove unecessary assert.
2013-08-19 09:10:50 +03:00
Chris Dodge
033f922ec0
add a try catch around the staticstorage lookup, which can throw an exception
2013-08-17 10:33:59 -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
chrisndodge
8ba3214cd4
Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore
...
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
2013-08-16 13:02:31 -07:00
JonahStanley
fc899ab116
Stylistic change and factored out method to common
2013-08-16 15:30:35 -04:00
Diana Huang
af76997ccd
Add in a uniqueness constraint on mode, course, and currency.
2013-08-16 15:26:57 -04: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
Frances Botsford
d4ea8388a6
updated styling for marketing side register button to accommodate second line of text - and IE-specific styling
2013-08-16 11:28:07 -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
Frances Botsford
445cf39f8b
updated styling for marketing side register button to accommodate second line of text
2013-08-16 10:39:45 -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
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
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
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
