Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,074 Commits 1 Branch 0 Tags
90f2fb868e0646733fad8ec615af2d2dec11801e
Commit Graph

35074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertrand Marron
a8f25492d7 Remove shoppingcart default date values 
The previous value means that those dates would have the value of
whenever the models were imported.

Reference TNL-3611
 2015-10-15 10:31:21 -04:00
Matt Drayer
3e5ad2989c Merge pull request #10115 from edx/ziafazal/SOL-1254 
ziafazal/SOL-1254: Student should see rest of courseware as soon as Entrance Exam is passed
 2015-10-15 10:18:21 -04:00
Ahsan Ulhaq
7fa9d73a4c Update Credit Eligibility Table for Skips 
ECOM-2551
 2015-10-15 19:03:07 +05:00
Saleem Latif
466abcdce4 updated message for 500 error on certificate preview 2015-10-15 10:46:11 +05:00
Matt Drayer
6fb89fee5a Merge pull request #10159 from mitocw/gdm_fix_pylint 
Fixed pylint violations for files in lms/
 2015-10-14 17:06:22 -04:00
Matt Drayer
927dc10255 Merge pull request #10169 from mitocw/gdm_fix_pylint_lms.djangoapps.bulk_email 
Fixed pylint violation for files in lms/djangoapps/bulk_email
 2015-10-14 15:40:34 -04:00
Matt Drayer
744c10251f Merge pull request #10160 from mitocw/gdm_fix_pylint_lms.djangoapps.branding 
Fixed pylint violations for files in lms/djangoapps/branding
 2015-10-14 15:38:02 -04:00
Giovanni Di Milia
08dfe5e99f Fixed pylint violation for files in lms/djangoapps/bulk_email 2015-10-14 14:45:32 -04:00
Giovanni Di Milia
ecdb0b271f Fixed pylint violation for files in lms/djangoapps/branding 2015-10-14 14:32:56 -04:00
Giovanni Di Milia
ddc4683335 Fixed pylint violation for files in lms/ 2015-10-14 14:31:22 -04:00
Matt Drayer
3e89af3a22 Merge pull request #10161 from edx/mattdrayer/update-gencert-modes 
mattdrayer/update-gencert-modes: Added prof-ed modes to set
 2015-10-14 14:00:09 -04:00
Matt Drayer
6dfa81e58a mattdrayer/update-gencert-modes: Added prof-ed modes to set 2015-10-14 12:36:27 -04:00
Sarina Canelake
2b5810db9b Merge pull request #10144 from justinabrahms/fail-fast-flag-description-fix 
Fix help description for test's --fail_fast flag
 2015-10-14 10:53:55 -04:00
Justin Abrahms
ac35571ab2 Add myself to the AUTHORs file. 2015-10-14 07:05:44 -07:00
raeeschachar
e72feeadc1 Merge pull request #10137 from edx/chrome-bok-choy-all-tests-in-own-learner-profile-page-test 
Fixed all tests in OwnLearnerProfilePageTest that were failing on Chrome
 2015-10-14 17:47:19 +05:00
Fred Smith
6f08eb0f15 Merge pull request #10131 from open-craft/fix-microsite-import 
Fix staticfiles import in microsite.py.
 2015-10-14 08:42:06 -04:00
Zia Fazal
2d1ff75ba0 added user’s pass status to problem_check response if problem is in 
Entrance Exam.

unit test to check presence of entrance_exam_passed

changed based on Matt's feedback

changes after Asad's feedback
 2015-10-14 15:38:18 +05:00
wajeeha-khalid
f49461c2ed Merge pull request #10124 from edx/jia/MA-1240 
MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity
 2015-10-14 14:30:31 +05:00
wajeeha-khalid
b5c74652aa MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity 2015-10-14 11:06:21 +05:00
Justin Abrahms
86864116e1 Fix help description for test's --fail_fast flag 2015-10-13 15:17:27 -07:00
frances botsford
a2bb8ed96c Merge pull request #10120 from edx/frances/fix/repo-cert-template-bugs 
Platform Web Cert template fixes
 2015-10-13 16:51:56 -04:00
Ben Patterson
7adb02ee79 Make these tests more unique for multiprocessing. 2015-10-13 11:41:49 -04:00
David Baumgold
a0f5a006b8 Merge pull request #10117 from edx/db/upgrade-paver 
Upgrade Paver to 1.2.4
 2015-10-13 11:11:41 -04:00
raeeschachar
b0fd47131e Fixed all tests in OwnLearnerProfilePageTest that were failing on Chrome 2015-10-13 19:36:44 +05:00
Matt Drayer
82a1989a4b Merge pull request #10112 from edx/saleem-latif/SOL-1281 
SOL-1281: Setup/conduct automated testing for SOL-1196
 2015-10-13 10:24:54 -04:00
Sarina Canelake
65aacc1adf Merge pull request #10078 from openedx-newbie/doc-2268 
DOC-2268 - Fix instances of "register" on the course about page
 2015-10-13 10:21:21 -04:00
raeeschachar
0369a2454e Merge pull request #10132 from edx/chrome-bok-choy-test-as-student-in-alpha-plus-beta 
Fixed test, test as student in alpha and beta failing on chrome
 2015-10-13 19:16:33 +05:00
Frances Botsford
c8c9eb3611 remove linebreaks import from web certs 2015-10-13 09:39:37 -04:00
raeeschachar
b69cbfa100 Fixed test as student in alpha and beta failing on chrome 2015-10-13 15:50:46 +05:00
Saleem Latif
b55dee8f2e Bok-Choy test added for SOL-1196 to verify no black box around view certificate note in Progress Tab 2015-10-13 15:13:28 +05:00
Matjaz Gregoric
a9d8678ed0 Fix staticfiles import in microsite.py. 
django-staticfiles was replaced with django.contrib.staticfiles
in dbcd1bf430.

The common/djangoapps/microsite_configuration/templatetags/microsite.py
file was still trying to import the old staticfiles package,
breaking the app on fresh installations.
 2015-10-13 11:20:49 +02:00
Awais Jibran
884569a54c Merge pull request #9862 from edx/aj/plat833-orphan-problem-with-preview-button 
Orphans in split breaks preview button in Studio
 2015-10-13 11:57:27 +05:00
wajeeha-khalid
39b9191456 Merge pull request #9784 from edx/jia/MA-1248 
MA-1248 - Mobile API: return discussion URL in course enrollment API
 2015-10-13 11:55:48 +05:00
wajeeha-khalid
2c3d64a535 Update users.rst 2015-10-13 11:54:46 +05:00
raeeschachar
8de4d87555 Merge pull request #10128 from edx/chrome-bok-choy-test-about-me-field 
Fixed test about me field test failing on chrome
 2015-10-12 22:21:47 +05:00
Zubair Afzal
5b07be58cd Merge pull request #10111 from edx/zub/story/ecom-2450-adjust-credit-eligibility-email-content 
minor changes in credit eligibility notification
 2015-10-12 19:49:09 +05:00
zubair-arbi
2d1247be49 minor changes in credit eligibility notification 
ECOM-2450
 2015-10-12 18:54:54 +05:00
raeeschachar
652d3466c1 Fixed test about me field test failing on chrome 2015-10-12 18:28:29 +05:00
Awais Jibran
2813b1269e Published orphans in split breaks preview button in Studio 2015-10-12 15:00:49 +05:00
Christina Roberts
69c47e0951 Merge pull request #10121 from edx/christina/delete-old-mathjax 
Delete old, unused version of MathJax.
 2015-10-09 16:20:18 -04:00
Sarina Canelake
98a82a89a0 Merge pull request #10089 from edx/oppia-block 
Add Oppia XBlock OSPR-778 DOC-2324
 2015-10-09 15:24:58 -04:00
cahrens
5c12890da5 Delete old, unused version of MathJax. 
This version was from 2012.
 2015-10-09 15:24:15 -04:00
Frances Botsford
06df341f56 web cert template rendering - adjust signature image sizing 2015-10-09 15:12:50 -04:00
Frances Botsford
40170dbf7c adjust platform web cert print style to look like web rendering; fix signatory layouts 2015-10-09 15:12:50 -04:00
Sarina Canelake
a693feb836 Add Oppia XBlock 2015-10-09 14:41:27 -04:00
Christina Roberts
e884c65aa6 Merge pull request #10106 from edx/christina/tnl-2667 
Fix flaky Studio Course Team bok choy tests
 2015-10-09 11:43:57 -04:00
Christina Roberts
c1ba907b40 Merge pull request #10109 from edx/christina/tnl-1590 
Remove skip from test_annotatable
 2015-10-09 11:42:04 -04:00
David Baumgold
6c68b19f70 Upgrade Paver to 1.2.4 2015-10-09 11:30:53 -04:00
David Baumgold
34ac9db328 Merge pull request #10021 from mitocw/enhancement/aq/remove_gradebook_draging 
Add scrolling with dragging and added tool tip to student record.
 2015-10-09 10:59:55 -04:00
wajeeha-khalid
90fe71dbfe MA-1248 - CourseEnrollmentAPI: added discussion URL 2015-10-09 19:04:55 +05:00