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

3328 Commits

Author SHA1 Message Date
Peter Fogg
c8fbadb24a Show a message when logging in with no internet connection. 
ECOM-2890
 2015-11-13 15:58:14 -05:00
Peter Pinch
fd8b757c90 Merge pull request #10250 from mitocw/feature/aq/add_pagination_gradebook 
Added pagination on grade book.
 2015-11-13 12:37:34 -05:00
Amir Qayyum Khan
3ee5acfc00 Added error message incase user specified start or due date without time and also added start date and due date comparison validation in ccx coach dashboard validation. 2015-11-13 20:25:19 +05:00
Matt Drayer
31c5b94548 Merge pull request #10518 from edx/saleem-latif/SOL-1333 
SOL-1333: Add Cert Regenerate UI on Instructor Dash
 2015-11-10 12:20:07 -05:00
Amir Qayyum Khan
44b409ebff Added pagination on grade book. 2015-11-10 15:18:15 +05:00
Saleem Latif
094ed32176 Added ability to regenerate certificates from Instructor Dashboard 2015-11-10 15:14:55 +05:00
louyihua
73d8f06499 Fix gettext guidance violation 
1. No string concatenation should be used in the gettext function.
2. Some extra parentheses should be used in coffee script, to avoid the following situation: in coffee script, the call ```gettext "text to be extracted" + "text should not be extracted"``` will be translated into ```gettext("text to be extracted" + "text should not be extracted")``` rather than ```gettext("text to be extracted") + "text should not be extracted"```.
 2015-11-07 13:55:10 +08:00
Peter Fogg
270dc22c1f Update display of dates on Course Home page. 
Adds UTC time to the "Today's Date" block, and a fuzzy/relative
timestamp to all other displayed dates.

ECOM-2807
 2015-11-06 09:54:13 -05:00
chrisndodge
6daa5a631f Merge pull request #10489 from edx/cdodge/button-style-fixes 
(WIP) Proctoring: fix sass and use updated edx-proctoring version
 2015-11-05 07:19:40 -05:00
Chris Dodge
cfbb24837e fix sass and use updated edx-proctoring version 2015-11-03 13:21:37 -05:00
Sarina Canelake
1172a49580 Merge pull request #10445 from stvstnfrd/chat 
Remove chat feature
 2015-11-03 11:11:23 -05:00
Matt Drayer
fc77a6eae7 Merge pull request #10363 from edx/saleem-latif/SOL-1315 
SOL-1315: Add Cert Exception UI on Instructor Dash
 2015-11-03 10:09:19 -05:00
Saleem Latif
99bd47e9a8 Add Cert Exception UI on Instructor Dash 2015-11-03 12:52:22 +05:00
stv
3a2c0e37dc Remove chat feature 
This was originally contributed upstream by Stanford, circa 2013.

We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.

Do you use this feature?

Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.

[1] dbe52a6b13
 2015-11-02 14:08:58 -08:00
Peter Fogg
27be371a2c Merge pull request #10430 from edx/peter-fogg/date-summary-blocks 
Date summary blocks.
 2015-11-02 12:42:36 -05:00
Matjaz Gregoric
3320ecf418 Move unenroll messages into separate data attributes. 
Having the messeges embedded into onclick attributes was fragile because
it could break if the translated string contained special characters
such as single quotes.

Rather than trying to escape the special characters inside the onclick handler,
move the translatable strings into separate h-escaped data attributes and interpolate
the values in the (already existing) jQuery click handler rather than in the
inline onclick handler.

This makes the javascript code more consistent as well as fixes the problem
where the popup would break if translation included single quotes.
 2015-11-02 17:21:28 +01:00
Peter Fogg
d7417d62cc Date summary blocks on the course home page. 
Enabled behind the
`SelfPacedConfiguration.enable_course_home_improvements` flag.

ECOM-2604
 2015-11-02 10:49:18 -05:00
Ahsan Ulhaq
bab065d825 Reimplemented text changes for dashboard 2015-10-30 23:53:22 +05:00
Ahsan Ulhaq
c47311b11f Add the html and css and backend changes required for the xseries. 2015-10-30 20:59:26 +05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
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
Sarina Canelake
2206b8a056 Merge pull request #10324 from stvstnfrd/debt/circuit 
Remove circuit djangoapp from LMS
 2015-10-29 11:15:15 -04:00
Clinton Blackburn
9bb3f703d7 Updated receipt page to use order endpoint 
The receipt page now retrieves data for orders instead of baskets. Going forward baskets will be deleted after an order has been placed, so there should be no permanent references to baskets. Orders will continue to be persisted permanently.

ECOM-2653
 2015-10-28 12:12:57 -04:00
Michael Frey
bb53cad0fa Merge pull request #10377 from edx/release 
Release
 2015-10-27 13:10:49 -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
cahrens
87f0df3501 Revert to version 2.4 of MathJax. 
TNL-3693
 2015-10-26 11:28:40 -04: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
aamir-khan
2376bbb4be ECOM-2430: Added the tracking GA events on dashboard 2015-10-23 19:20:23 +05:00
Frances Botsford
feacd0fb9f allow discussion post styles to be used in the teams space 2015-10-22 16:16:46 -04:00
Ahsan Ulhaq
ce5f79016d Merge pull request #10103 from edx/ahsan/ECOM-2435-Updated-Styling-for-Courses-Existing-Messaging 
Updated Styling for Courses and Existing Messaging
 2015-10-22 20:36:38 +05:00
Ahsan Ulhaq
04de913dbe Updated Styling for Courses and Existing Messaging 
ECOM-2435
 2015-10-21 15:40:44 +05:00
cahrens
5a043e5a12 Ignore line length. 2015-10-20 11:54:09 -04:00
cahrens
90b61f8ef8 Upgrade to MathJax 2.5. 
TNL-3495
 2015-10-20 11:54:09 -04: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
asadiqbal
74b082497f SOL-1288 2015-10-19 17:28:10 +05: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
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
cahrens
c6ba747419 Make HTML for non-editable views more logical. 
TNL-3297
 2015-10-16 13:40:24 -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
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
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