Commit Graph

1537 Commits

Author SHA1 Message Date
Usman Khalid
839b9484d7 Layout fixes required due to styling changes. 2015-12-21 15:42:29 +05:00
Christine Lytwynec
5a4ccabeaf Merge pull request #11011 from edx/clytwynec/ac-156
leanModal fixes
2015-12-17 15:17:51 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Usman Khalid
1c387e4f41 Address review feedback. 2015-12-17 22:10:21 +05:00
Usman Khalid
8bdc097293 Fixes after rebase to Django 1.8 2015-12-17 22:10:21 +05:00
muhammad-ammar
fcbe595c8a Bookmarks List Pagination
TNL-2490
2015-12-17 22:07:34 +05:00
muzaffaryousaf
50a6b3b684 Resolving the jsHint warnings. 2015-12-17 22:07:34 +05:00
muzaffaryousaf
7413484b8d Resolving the moment.js issues
TNL-1958
2015-12-17 22:07:33 +05:00
Muhammad Ammar
1e9907a8c8 Bookmark Events
TNL-1944
2015-12-17 22:07:33 +05:00
muzaffaryousaf
3cbbb8f3b1 Add/Remove Bookmark button to each unit in LMS courseware.
TNL-1957
2015-12-17 22:07:32 +05:00
muhammad-ammar
c9b87aa099 Unit Bookmarks List View
TNL-1958
2015-12-17 22:07:31 +05:00
Matt Drayer
abb8484ec2 Merge pull request #10974 from edx/saleem-latif/SOL-1418-review-changes
SOL-1418: display certificate generate history in reverse chronological order
2015-12-17 00:02:13 -05:00
Peter Fogg
cb1aa0617d Merge pull request #10966 from edx/peter-fogg/fa-support-tool
WIP for financial support tool.
2015-12-16 15:08:59 -05:00
Peter Fogg
a680919e8c Support tool for changing enrollments.
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
2015-12-16 14:17:19 -05:00
Saleem Latif
22653b18d9 Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-16 10:30:02 +05:00
Bill DeRusha
5504050abd Validate country on FA form 2015-12-11 17:16:21 -05:00
asadiqbal
9a01078088 SOL-1455 enhancement 2015-12-11 14:56:43 +05:00
Peter Pinch
259de40788 Merge pull request #10353 from mitocw/enhancement/aq/disbale_due_dates_section_unit
Made CCX schedule configuration sync with studio (Date time management).
2015-12-10 14:21:20 -05:00
Matt Drayer
1e96c81dba Merge pull request #10901 from edx/saleem-latif/SOL-1418
saleem-latif/SOL-1418: Revised Generate Certificates Section and added Certificate Generation UI
2015-12-10 12:52:58 -05:00
Amir Qayyum Khan
53b22cbf1f Made dates configuration for CCX schedule same as in studio (Course) 2015-12-10 18:45:00 +05:00
Peter Pinch
8102bd51b2 Merge pull request #10906 from mitocw/refactor/aq/spacing_indentation_in_schedule.js
Refactoring: Fixed indentation in ccx/schedule.js plus path of momemt.js for requireJs
2015-12-10 08:18:13 -05:00
Saleem Latif
3134a76118 Revised Generate Certificates Section and added Certificate Generation history UI. 2015-12-10 16:26:19 +05:00
Amir Qayyum Khan
a02ca25517 Refactoring: Fixed indentation in ccx/schedule.js plus path of momemt.js for requireJs 2015-12-09 20:20:01 +05:00
AlasdairSwan
46dc9d70ae Finished tests 2015-12-09 10:00:21 -05:00
Matt Drayer
1f2f3de4a2 Merge pull request #10809 from edx/asadiqbal08/SOL-1455
asadiqbal08/SOL-1455 Certs: Revise Exceptions UI
2015-12-09 00:14:26 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release
Release
2015-12-08 15:21:48 -05:00
asadiqbal
aca292de35 SOL-1490 2015-12-08 18:15:47 +05:00
asadiqbal
dfd9b463f0 SOL-1455 2015-12-08 17:51:46 +05:00
alasdairswan
56ba7850a0 Integrated JS with Peter's Django wrapper
Rendering form. Updated form field template to accept instructions for all input types
Added setExtraData function to FormView to allow non-form attributes to be added to the model before saving
2015-12-04 15:54:34 -05:00
Awais
198d33dc13 New AB Testing URL for checkout page.
ECOM-2866
2015-12-04 07:04:59 +00:00
Peter Fogg
8b97ca1b24 Merge pull request #10802 from edx/feature/remove-honor-code-certs
Remove default honor code.
2015-12-03 14:55:30 -05:00
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
Peter Fogg
497622d4b4 Switch default course mode to 'audit'.
ECOM-2972
2015-11-25 11:22:29 -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
Kaloian Doganov
771aaa6c86 Collapse actions dropdown after an action item is clicked.
TNL-3644
2015-11-20 16:23:10 +02: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