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

1144 Commits

Author SHA1 Message Date
Ahsan Ulhaq
9e9c99ac0a Add eligible for financial aid and sync with course discovery 
ECOM-7532
 2017-03-31 14:35:56 +05:00
Eric Fischer
594dcaf4a1 Merge pull request #14780 from edx/efischer/ora_grades 
Clear Student State: ORA/Robust Grades fixes
 2017-03-30 14:27:45 -04:00
Albert (AJ) St. Aubin
79a9984bd9 Merge pull request #14772 from edx/TNL-6603_verified_track_counts 
Added filter to the cohort user count data to show the counts of only
 2017-03-30 13:48:42 -04:00
cahrens
e5035746bf Introduce EnrollmentTrackUserPartition. 
TNL-6674
 2017-03-30 12:24:48 -04:00
Albert St. Aubin
21ef60b4c4 Added filter to the cohort user count data to show the counts of only 
active users
 2017-03-30 12:02:34 -04:00
Eric Fischer
4a90a5df84 Resolve circular dependency issue 2017-03-30 11:08:29 -04:00
Andy Armstrong
ec241774ba Add the staff preview bar to the new course home page 
LEARNER-75
 2017-03-28 21:19:36 -04:00
Nimisha Asthagiri
b1b950c6e6 Merge pull request #14770 from edx/neem/waffle-utils 
Waffle Switch with namespacing and request caching
 2017-03-28 20:07:50 -04:00
Nimisha Asthagiri
4ac78706a3 Waffle Switch with namespacing and request caching 2017-03-28 17:49:20 -04:00
Noraiz Anwar
9d5b6d1563 Merge pull request #14736 from edx/noraiz/ECOM-7522 
ECOM-7522 Fix wrongly failed requirment to earn credit
 2017-03-28 18:08:41 +05:00
noraiz-anwar
570942a96d Fix wrongly failed requirment to earn credit 2017-03-27 16:35:07 +05:00
Andy Armstrong
89e5c0fd8d Convert course bookmarks into a feature 
LEARNER-39
 2017-03-22 16:09:13 -04:00
Ned Batchelder
3bb8061f80 An indicator of the Open edX release line 2017-03-22 12:25:46 -04:00
Joel Barciauskas
6a55ef7920 Merge pull request #14633 from edx/jbarciauskas/remove-newrelic-dep 
Wrap all newrelic dependencies in a check to see if the module is loaded
 2017-03-21 16:28:24 -04:00
J. Cliff Dyer
b89736c75c Add compute_grades management command. 
TNL-6689
 2017-03-21 14:47:33 -04:00
Nimisha Asthagiri
89518d798b Merge pull request #14719 from edx/neem/block-structure-waffle-in-task 
Have generate_course_blocks pass with_storage to celery tasks
 2017-03-20 17:26:05 -04:00
Nimisha Asthagiri
e83182c743 Have generate_course_blocks pass with_storage option to celery tasks 2017-03-20 16:22:44 -04:00
Nimisha Asthagiri
3d769c782a Merge pull request #14723 from edx/neem/block-structure-storage-i4x-keys 
Update BlockStructureModel to support Old Mongo courses
 2017-03-20 15:01:58 -04:00
Cliff Dyer
e34b40f0d3 Merge pull request #14715 from edx/neem/show-rescore 
Ensure ScorableXBlocks have rescore button.
 2017-03-20 14:53:16 -04:00
Nimisha Asthagiri
599982f35d Update BlockStructureModel to support Old Mongo courses 2017-03-20 13:09:04 -04:00
Nimisha Asthagiri
2b0ff8e3a3 Storage-backed Block Structures: Use correct bucket 
TNL-6645
 2017-03-20 00:05:06 -04:00
Nimisha Asthagiri
a2daa8d0fd Move generate_course_blocks to block_structure 2017-03-20 00:04:16 -04:00
J. Cliff Dyer
9ee79a5729 Ensure ScorableXBlocks have rescore button. 2017-03-17 12:40:19 -04:00
Sanford Student
9a44777335 changes is score higher to use gtoe 
for TNL-6644
 2017-03-16 10:25:37 -04:00
Saleem Latif
381d136a06 Add a switch for selecting pagination traversal in edx_api_utils 2017-03-13 16:03:34 +05:00
Clinton Blackburn
4cc7628696 Upgraded to Python Social Auth 0.2.21 to resolve migration issue 2017-03-10 23:06:02 -05:00
Joel Barciauskas
630985b3cc Wrap all newrelic dependencies in a check to see if the module is loaded 2017-03-10 12:22:08 -05:00
Calen Pennington
0c30c06a78 Merge pull request #14656 from edx/release-mergeback-to-master 
Merge release back to master
 2017-03-08 15:23:50 -05:00
Nimisha Asthagiri
1224e341de Revert "Merge pull request #14588 from edx/efischer/kill_stuff" 
This reverts commit 83f2be4929, reversing
changes made to 01ed17426f.
 2017-03-08 13:10:48 -05:00
Noraiz Anwar
b69b586401 Merge pull request #14601 from edx/noraiz/ECOM-6939 
ECOM-6939 Fixed social auth false password-validation error
 2017-03-08 22:15:46 +05:00
noraiz-anwar
1c0ccb2f61 ECOM-6939 Fixed social auth false password-validation error (adding form field) 2017-03-08 20:16:21 +05:00
Ahsan Ulhaq
7712bf3151 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-03-07 22:17:50 +05:00
Mike Dikan
06a6d8525a Removing unused fields on ProgramApiConfig model 
ECOM-7196

Updating model to only include the non-deprecated fields.  This work is a follow on to ECOM-7195 and SHOULD NOT be merged until that PR is merged.
 2017-03-06 16:46:04 -05:00
M. Rehan
f90470a59e Merge pull request #14510 from edx/mrehan/mgmt-cmd-sync-mktg-urls 
MA-3050 – Sync course runs from Catalog service
 2017-03-06 23:21:23 +05:00
Qubad786
7c1f6ff2c0 Mgmt. Command to Sync Marketing Urls from Catalog service 
Introduces a mgmt. command that retrieves course runs from catalog service in order to update marketing urls for the courses found in course metadata cache (i.e. CourseOverview). This also provides an updated utility to retrieve course sharing url.
 2017-03-06 20:12:31 +05:00
Eric Fischer
83f2be4929 Merge pull request #14588 from edx/efischer/kill_stuff 
Kill edx-reverification-block
 2017-03-06 09:29:36 -05:00
Nimisha Asthagiri
0465f6bf4a Merge pull request #14627 from edx/neem/bs_fix_logs 
Fix BlockStructure log statements
 2017-03-03 13:26:11 -05:00
Nimisha Asthagiri
6e61f063fa Merge pull request #14626 from edx/neem/update_bs_version 
Increment BlockStructureBlockData.VERSION
 2017-03-03 12:39:23 -05:00
Nimisha Asthagiri
9c2e5f257c Fix BlockStructure log statements. 2017-03-03 12:20:58 -05:00
Douglas Hall
d70101a256 Merge pull request #14499 from edx/hasnain-naveed/WL-766/front-end 
WL-766 Program marketing page view
 2017-03-03 11:47:36 -05:00
Nimisha Asthagiri
bda2a793ac Increment BlockStructureBlockData.VERSION 2017-03-03 11:42:52 -05:00
Mike Dikan
ca64946b99 Remove deprecated references to ProgramsApiConfig model 
ECOM-7195

The (now deprecated) programs service had several fields to set up configuration of the API.  We are removing the property/field references in codeas the first part of deprecating the model fields.  Also being removed are the model properties.
 2017-03-02 18:07:23 -05:00
Hasnain
d6d2b2d50f Add program marketing view 
This change adds the URL configuration and Django view required
to implement a program marketing page. It is left to theme builders
to implement a template that fulfills their own UX requirements.

WL-766
 2017-03-02 14:38:01 -05:00
Nimisha Asthagiri
952143b776 Block Structure Storage management command 
TNL-6524
 2017-03-02 12:07:26 -05:00
Nimisha Asthagiri
00d466224e Consolidate Block Structure folders 
TNL-6518
 2017-03-01 21:19:28 -05:00
Eric Fischer
7b85c0ea00 Remove in-course reverification 
This is unused, and will no longer be supported on edx.org. Also adds a
DeprecatedModel utility class.

TNL-6126
 2017-03-01 10:46:29 -05:00
Nimisha Asthagiri
090fc12b5a Merge pull request #14512 from edx/beryl/cbs_waffled_manager 
Storage-backed Versioned Block Structures: Manager and Store
 2017-03-01 10:26:56 -05:00
Jesse Shapiro
45eff7efd1 Merge pull request #14574 from open-craft/haikuginger/add-edx-api-collection-option 
[ENT-200] Add many=True kwarg to get_edx_api_data to modify empty return value
 2017-03-01 10:05:38 -05:00
Andy Armstrong
f6876ce199 Merge pull request #13937 from edx/andya/use-ui-blocks 
[WIP] Use web fragments for discussion and static tabs
 2017-03-01 00:36:48 -05:00
Nimisha Asthagiri
1ee2c27f49 Storage-backed versioned Block Structures: Manager and Store 2017-02-28 23:54:57 -05:00