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

33329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
a72425c81d Merge pull request #10170 from mitocw/gdm_fix_pylint_lms.djangoapps.ccx 
Fixed pylint violation for files in lms/djangoapps/ccx
 2015-10-16 15:24:58 -04:00
Giovanni Di Milia
220c1e2934 Fixed pylint violation for files in lms/djangoapps/ccx 2015-10-16 14:15:29 -04:00
Sarina Canelake
d367f7ad1c Merge pull request #10218 from edx/sarina/20151016-update-translations 
Update translations (autogenerated message)
 2015-10-16 10:12:41 -04:00
Sarina Canelake
6e47cbfbca Update translations (autogenerated message) 2015-10-16 09:16:16 -04:00
Matt Drayer
d26d03da82 Merge pull request #10201 from mitocw/gdm_fix_pylint_lms.djangoapps.certificates 
Fixed pylint violation for files in lms/djangoapps/certificates
 2015-10-16 00:15:10 -04:00
Ben Patterson
c54de688e7 Merge pull request #10129 from edx/benp/more-unique-cohort-bokchoy 
Make these tests more unique for multiprocessing.
 2015-10-15 17:56:14 -04:00
Ahsan Ulhaq
da9f0f232c Merge pull request #10183 from edx/ahsan/ECOM-2551-Update-Credit-Eligibility-Table-for-Skips 
Update Credit Requirement Status Table for Skips
 2015-10-16 00:11:38 +05:00
Matt Drayer
f1951df24e Merge pull request #10154 from edx/saleem-latif/SOL-1297 
saleem-latif/SOL-1297: updated message for 500 error on certificate preview
 2015-10-15 13:58:05 -04:00
Christina Roberts
50fd135c61 Merge pull request #10193 from edx/christina/move-require-test 
Clean up of common JS specs using RequireJS.
 2015-10-15 12:53:09 -04:00
Giovanni Di Milia
476f6821de Fixed pylint violation for files in lms/djangoapps/certificates 2015-10-15 12:01:36 -04:00
cahrens
b67f07afc1 Move main_requirejs to live with the requirejs files. 2015-10-15 11:19:27 -04:00
cahrens
a099ff86e5 Move edx.utils.validate. 
The test was not running where it lived before.
 2015-10-15 11:02:12 -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