Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,204 Commits 1 Branch 0 Tags
dc8d020e3080098394a88366c5c16e14906e9a2d
Commit Graph

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muhammad Ammar
0b4050f4ac Merge pull request #10924 from edx/ammar/fix-subject-field-in-jwt 
use users anonymous id for subject field in JWT
 2015-12-11 16:58:17 +05:00
asadiqbal
9a01078088 SOL-1455 enhancement 2015-12-11 14:56:43 +05:00
Sven Marnach
87a0f0a46c Merge pull request #10476 from open-craft/smarnach/add-xblock-activetable 
Make xblock-activetable available on edx.org.
 2015-12-11 09:29:03 +01:00
Kevin Falcone
8b3ea56d93 Merge pull request #10945 from edx/release 
Merge down patch-2015-12-10
 2015-12-10 21:34:45 -05:00
Nimisha Asthagiri
2b8441a072 Update Course Catalog to use CourseOverview 2015-12-10 20:37:50 -05:00
Nimisha Asthagiri
801165b266 Remove support for outdated ispublic field on Course Descriptor 
Also remove its corresponding ACCESS_REQUIRE_STAFF_FOR_COURSE feature
flag.
 2015-12-10 20:37:39 -05:00
Nimisha Asthagiri
4133155acc Update CourseDetails support for Course About information 2015-12-10 17:15:43 -05:00
Nimisha Asthagiri
bb53c03e24 Optimize Course Catalog/About API with Course Overviews 2015-12-10 17:15:42 -05:00
Nimisha Asthagiri
aef4da86fe Refactor Course Catalog fields in CourseDescriptor 2015-12-10 17:15:41 -05:00
Nimisha Asthagiri
8289c321be Update CourseOverview for Course Catalog 
Added the following fields to CourseOverview:
    announcement
    catalog_visibility
    course_video_url
    effort
    short_description

Now requires CourseOverview models for each course in the system:
    Introduced a CourseOverviewGeneratedHistory model to keep track of
    when the CourseOverview table was seeded. The seeding can be
    done preemptively by calling the generate_course_overview management
    command. Otherwise, it is lazily computed, when needed.
 2015-12-10 17:15:41 -05:00
David Ormsbee
deb291464a Merge pull request #10903 from open-craft/staff-debug-everywhere 
Remove staff debug category type whitelist.
 2015-12-10 16:54:24 -05:00
Kevin Falcone
f042784b5c Merge pull request #10933 from edx/patch/2015-12-10 
Patch/2015 12 10
 2015-12-10 16:47:23 -05:00
David Baumgold
e97751d7e8 Merge pull request #10887 from edx/slack-in-contributing-file 
Real-time conversation is on Slack, not IRC
 2015-12-10 16:46:16 -05:00
Bill DeRusha
55810061b3 Update Financial Aid copy. 2015-12-10 16:20:22 -05:00
Braden MacDonald
c6233dab67 Merge pull request #10938 from Stanford-Online/dcadams/remove_randomized_content_field 
Remove unused filter field from Randomized Content Block edit form.
 2015-12-10 13:14:52 -08:00
Calen Pennington
035f325fef Merge pull request #10704 from edx/ekolpakov/grade_event_user_id 
Removed user_id parameter from grade event
 2015-12-10 16:10:51 -05:00
Sarina Canelake
e5ad04e370 Merge pull request #10936 from edx/disable-legacy-dash 
Disable Legacy Dash by default
 2015-12-10 16:10:32 -05:00
Bill DeRusha
a164e2fa0a Merge pull request #10934 from edx/release 
Hotfix 2015-12-09a and Hotfix 2015-12-09b
 2015-12-10 15:45:14 -05:00
Sarina Canelake
14ad9d1440 Disable Legacy Dash by default 2015-12-10 15:21:53 -05:00
David Adams
66a52497b4 Remove unused filter field from Randomized Content Block edit form. 2015-12-10 11:48:38 -08:00
David Baumgold
10fd56e86e Save necessary deprecated Sass variables 2015-12-10 14:36:45 -05:00
David Baumgold
b7b1c63b85 Remove unused edge Sass 2015-12-10 14:36:44 -05:00
David Baumgold
79b3e60f66 Override logo for edge.edx.org 2015-12-10 14:36:44 -05:00
Bill DeRusha
75bbed726d Merge pull request #10915 from edx/hotfix/2015-12-09b 
Enrollment API determines best default enrollment if none passed
 2015-12-10 14:28:28 -05:00
Peter Pinch
259de40788 Merge pull request #10353 from mitocw/enhancement/aq/disbale_due_dates_section_unit 
Made CCX schedule configuration sync with studio (Date time management).
 2015-12-10 14:21:20 -05:00
Sven Marnach
252554c9f3 Make xblock-activetable available on edx.org. 2015-12-10 19:18:46 +01:00
Matt Drayer
1e96c81dba Merge pull request #10901 from edx/saleem-latif/SOL-1418 
saleem-latif/SOL-1418: Revised Generate Certificates Section and added Certificate Generation UI
 2015-12-10 12:52:58 -05:00
Tim Krones
7253e3c83e Merge pull request #10932 from open-craft/tim/add-xblock-vectordraw 
Add xblock-vectordraw to requirements.
 2015-12-10 18:31:42 +01:00
Feanil Patel
e2b02137a5 Merge pull request #10927 from edx/feanil/fix_delete_command 
Fix the delete course management command.
 2015-12-10 12:24:05 -05:00
Diana Huang
493defa3b8 Merge pull request #10919 from edx/diana/fix-flaky-course-team-test 
Modify test to be more robust to WrongPageErrors.
 2015-12-10 11:53:10 -05:00
Sarina Canelake
5c0accaaf6 Merge pull request #10900 from stvstnfrd/courseware/enabled 
Remove COURSEWARE_ENABLED flag
 2015-12-10 11:52:49 -05:00
Renzo Lucioni
6d09a5b585 Merge pull request #10923 from edx/renzo/robust-modified-courseware 
Make modifies_courseware robust to exceptions raised during tests
 2015-12-10 11:26:17 -05:00
Feanil Patel
a4006c8604 Add another test and fix existing tests. 2015-12-10 11:12:53 -05:00
Tim Krones
0ea255bd05 Add xblock-vectordraw to requirements. 2015-12-10 17:12:09 +01:00
clrux
b5f190ddbf Merge pull request #10314 from edx/clrux/ac-21 
LMS: Fixing contrast issues in the forums
 2015-12-10 10:45:13 -05:00
Renzo Lucioni
124afe4873 Make modifies_courseware robust to exceptions raised during tests 
Guarantees that SharedModuleStoreTestCase's reset() method is always called, regardless of whether decorated test cases raise exceptions.
 2015-12-10 10:36:21 -05:00
Diana Huang
4db0d9c960 Modify test to be more robust to WrongPageErrors. 2015-12-10 10:35:10 -05:00
Ned Batchelder
a66d05ae69 Merge pull request #9940 from edx/ned/autospec-all-the-things 
Add autospec to more mocks
 2015-12-10 09:47:28 -05:00
Christine Lytwynec
f7368a5243 add AnnotationProblemTypeTest and SymbolicProblemTypeTest 2015-12-10 09:44:18 -05:00
Amir Qayyum Khan
53b22cbf1f Made dates configuration for CCX schedule same as in studio (Course) 2015-12-10 18:45:00 +05:00
Feanil Patel
07f015bb57 Fix the management command. 2015-12-10 08:29:33 -05:00
Peter Pinch
8102bd51b2 Merge pull request #10906 from mitocw/refactor/aq/spacing_indentation_in_schedule.js 
Refactoring: Fixed indentation in ccx/schedule.js plus path of momemt.js for requireJs
 2015-12-10 08:18:13 -05:00
Peter Pinch
f3285f7811 Merge pull request #10672 from mitocw/fix/aq/add_coach_role_on_ccx 
Made coach dashboard available on ccx in addition to master course
 2015-12-10 06:48:09 -05:00
Saleem Latif
3134a76118 Revised Generate Certificates Section and added Certificate Generation history UI. 2015-12-10 16:26:19 +05:00
Amir Qayyum Khan
85c7258ec1 Fixed display name ccx course on coach dashboard 2015-12-10 14:34:01 +05:00
muhammad-ammar
c0479fb79a use users anonymous id for subject field in JWT 2015-12-10 11:56:50 +05:00
Bill DeRusha
005e07cb95 Remove default course mode setting in enrollment api 2015-12-09 19:46:04 -05:00
Bill DeRusha
a30f7656d2 Merge pull request #10916 from edx/hotfix/2015-12-09a 
Enrollment API determines best default enrollment if none passed
 2015-12-09 17:52:14 -05:00
Ned Batchelder
3603ede558 Merge pull request #10870 from edx/ned/new-xblock 
Update XBlock to 0.4.4 (just a packaging change)
 2015-12-09 17:02:49 -05:00
Chris Rodriguez
2cdd0a98a1 Fixing contrast issues in the forums 2015-12-09 15:40:17 -05:00