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

13945 Commits

Author SHA1 Message Date
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
Usman Khalid
0280b1713f Load jquery-ui by default in LMS suite. 2016-04-22 21:21:21 +05:00
Usman Khalid
51c5b981af Merge pull request #12204 from edx/fedx/krma-conf-tnl4102 
Use Karma as test runner with Jasmine 2.4.
 2016-04-22 20:28:01 +05:00
Ahsan Ulhaq
0cc0a4543f Merge pull request #12213 from edx/ahsan/ECOM-4101-Call-analytics-track-on-receipt-page 
Call analytics.track on receipt page
 2016-04-22 20:06:00 +05:00
Ehtesham
8603026795 making preprocessor files path absolute to have coverage reporter include file only once 2016-04-22 19:09:35 +05:00
Ehtesham
3507792b78 coverage fixes 2016-04-22 19:09:35 +05:00
Usman Khalid
fefc88b084 Post-rebase fixes. 2016-04-22 19:09:34 +05:00
muzaffaryousaf
1b0cda2430 Js test fixes for lms and lms-coffee. 2016-04-22 19:09:33 +05:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms. 
TNL-4102
 2016-04-22 19:09:27 +05:00
Edward Zarecor
9db6b04f2c Merge pull request #11983 from edx/e0d/cookie-updates 
Updating cookies settings
 2016-04-22 07:25:09 -04:00
M. Rehan
d659dd9f6d Merge pull request #12068 from edx/mrehan/sust-40-reduce-peroblem-get-ajax 
SUST-40 – Eliminate unwanted problem_get ajax requests flooding the LMS.
 2016-04-22 14:59:22 +05:00
Ahsan Ulhaq
3bfaf6030f Call analytics.track on receipt page 
ECOM-4101
 2016-04-22 14:31:19 +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
Clinton Blackburn
8f82192abf Merge pull request #12162 from edx/clintonb/jwt-updates 
JWT authentication updates
 2016-04-21 12:24:16 -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
Ned Batchelder
2248bc6c9c Update translations (autogenerated message) 2016-04-21 10:30:10 +00: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
Clinton Blackburn
5a7bc01986 JWT authentication updates 
- Using jwt_decode_handler from edx-drf-extensions
- Updated djangorestframework-jwt
- Removed feature flag around JWT auth

ECOM-4221
 2016-04-20 16:25:25 -04: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 Qureshi
298770e51b Merge pull request #12106 from edx/awais786/ECOM-3199-xseries-certs-view 
Adding background image for xseries certificates on dashboard side bar panel
 2016-04-18 16:22:11 +05:00
tasawernawaz
b4e1e97185 ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 08:48:21 +00: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
Adam
98b8b68d40 Revert "Updated dashboard UI for empty list of courses and programs" (#12166) 2016-04-15 12:46:21 -04: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
Ned Batchelder
a2b06dc617 Merge pull request #12159 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-15 09:41:51 -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
tasawernawaz
00d2d6d20d Merge pull request #12153 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs-updated 
Updated dashboard UI for empty list of courses and programs
 2016-04-15 13:08:24 +05:00
tasawernawaz
ba6ba40e2e ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-15 06:50:03 +00: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
Andy Armstrong
60fab86f01 Reconcile double reverts 
Resolves conflicts between reverts of pattern library test pages and multi-site comprehensive theming, and the re-introduction of pattern library test pages. Fixes a pipeline rendering test which relied on other tests updating assets. The test now ensures that static assets are available before running.
 2016-04-14 23:28:55 -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