Commit Graph

11117 Commits

Author SHA1 Message Date
Chris Rossi
3256eb1ff6 Architecture for arbitrary field overrides, field overrides for
individual students, and a reimplementation of the individual due date
feature.

This work introduces an architecture, used with the 'authored_data'
portion of LmsFieldData, which allows arbitrary field overrides to be
made for fields that are part of the course content or settings (Mongo
data).  The basic architecture is extensible by means of writing and
configuring arbitrary field override providers.

One concrete implementation of a field override provider is provided
which allows for overrides to be for individual students.  This provider
is then used as a basis for reimplementing the individual due date
extensions feature as a proof of concept for the design.

One can imagine writing override providers that provide overrides based
on a student's membership in a cohort or other similar idea.  This work
is being done, in fact, to pave the way for the Personal Online Courses
feature being developed by MIT, which will use an override provider very
much long those lines.
2015-04-06 13:04:44 -07:00
Piotr Mitros
cd8147cbde Merge pull request #7451 from edx/pmitros/disable-email-auth
Make e-mail activation optional
2015-04-06 20:38:51 +03:00
Piotr Mitros
c656998e8d Make e-mail activation optional 2015-04-06 12:50:18 -04:00
Renzo Lucioni
e39bc1a813 Merge pull request #7581 from edx/renzo/clean-up-admin
Update SKU field help text and verbose name
2015-04-03 13:52:59 -04:00
Kelketek
5795ba3faf Merge pull request #7482 from open-craft/fix_duplicate_rcb
Fix duplication of Randomized Content Blocks
2015-04-03 12:50:09 -05:00
Nimisha Asthagiri
a204cacd74 Merge pull request #7561 from edx/mobile/PLAT-520
PLAT-520 Fix Asset store import of null values.
2015-04-03 12:46:21 -04:00
Will Daly
645f9c2c7a Add proxy to allow IE9 to make xdomain requests
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
2015-04-03 11:41:31 -04:00
Jonathan Piacenti
e95e5e7090 Changed RCB recursive copy function to private function. 2015-04-03 10:40:44 -05:00
Nimisha Asthagiri
d9d4a007b9 PLAT-520 Fix Asset store import of null values 2015-04-03 11:39:51 -04:00
Renzo Lucioni
a8c8863409 Update SKU field help text and verbose name 2015-04-03 11:24:19 -04:00
Jonathan Piacenti
5bf2c23f59 Fixed issue with block IDs being different across library versions. 2015-04-03 13:51:03 +00:00
Matt Drayer
241133f0ae Merge pull request #7540 from edx/mattdrayer/SOL-462
Add social sharing feature (Twitter, Facebook) to student dashboard
2015-04-03 09:18:36 -04:00
louyihua
0d0d1a0ccd Ignore pylint error 7610 (translation-of-non-string) on where it is intended to do
As some i18n features need ```ugettext``` or its shorcut ```_``` to be called on a non-string-literal, so the pylint check of ```translation-of-non-string``` should be explicitly disabled in such situations.
2015-04-03 11:59:53 +08:00
Marco Morales
ebdcc3bb6a Add social sharing feature (Twitter, Facebook) to student dashboard 2015-04-02 23:05:13 -04:00
Braden MacDonald
8d8fa0faaf Partial fix perhaps? 2015-04-03 02:05:22 +00:00
Nimisha Asthagiri
58afd8a7c7 Merge pull request #7541 from edx/mobile/import_fix_course_id
MA-410 Update video_module import to use target course_id.
2015-04-02 19:56:04 -04:00
Jonathan Piacenti
bf414cf9bb Redid _get_library one more time, for giggles 2015-04-02 21:46:33 +00:00
Jonathan Piacenti
fa95d323c6 Tested version handling, modified modulestore when it didn't work. 2015-04-02 21:41:27 +00:00
Adam
9ad4b71688 Merge pull request #7572 from edx/release
Release
2015-04-02 17:24:50 -04:00
Carol Tong
85b36acaa8 Merge pull request #7568 from edx/carol/docs/AdvancedSettingsUIHelp
Edits to Advanced Settings UI text for Discussion Blackout Dates, Discussion Topic Mapping
2015-04-02 17:03:47 -04:00
Carol Tong
4ebefce767 Fix line length 2015-04-02 16:04:32 -04:00
Carol Tong
f318f1b355 Edits to UI text for Discussion Blackout Dates, Discussion Topic Mapping
to address DOC-1434, DOC-1828
2015-04-02 14:32:25 -04:00
Jesse Zoldak
ab63243d01 Decorate flaky test SOL-618 2015-04-02 14:26:46 -04:00
Jonathan Piacenti
ce19c769eb Fix handling of library versions in the library tools. 2015-04-02 18:26:04 +00:00
Jonathan Piacenti
51905f0cd5 Addressed notes for RCB duplication, removed management buttons from RCB container 2015-04-02 18:26:04 +00:00
Jonathan Piacenti
a6c00635b2 Fix issues with overrides on duplicated RCBs. 2015-04-02 18:23:28 +00:00
Nimisha Asthagiri
7e1104c421 MA-410 Update video_module import to use target course_id. 2015-04-02 11:38:01 -04:00
Will Daly
464bcf336e Show certificates for all verified modes 2015-04-02 11:21:54 -04:00
Waheed Ahmed
62a515f038 Fixed static pages removed on import for split course.
PLAT-484
2015-04-02 20:14:46 +05:00
Ahsan Ulhaq
badbc3e3b7 Merge pull request #7499 from edx/ahsan/tnl-1784-every-keystroke-triggers-aria-live-region-announcements
DOM updates on every keystroke are triggering aria-live region announcements
2015-04-02 15:07:10 +05:00
Will Daly
bedba6a600 Merge pull request #7529 from edx/will/cors-iframe-proxy
Add proxy to allow IE9 to make xdomain requests
2015-04-01 14:18:42 -04:00
Christine Lytwynec
0370e90611 skip acid block tests 2015-04-01 12:23:31 -04:00
zubair-arbi
1f9ead5d46 Merge pull request #7547 from edx/zub/bugfix/ecom-1273-enrollment-api-catch-NoneType-courses
log and ignore invlaid/deleted courses in Enrollment API
2015-04-01 19:23:40 +05:00
Will Daly
fcc5b1e347 Add proxy to allow IE9 to make xdomain requests
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
2015-04-01 09:16:42 -04:00
zubair-arbi
ec2f4dc2fe Merge pull request #7523 from edx/zub/bugfix/ecom-579-change-education-level-option-label
change education level option label to read "Associate" degree
2015-04-01 17:17:58 +05:00
zubair-arbi
a9b13f0e72 log and ignore invlaid/deleted courses in Enrollment API
ECOM-1273
2015-04-01 16:26:24 +05:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val
Include VAL data in video module export/import
2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
2015-03-31 19:35:06 -04:00
Calen Pennington
e394c18188 Merge pull request #7476 from cpennington/bulk-assert-all-assertions
Make BulkAssertionTest.bulk_assertions work with any assert* method
2015-03-31 15:19:44 -04:00
Jesse Zoldak
8bfc948b37 Merge pull request #7533 from cpennington/add-mixins-to-mixed-modulestore-tests
Pass standard list of xblock mixins to MixedModulestore in tests
2015-03-31 14:29:35 -04:00
Matt Drayer
cbf336e8e0 Merge pull request #7293 from edx/ziafazal/access-gating-for-entrance-exam
Entrance exam gating
2015-03-31 13:38:00 -04:00
Calen Pennington
462cdfd9b4 Pass standard list of xblock mixins to MixedModulestore in tests 2015-03-31 13:31:30 -04:00
Sarina Canelake
4a4478fd8b Merge pull request #7526 from delftswa2014/readmes
added READMEs for top level directories
2015-03-31 13:16:29 -04:00
Zia Fazal
cc04bb990e Add new gating logic to restrict users from accessing courseware when an entrance exam is required
- added entrance exam check on course info
- staff can by pass gating and added tests
- refined gating logic
- changes after rebasing with Asad's branch
- check ENTRANCE_EXAMS feature is enabled
- updated test to reflect new logic
- catering anonymous user in entrance exam permission
- fixed broken tests
- change after feedback on 16/3
- fix for a broken test
- created new entrance_exams module
- fixed quality error and improved test coverage
- put get_required_content back in milestones helper
- Refactored entrance exams logic
- Refactored tabs logic
- Fixed broken unit test
- changes after feedback from dan-f on 3/27
- removed unnecessary user.is_anonymous check
- Addressed PR feedback
- Addressed commit-specific feedback
- Rework guard clauses
- Add coverage for course info case
2015-03-31 12:12:04 -04:00
Sarina Canelake
11f75e04fc Merge pull request #7512 from johnespinosa/patch-1
Fixed i18n Problem with xBlock Menu
2015-03-31 12:04:52 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical
Convert Vertical XModule to pure Vertical XBlock.
2015-03-31 11:10:22 -04:00
Calen Pennington
3d7bd9aa7b Make BulkAssertionTest.bulk_assertions work with any assert* method 2015-03-31 10:57:15 -04:00
Matt Drayer
d9611dcd9f Merge pull request #7382 from edx/mattdrayer/SOL-461
mattdrayer/SOL-461: Student dashboard clean-up
2015-03-31 10:53:45 -04:00
Mayank Jain
cf7777a474 added READMEs for top level directories 2015-03-31 16:47:37 +02:00
Calen Pennington
a0bae0c794 Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock 2015-03-31 09:43:52 -04:00