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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frances Botsford
113cab87b8 profile page style cleanup 
remove link style, add pointer, adjust spacing on profile
 2015-10-16 16:35:47 -04:00
Adam
3a61cca7e6 Merge pull request #10195 from edx/hotfix/2015-10-15 
Hotfix/2015 10 15
 2015-10-16 16:25:39 -04:00
Matt Drayer
83734989f9 Merge pull request #10147 from edx/saleem-latif/SOL-1266-feedback-changes 
saleem-latif/SOL-1266: Move Course Number and Course Number Override below Course Title section
 2015-10-16 15:36:33 -04:00
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
Jesse Zoldak
6207de94c3 [fixup] fix quality violations 2015-10-16 14:49:21 -04:00
Giovanni Di Milia
220c1e2934 Fixed pylint violation for files in lms/djangoapps/ccx 2015-10-16 14:15:29 -04:00
cahrens
c6ba747419 Make HTML for non-editable views more logical. 
TNL-3297
 2015-10-16 13:40:24 -04:00
Jesse Zoldak
cfe21a70fa Fix the helpers for Select objects by wrapping them in promises 2015-10-16 13:39:07 -04:00
Adam
5ec3d83d3f Merge pull request #10226 from edx/adam/skip-test-if-third-party-auth-not-installed 
skip LTIConfig test when third_party_auth is not installed
 2015-10-16 13:24:39 -04:00
Adam
387d4f6a2d Merge pull request #10222 from edx/mashtaq/fix-quality-template-escaping 
Fix quality for template escaping
 2015-10-16 12:35:28 -04:00
Adam Palay
9a79bf2ec9 skip LTIConfig test when third_party_auth is not installed 2015-10-16 12:22:54 -04:00
Jesse Zoldak
0f02744c41 Improve acceptance test code for visiting the learner profile page. 2015-10-16 12:13:22 -04:00
Mushtaq Ali
1b49f0cdd7 Fix quality for template escaping 2015-10-16 15:47:11 +00: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
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +05:00
Saleem Latif
5f766f3806 Changes after testing on staging 2015-10-16 10:19:43 +05: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
Frances Botsford
c5a197eb99 possible fix for problem status feedback spacing and partial credit hint 2015-10-15 12:50:22 -04:00
Justin Abrahms
7bf8e2d6c0 Allow uploads from GITHUB_REPO_ROOT 
This is necessary for course imports to not throw a SuspiciousOperation
error.
 2015-10-15 09:48:00 -07:00
Justin Abrahms
82c6ab50d4 Don't double-create temp directories. 2015-10-15 09:47:41 -07: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
Braden MacDonald
a144fddee5 Bump Problem Builder to include fix from pb PR 71 2015-10-15 10:47:36 -04:00
asadiqbal
db547cc6f2 MAYN-116 Including GTM code from microsite 2015-10-15 10:47:35 -04:00
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