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

5315 Commits

Author SHA1 Message Date
Sarina Canelake
84a96e40c4 Remove 'Fold It' XModule 2015-12-06 11:38:05 -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
M. Rehan
568bbf9549 Merge pull request #10767 from edx/mrehan/TNL-3821 
fix wiki alertbox style
 2015-12-05 01:05:36 +05:00
Peter Fogg
9401beb837 Merge pull request #10787 from edx/peter-fogg/fa-page 
Add financial assistance page skeleton and Zendesk submission.
 2015-12-04 11:12:06 -05:00
Peter Fogg
66719b1b4a Add financial assistance page. 
Page skeleton and endpoint to submit FA requests to Zendesk.

ECOM-2824
ECOM-3038
 2015-12-04 09:39:22 -05:00
Awais
198d33dc13 New AB Testing URL for checkout page. 
ECOM-2866
 2015-12-04 07:04:59 +00:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05: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
frances botsford
9e1c9ab08c Merge pull request #10605 from edx/frances/reduce-component-padding 
Percent-based padding on course-content
 2015-12-03 12:02:13 -05:00
Chris Rodriguez
deaa044669 Changing blue to pink as was previously there 2015-12-02 12:14:15 -05:00
Chris Rodriguez
68044c4107 LMS: darkening footer copyright text for WCAG 2015-12-02 11:51:47 -05:00
Chris Rodriguez
284b1a0fdf LMS: darkening blue on Studio links 2015-12-02 11:09:11 -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
Muhammad Rehan
f34f7ca32e fix wiki alertbox style 
TNL-3821
 2015-12-01 01:20:33 +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
Clinton Blackburn
c474ce645d Merge pull request #10634 from edx/clintonb/credit-api-drf 
Rewrote Credit API
 2015-11-25 07:58:30 -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
Chris Rodriguez
9e2e9af1f5 LMS: adjusting Wiki alert styles 2015-11-24 14:50:59 -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
Christine Lytwynec
6a92d4cb2b Merge pull request #10639 from edx/clytwynec/remove-firefox-focus-outline-override 
remove reset style for button outlines in firefox
 2015-11-23 11:55:00 -05:00
Peter Pinch
d4d63ece1f Merge pull request #10647 from mitocw/enhancement/aq/email_notification_setting_ccx_enrollment 
Added auto-enroll and email student check boxes to enrollment tab ccx coach dashboard
 2015-11-23 08:18:41 -05:00
Akiva Leffert
bb43407586 Force wrapping for long content like hyperlinks. 
Content that doesn't fit on the screen was causing the viewport to be
the wrong size on mobile devices resulting. This forces wrapping for
long content instead of letting it force the viewport size.

JIRA: https://openedx.atlassian.net/browse/MA-1236
 2015-11-20 17:47:58 -05:00
Frances Botsford
89593fff1f switch course-content to use percent padding on the sides to help mobile 2015-11-20 15:26:01 -05:00
Christine Lytwynec
b96cd65a14 remove reset style for button outlines in firefox 2015-11-20 14:26:16 -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
Amir Qayyum Khan
7bb4980f05 Added auto-enrol and email student check boxes to enrolment tab ccx coach dashboard 2015-11-20 19:22:38 +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
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