Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
33,343 Commits 1 Branch 0 Tags
80abf159eeaea9be815693fd345eddf2255ce8cb
Commit Graph

12550 Commits

Author SHA1 Message Date
Matt Drayer
d7c8cb803a Merge pull request #10238 from edx/saleem-latif/SOL-1297-feedback-changes 
SOL-1297: Remove platform name from error message in Certificates Web View
 2015-10-19 09:53:42 -04:00
Matt Drayer
c30960cc85 Merge pull request #10215 from edx/ziafazal/SOL-1317 
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
 2015-10-19 09:47:20 -04:00
Matt Drayer
b4ff9f882b Merge pull request #10146 from edx/saleem-latif/SOL-1257 
saleem-latif/SOL-1257: Resetting student history for Entrance Exam on instructor dashboard
 2015-10-19 09:45:20 -04:00
Saleem Latif
12b245a386 Remove milestones when instructor clears a student's entry exam data 2015-10-19 12:39:22 +05:00
Saleem Latif
3502738bac feedback changes 2015-10-19 11:10:21 +05:00
Christina Roberts
300bd43172 Merge pull request #9845 from edx/christina/bio-hyperlink 
Make HTML for non-editable views on leaner profile page more logical
 2015-10-16 19:03:47 -04:00
Frances Botsford
113cab87b8 profile page style cleanup 
remove link style, add pointer, adjust spacing on profile
 2015-10-16 16:35:47 -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
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +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
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
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
6dfa81e58a mattdrayer/update-gencert-modes: Added prof-ed modes to set 2015-10-14 12:36:27 -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
b5c74652aa MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity 2015-10-14 11:06:21 +05: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
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
Frances Botsford
c8c9eb3611 remove linebreaks import from web certs 2015-10-13 09:39:37 -04: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
zubair-arbi
2d1247be49 minor changes in credit eligibility notification 
ECOM-2450
 2015-10-12 18:54:54 +05: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
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
Matt Drayer
06129ada30 Merge pull request #8788 from edx/mattdrayer/eliminate-base-distinguished 
mattdrayer/eliminate-base-distinguished: Switch back to honor/verified
 2015-10-09 09:36:08 -04:00
Matt Drayer
31cbef709a mattdrayer/eliminate-base-distinguished: Switch back to honor/verified 
* talbs: Remove obsolete stuff
* frrrances: remove base and distinguished sass references and image assets
* mattdrayer: Cleaned up JSON syntax for test setups
 2015-10-09 00:29:42 -04:00
Amir Qayyum Khan
8b6c3757fe Removed dragging and added tool tip to student record. 
Clarify and reformat some comments; rename a few functions to clarify those.

Convert tabs to spaces.

Fix inaccurate comment

Fixed jshint issues

Adjust how user-select is applied to the gradebook view. Add i18n for a string.

Allow selection when not dragging.
 2015-10-08 15:47:10 -04:00
clrux
f6d3471106 Merge pull request #10086 from edx/clrux/ac-76-test-cleanup 
Fixing JS tests for the accordion navigation
 2015-10-08 12:17:21 -04:00
openedx-newbie
895f4a36b2 Fix enrollment terminology in about page tests 2015-10-08 18:00:12 +02:00
Chris Rodriguez
a631a662df Fixing JS tests for the course navigation 2015-10-08 09:43:25 -04:00
Peter Pinch
ec023c22e6 Merge pull request #10034 from mitocw/fix/gdm/hide_block_from_ccx 
Fixed visibility of hidden blocks in CCX schedule
 2015-10-08 08:54:02 -04:00
Matt Drayer
6b93532c63 Merge pull request #10077 from edx/ziafazal/SOL-1258 
SOL-1258: Percentage appearing wrong for specific numbers
 2015-10-08 08:28:08 -04:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Zia Fazal
14c310017b minimum score percentage rounded 
round before converting a decimal into integer
 2015-10-08 12:01:40 +05:00
frances botsford
416ab258ee Merge pull request #9879 from edx/frances/cleanup-on-demand-box-style 
Align On-demand cert message with pattern library styles
 2015-10-07 16:39:48 -04:00
Calen Pennington
624bc9a734 Merge pull request #9911 from cpennington/fix-plat-858 
Delete DIRECT_ONLY_CATEGORIES from both draft and published branches by default
 2015-10-07 14:41:40 -04:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test 
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
 2015-10-07 11:22:48 -04:00
Clinton Blackburn
c1686a939c Merge pull request #10072 from edx/release 
Hotfixes for 2015-10-06
 2015-10-07 10:09:03 -04:00