Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
chrisndodge
2301bcbf8f Merge pull request #10403 from edx/afzaledx/MAYN-149_survey_report 
MAYN-149 Survey Report CSV upload for Professional Education courses.
 2015-10-29 18:24:31 -04:00
Afzal Wali
5a11f75a48 Add the ability for self-service course survey reports 2015-10-29 13:26:28 -04:00
Christina Roberts
3382a955c9 Merge pull request #10378 from edx/christina/fix-mathjax-preview 
Disable Fast Preview for version 2.5.
 2015-10-29 12:41:30 -04:00
cahrens
deb4e35f92 Disable Fast Preview for version 2.5. 
Except for the Discussion Tab.
TNL-3693, TNL-3365
 2015-10-29 11:56:08 -04:00
stv
a8d30c5de2 Remove circuit-schematic integration from wiki 2015-10-26 15:51:12 -07:00
stv
d77f31dd38 Remove circuit djangoapp from LMS 
These endpoints (`edit_circuit` and `save_circuit`) had already been
commented out of `urls.py`, so these views were disabled.
 2015-10-26 15:50:29 -07:00
Awais Qureshi
034f201588 Merge pull request #10136 from edx/aamir-khan/ECOM-2430-event-tracking 
ECOM-2430: Added the tracking GA events on dashboard
 2015-10-26 14:46:11 +05:00
Bill DeRusha
60fc3f5705 Conditionally show unenroll action based on certificat status 2015-10-23 14:59:17 -04:00
aamir-khan
2376bbb4be ECOM-2430: Added the tracking GA events on dashboard 2015-10-23 19:20:23 +05:00
Ahsan Ulhaq
04de913dbe Updated Styling for Courses and Existing Messaging 
ECOM-2435
 2015-10-21 15:40:44 +05:00
Tasawer
cc6b498228 remove escaping html for dashboard link 
ECOM-2554
 2015-10-20 13:16:18 +05:00
Sarina Canelake
7b71f95f44 Merge pull request #10007 from open-craft/unenroll-course-name 
Display course name in course unenroll confirmation popup.
 2015-10-19 13:24:55 -04:00
Adam
ab78069a33 Merge pull request #10246 from edx/merge-release-into-master 
Merge release into master
 2015-10-19 11:13:49 -05:00
Matt Drayer
a4cc266c96 Merge pull request #10126 from edx/asadiqbal08/SOL-1288 
asadiqbal08/SOL-1288 Add view of Certs generated to the Instructor Dashboard
 2015-10-19 10:24:07 -04:00
Adam Palay
9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
 2015-10-19 08:35:33 -05:00
asadiqbal
74b082497f SOL-1288 2015-10-19 17:28:10 +05:00
Matjaz Gregoric
9027474659 Use %()s style variable placeholder for cert name. 
Some strings were using both python-style {} placeholders as well
as javascript-style %()s placeholders. That can be confusing for
translators.

Replace the python-style placeholder with a %()s one and interpolate
the value using javascript.
 2015-10-19 11:20:35 +02:00
Matjaz Gregoric
5acd203d63 Display course name in unenroll popup. 
Only the course number was displayed in the course unenrollment
confirmation popup dialog.

Include full course display name to make it more user friendly.
 2015-10-19 11:20:35 +02: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
cahrens
c6ba747419 Make HTML for non-editable views more logical. 
TNL-3297
 2015-10-16 13:40:24 -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
asadiqbal
db547cc6f2 MAYN-116 Including GTM code from microsite 2015-10-15 10:47:35 -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
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
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
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
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
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
mushtaqali
296f75a07c Add template escaping in forums, progress page and course container TNL-2395, TNL-2394, TNL-2393 2015-10-07 11:20:51 -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
openedx-newbie
f69a9288a0 DOC-2268 - Fix instances of "register" on the course about page 
As per DOC-2268, "register" means to create an account on edx.org, and "enroll" means to sign up for a course. Make this change on the page `lms/templates/courseware/course_about.html`.
 2015-10-07 14:14:00 +02:00
Muhammad Shoaib
f876f3f457 SOL-1267 
-fixed the bug in the accordion of the e-commerce html file
 2015-10-07 13:58:46 +05:00
Clinton Blackburn
be4f37f26b Credit fixes 
- Fixed receipt page button
- Fixed message on dashboard

ECOM-2492
 2015-10-06 17:51:39 -04:00
Usman Khalid
130bbd7993 Upgrade to django-pipeline v1.5.3. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Clinton Blackburn
17f0193362 Merge pull request #10044 from edx/merge-release-into-master 
Merging changes for hotfix/2015-10-05
 2015-10-05 16:11:31 -04:00
Clinton Blackburn
f967cfce8b Merged release to master 
Resolved conflicts from hotfix-2015-10-05
 2015-10-05 14:46:32 -04:00
Brian Beggs
0ca679e244 Revert "Upgrade django-pipeline and staticfiles" 2015-10-05 14:40:28 -04:00
Clinton Blackburn
0dba843608 Multiple credit fixes 
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default

Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text

ECOM-2172
 2015-10-05 09:35:10 -04:00