Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,479 Commits 1 Branch 0 Tags
2ec3bcd22e9a0a4e5ae65c893d09dee09bd12481
Commit Graph

6956 Commits

Author SHA1 Message Date
John Eskew
7eff0eaa5c Fix quality issue. 2016-05-02 13:09:26 -04:00
muhammad-ammar
762a6657fe LMS fixes required to upgrade BackboneJS 2016-05-02 13:09:25 -04:00
Nimisha Asthagiri
3be03d4677 Fix Next Button's 404 error 
MA-2305
 2016-05-02 13:09:24 -04:00
Renzo Lucioni
a74885331b Measuring program progress 
Introduces a utility class for gauging a user's progress towards program completion. Progress data is passed to the ProgramListFactory. ECOM-3200.
 2016-05-02 13:09:24 -04:00
Clinton Blackburn
e344bb6cd8 Updated access token view to return a JWT as an access token 
The JWT includes the user email and username, along with details pulled from the original access token (e.g. scope, expiration).

ECOM-4221
 2016-05-02 13:09:23 -04:00
Waheed Ahmed
5628d162a6 Fixed celery task. 
ECOM-3437
 2016-05-02 13:09:23 -04:00
Brian Jacobel
716062a876 Mako templates return context in .context_data rather than .context 2016-05-02 13:09:21 -04:00
AlasdairSwan
3cbb2d1a08 FEDX-118 Adding header to test page 2016-05-02 13:09:19 -04:00
Waheed Ahmed
921dc602ba Automatically enable Self Generating Certificates for Self Paced Courses. 
ECOM-3437
 2016-05-02 13:09:18 -04:00
John Eskew
e1d8347c21 Fix static tabs test. 2016-05-02 13:08:58 -04:00
John Eskew
6ea91d42b5 Remove another XML course test. 2016-05-02 13:08:58 -04:00
John Eskew
f0c1318041 Add XML_COURSE_DIRS back in. 2016-05-02 13:08:58 -04:00
John Eskew
a08f4d3cc3 Remove non-existent import. 2016-05-02 13:08:58 -04:00
John Eskew
971a198fb9 Remove ModuleStoreEnum.Type.xml 2016-05-02 13:08:57 -04:00
John Eskew
2380fa3c2c Unify usage of a single test mixed modulestore called: 
TEST_DATA_MIXED_MODULESTORE
Remove these test mixed modulestores:
TEST_DATA_MIXED_TOY_MODULESTORE
TEST_DATA_MIXED_CLOSED_MODULESTORE
TEST_DATA_MIXED_GRADED_MODULESTORE
 2016-05-02 13:08:27 -04:00
John Eskew
39ac2579dc Import test course instead of using XML-backed course. 2016-05-02 13:08:26 -04:00
John Eskew
2090f07344 Remove XML-backed course-specific test. 2016-05-02 13:08:26 -04:00
John Eskew
134fb9c269 Import test course instead of using XML-backed course. 2016-05-02 13:08:26 -04:00
John Eskew
4106528e1a Fix toy course textbook test - use Mongo-backed test course. 2016-05-02 13:08:26 -04:00
John Eskew
71d7f1c81b Skip test with static tabs - seems broken. 2016-05-02 13:08:25 -04:00
John Eskew
dd159bce12 Import test course instead of using XML-backed course. 2016-05-02 13:08:25 -04:00
John Eskew
14a8314adc Remove include_xml option. 2016-05-02 13:08:25 -04:00
John Eskew
7987b16a18 Remove XML modulestore code - discovery work 2016-05-02 13:08:25 -04:00
muzaffaryousaf
1b0cda2430 Js test fixes for lms and lms-coffee. 2016-04-22 19:09:33 +05:00
Giovanni Di Milia
090cefcf44 Added REST API for certificates in LMS (#12055) 2016-04-21 17:15:06 -04:00
Renzo Lucioni
1ffa81f746 Retrofit programs data mixin with factories 
This should make it easier to test programs-related features. Preface to ECOM-3200.
 2016-04-21 15:03:38 -04:00
Diana Huang
67c055e23f Merge pull request #12206 from CredoReference/impossible-to-click-check-without-answer 
Make it impossible to click "final check" without selecting a choice
 2016-04-21 11:00:44 -04:00
Awais Qureshi
a3fcc93374 Merge pull request #12192 from edx/revert-12191-revert-12106-awais786/ECOM-3199-xseries-certs-view 
Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel""
 2016-04-21 11:56:49 +05:00
Dmitry Viskov
61127b613b Make it impossible to click "final check" without selecting a choice 2016-04-21 00:15:20 +03:00
Cliff Dyer
f1c4a44928 Merge pull request #12152 from edx/cdyer/oauth-toolkit-allow-inactive 
Fix django-oauth-toolkit email and inactive user issues
 2016-04-20 14:13:55 -04:00
Adam
88192fd444 Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel"" 2016-04-20 19:21:14 +05:00
Adam Palay
9a4f80e5c0 update query for whitelisted users who haven't yet had certs run for them 
remove CertificateStatuses.regenerating
 2016-04-20 09:01:49 -04:00
Adam
bb5874d5a1 truncate email from addresses if >320 chars when encoded (TNL-4264) (#12171) 
* truncate email from addresses if >320 chars when encoded (TNL-4264)

* use exact lengths
 2016-04-20 08:43:26 -04:00
Eric Fischer
47e4804b52 Merge pull request #11941 from CredoReference/invalid-order-in-problem-grade-report-csv 
EdX problem grade report doesn't order problems as shown in course
 2016-04-19 18:38:01 -04:00
Jesse Zoldak
270814102f Revert "Adding background image for xseries certificates on dashboard side bar panel" 2016-04-19 13:52:19 -04:00
sanfordstudent
adcf4a98c7 Merge pull request #12038 from edx/sstudent/seq_item_title_ 
Displaying title of item in course sequence tooltip instead of list of item's children
 2016-04-19 13:32:34 -04:00
Sanford Student
bbcec0cf40 displaying title of sequence item in tooltip instead of children 2016-04-19 10:28:47 -04:00
Ayub khan
0becea942f Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404 
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
 2016-04-19 18:44:13 +05:00
Awais
54058f6e58 Adding background image for xseries certificates on programs dashboard side bar panel. 
ECOM-3199
 2016-04-18 12:50:08 +05:00
Ayub-khan
9e3f68c0a0 -Addressed wrong course id comment. 2016-04-18 12:03:46 +05:00
Dmitry Viskov
0e7a837e11 The problem Grade Report (from the Data Downloads page) must show the problems in the order they occur within the course. 2016-04-17 02:45:02 +03:00
J. Clifford Dyer
28ab627a50 Fix authentication issues with django-oauth-toolkit 
MA-2271
    Allow inactive users to authenticate.
MA-2273
    Provide custom authenticate method that allows users to provide email.
 2016-04-15 16:04:08 +00:00
Adam
7600d9b03d Merge pull request #12139 from edx/fix-certificate-display-issue 
fix issue where the wrong text appeared for certificate generation hi…
 2016-04-15 09:52:27 -04:00
Adam
f1a9f81efa Merge pull request #12148 from edx/add-logging-to-certs 
Add logging to certs
 2016-04-15 08:38:31 -04:00
Ayub-khan
ef70d017c8 -fixed failing tests 
-Adressed all comments
 2016-04-15 15:40:21 +05:00
Renzo Lucioni
5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master 
Manually merge release into master
 2016-04-15 00:47:54 -04:00
Christina Roberts
08a8164201 Merge pull request #12155 from edx/christina/allow-multiple-random-cohorts 
Allow multiple random cohorts.
 2016-04-14 17:49:37 -04:00
cahrens
1cd54d5fb7 Rename "is_default_cohort" method. 2016-04-14 16:38:34 -04:00
Simon Chen
582debcd58 Merge pull request #12135 from edx/schen/ECOM-3195 
ECOM-3195 Edit the navigation header on dashboard to expose program listing page
 2016-04-14 15:51:19 -04:00
Simon Chen
75951b5936 ECOM-3195 Edit the navigation header on dashboard to expose program listing page 2016-04-14 14:44:40 -04:00