Commit Graph

604 Commits

Author SHA1 Message Date
Matt Drayer
f6872a0fa4 Merge pull request #10750 from edx/asadiqbal08/SOL-1417-CSV
SOL-1417 Certs: Allow CSV upload for Cert Exceptions
2015-12-01 10:36:32 -05:00
Matt Drayer
2320d4220c Merge pull request #10748 from edx/saleem-latif/SOL-1389
SOL-1389: Cert Exception: Add error states and messages
2015-12-01 08:23:24 -05:00
Saleem Latif
a8e44b3097 Cert Exception: Add error states and messages 2015-12-01 12:46:04 +05:00
Aamir
a0db0d8297 Merge pull request #10520 from edx/aamir-khan/ECOM-1447-login-error-message
Aamir khan/ecom 1447 login error message
2015-12-01 11:44:31 +05:00
asadiqbal
7c68d80c67 SOL-1417 2015-11-30 14:40:08 +05:00
Zia Fazal
984af512b3 Merge pull request #10656 from edx/saleem-latif/SOL-1390
SOL-1390: Cert Exceptions: View and Edit Exception list
2015-11-25 18:03:33 +05:00
Saleem Latif
764ceb00c8 Cert Exceptions: View and Edit Exception list 2015-11-25 10:02:52 +05:00
Clinton Blackburn
92153752c0 Rewrote Credit API
- API built atop Django REST Framework
- Added support for OAuth 2.0 and session authentication
- Added permissions around eligibility data

ECOM-2609
2015-11-24 22:06:54 -05:00
aamir-khan
df3c3874ed ECOM-1447: Added the custom message if there is an internal server error on ajax call. 2015-11-24 17:31:07 +05:00
Christine Lytwynec
c6f4afc9c9 Header a.dropdown --> button.dropdown 2015-11-23 13:51:00 -05:00
Kevin Falcone
80614a2798 Merge branch 'release' into hotfix-2015-11-20-conflict 2015-11-20 13:13:05 -05:00
Adam Palay
5b5cf7d3b0 Fix login redirect when user is logged out while answering a question (TNL-3789) 2015-11-19 10:28:58 -05:00
Peter Fogg
60f6bbe929 Add correct payment processor messages.
(facepalm)
2015-11-18 14:05:37 -05:00
Peter Fogg
284dc7a3c6 Display an error message if no payment processors are available.
Otto is gaining the ability to temporarily disable payment
processors. If all are disabled, no checkout buttons will appear on
the payment page, and so we need to communicate to the user that they
cann't pay right now but should try again later.

ECOM-2346
2015-11-18 12:55:09 -05:00
Peter Fogg
c8fbadb24a Show a message when logging in with no internet connection.
ECOM-2890
2015-11-13 15:58:14 -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
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
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
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
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
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
cahrens
87f0df3501 Revert to version 2.4 of MathJax.
TNL-3693
2015-10-26 11:28:40 -04:00
aamir-khan
2376bbb4be ECOM-2430: Added the tracking GA events on dashboard 2015-10-23 19:20:23 +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
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
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
Chris Rodriguez
a631a662df Fixing JS tests for the course navigation 2015-10-08 09:43:25 -04:00
Clinton Blackburn
be4f37f26b Credit fixes
- Fixed receipt page button
- Fixed message on dashboard

ECOM-2492
2015-10-06 17:51:39 -04:00
Clinton Blackburn
2653f0ad6b Fixed credit form submission bug
Firefox requires the form to be attached to a DOM element

ECOM-2492
2015-10-06 11:49:45 -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
Andy Armstrong
5316cbee02 Merge pull request #8809 from edx/zoldak/update-sinon
Update Sinon library
2015-09-24 13:17:03 -04:00
clrux
8076da139c Merge pull request #9775 from edx/clrux/ac-147
Addressing contrast and hover states for 'clear filters' button on the find courses page
2015-09-24 12:08:14 -04:00
Chris Rodriguez
e3035a8fab LMS: a11y contrast fixes for find course page 2015-09-24 11:11:07 -04:00
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -04:00
Andy Armstrong
b2a0b2f728 Improve response handling in AjaxHelpers
I've changed the logic so that AjaxHelpers keeps
track of which requests have not yet had mock
responses sent. This ensures that every response
is handled before moving on to the next one,
rather than always handling the last request.
My intention is that this won't allow bugs to creep
in where a request isn't fired and instead the test
responds to an old request. It also should ensure
that extra events aren't accidentally fired.
2015-09-23 20:23:09 -04:00
Andy Armstrong
7280a58711 Merge pull request #9885 from edx/andya/teams-router-testing
Improve team testing of routers
2015-09-23 19:53:30 -04:00