Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4229 Commits

Author SHA1 Message Date
Matt Drayer
e53721433f Merge pull request #13413 from edx/release 
Merge release back to master
 2016-09-07 11:30:24 -04:00
Ehtesham
31be6fad43 make CAPA dropdown problems accessible 2016-09-02 19:44:24 +05:00
muhammad-ammar
d14928cc61 separation based on responsetypes poc 
FEDX-176
 2016-09-02 19:44:22 +05:00
Sanford Student
d54a784a43 creating django admin settings for subsection grades 2016-09-02 09:32:33 -04:00
Douglas Hall
98ec118915 Allow for site override of EDITABLE_SHORT_DESCRIPTION setting 2016-08-29 13:50:28 -04:00
Mushtaq Ali
ec13ba4340 Fix when checking in mongo store, has_course with a split course key returns False. 2016-08-26 15:49:34 +05:00
Qubad786
b25dc54d68 update library content block's children on branches 2016-08-25 16:44:52 +05:00
Malik Shahzad
062230b6a4 SOL-2017: Unused code removed. 2016-08-19 16:03:57 +05:00
M. Rehan
ffbaf1fe54 Merge pull request #12813 from edx/aj/TNL4826-lib-problems-not-update-with-import 
Refersh library children for the block during import.
 2016-08-16 00:52:58 +05:00
Qubad786
aca82be335 Move fix to importer module and fix branch_setting in MixedModuleStore. 2016-08-15 18:50:50 +05:00
Albert (AJ) St. Aubin
28922ca688 Merge pull request #13197 from edx/aj/TNL-5051_CourseInfoAcctptanceTest 
Aj/tnl 5051 course info acctptance test
 2016-08-11 11:40:31 -04:00
Renzo Lucioni
363f9e2cd5 Merge pull request #13170 from edx/renzo/dashboard-programs 
Display programs of all categories on the student dashboard
 2016-08-11 10:06:15 -04:00
Albert St. Aubin
b63bfbd5dd Replaced lettuce tests with bokchoy tests for the course updates page and improved flaky test issues. 
TNL-5051
 2016-08-11 10:04:57 -04:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard 
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
 2016-08-11 09:00:23 -04:00
Awais Jibran
878b9124ab Merge pull request #13111 from edx/aj/ECOM4890-make-studio-case-insensitive-for-create-course 
Make studio case-insensitive for course keys for creating courses.
 2016-08-10 16:20:36 +05:00
Awais Jibran
4bc5ded768 Make studio case-insensitive for course keys for creating courses. 
ECOM-4890
 2016-08-10 14:34:35 +05:00
Mushtaq Ali
fb2f9948e1 Fix dynamic load RequireJs issue on Maintenance Dashboard 2016-08-09 13:48:20 +00:00
Mushtaq Ali
abb6af9789 Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-08-09 18:16:13 +05:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Nimisha Asthagiri
be5940e6f4 Robust Grades refactor 
Adds ENABLE_SUBSECTION_GRADES_SAVED feature flag to both lms and cms. Also
installs the wiring that will allow robust grades to be used for courses
that enable it. This functionality is still gated by the feature flag
and should not be used until the remaining robust grades work is finished.
 2016-08-03 15:47:16 -04:00
Ned Batchelder
76bc4fb98e Fix 29 anomalous-backslash-in-string errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8571ceabeb Fix many wrong-assert-type errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
eef964f5f6 Fix unused-variable errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
1905f0c517 Fix simplifiable-range errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00
Adam Palay
feb042d474 Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46" 
This reverts commit 27646b7e6f.
 2016-08-01 10:13:10 -04:00
wajeeha-khalid
986dcff626 MA-2536: get 'course_about' url in enrollment 2016-07-29 14:58:54 +05:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming 
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
 2016-07-27 13:55:14 +05:00
Muddasser
00448dffe5 Merge pull request #12882 from edx/muddasser/lettuce-to-bok-choy/signup.feature 
Conversion of cms/signup.feature to bok-choy
 2016-07-25 20:52:55 +05:00
Syed Hasan raza
d1ce8d39aa Merge pull request #13055 from edx/shr/bug/plat-1048-mongo-courses-restriction-split-key 
Mongo courses wrong course_key restriction
 2016-07-25 16:06:17 +05:00
Syed Hassan Raza
79df545606 Mongo courses wrong course_key restriction 2016-07-25 14:41:31 +05:00
Mushtaq Ali
d4ff39a391 Merge pull request #12237 from edx/mushtaq/maintenance 
Maintenance app and force publish course view
 2016-07-23 01:23:58 +05:00
Mushtaq Ali
27646b7e6f Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-07-22 18:29:12 +00:00
Jesse Zoldak
4906bde056 Comment out flaky lettuce test TNL-5051 2016-07-22 09:11:55 -04:00
Muddasser
64838f5665 Conversion of cms/signup.feature to bok-choy 2016-07-22 12:22:59 +00:00
Christina Roberts
467bc55d27 Merge pull request #12950 from edx/christina/studio-support-levels 
Studio support level of components/xblocks
 2016-07-21 17:13:58 -04:00
cahrens
d4cc7b8ffd Support level support for Studio xblock creation. 
TNL-4670
 2016-07-21 15:44:59 -04:00
Kevin Kim
1ab52f8b0a Merge pull request #12945 from edx/kkim/ora_tz_date 
Convert ORA Due Dates
 2016-07-21 10:52:07 -04:00
Kevin Kim
94100f5944 Convert ORA due dates to user preferred time zone 2016-07-21 13:57:20 +00:00
Jesse Zoldak
893d1f5dfe Merge pull request #13049 from edx/zoldak/TNL-5051 
Skip flaky CMS.Course updates lettuce tests  TNL-5051
 2016-07-20 21:04:15 -04:00
Eric Fischer
35ae67b530 New CMS visibility settings (#12940) 
TNL-4906 Subsections now use radio buttons, to allow for "hide after due" as a
visibility option. Also, all tabs have been consolidated to "Basic" and
"Advanced", and visibility options have moved there.

Documentation links are updated to assist course authors with the new
visibility options. Tests have also been updated, and the changes suggested
in TNL-4951 are included.
 2016-07-20 19:58:51 -04:00
Jesse Zoldak
8cdac6c99a Skip flaky CMS.Course updates lettuce tests TNL-5051 2016-07-20 16:15:26 -04:00
Chris
3302b26e65 Merge pull request #12926 from edx/clrux/ac-524 
AC-524 fixes `label` ignores
 2016-07-20 09:00:15 -04:00
Chris Rodriguez
b97d063181 AC-524 - label - test_lms_instructor_dashboard.py 2016-07-20 07:49:48 -04:00
Simon Chen
1d768cde7a ECOM-4904 Move the program editor backbone app to Studio (#12962) 2016-07-19 19:09:51 -04:00
Muddasser
186b3badb5 course-settings.feature conversion to bokchoy 2016-07-19 08:18:36 +00:00
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation 
Unify JWT generation code
 2016-07-11 15:37:14 -04:00
Christina Roberts
6d7a545276 Merge pull request #12932 from edx/christina/deprecated-components 
Move deprecating of XBlocks to new XBlockConfiguration model
 2016-07-08 15:05:42 -04:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code 
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
 2016-07-07 16:38:39 -04:00
Chris Rodriguez
4cf0e19af2 AC-520 fixing section ignores 2016-07-06 15:01:44 -04:00