Commit Graph

3396 Commits

Author SHA1 Message Date
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
Bill DeRusha
67c322e77e Merge pull request #10946 from edx/bderusha/fa-require-country
Validate country on FA form
2015-12-14 08:36:40 -05:00
Sarina Canelake
5386d0a4ca Merge pull request #10845 from edx/kill-ora1
Remove ORA1: Main Pull Request
2015-12-11 17:31:41 -05:00
Bill DeRusha
5504050abd Validate country on FA form 2015-12-11 17:16:21 -05:00
Clinton Blackburn
2f131fafed Merge pull request #10961 from edx/release
Merging patch/2015-12-11
2015-12-11 15:16:52 -05:00
Sarina Canelake
ef035524bf Disable failing calculator test 2015-12-11 15:07:12 -05:00
Sarina Canelake
92a7ea5dae Remove ORA1 staff grading coffeescript and templates 2015-12-11 15:07:08 -05:00
stv
0532b87a86 Remove ORA1 images 2015-12-11 15:07:07 -05:00
stv
daf359097d Remove ORA1 static assets from LMS 2015-12-11 15:07:07 -05:00
Clinton Blackburn
8fcf574029 Corrected Dashboard Display
- Simplified logic determiningg credit messaging on dashboard
- Fixed bug preventing users from initiating credit request

ECOM-2893
2015-12-11 13:02:28 -05:00
asadiqbal
9a01078088 SOL-1455 enhancement 2015-12-11 14:56:43 +05:00
Kevin Falcone
8b3ea56d93 Merge pull request #10945 from edx/release
Merge down patch-2015-12-10
2015-12-10 21:34:45 -05:00
David Baumgold
10fd56e86e Save necessary deprecated Sass variables 2015-12-10 14:36:45 -05:00
David Baumgold
b7b1c63b85 Remove unused edge Sass 2015-12-10 14:36:44 -05:00
David Baumgold
79b3e60f66 Override logo for edge.edx.org 2015-12-10 14:36:44 -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
clrux
b5f190ddbf Merge pull request #10314 from edx/clrux/ac-21
LMS: Fixing contrast issues in the forums
2015-12-10 10:45:13 -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
Chris Rodriguez
2cdd0a98a1 Fixing contrast issues in the forums 2015-12-09 15:40:17 -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
4117064a2f Added fa factory to rjs bundler 2015-12-07 15:05:38 -05:00
clrux
33928c502c Merge pull request #10797 from edx/clrux/ac-255
LMS: darkening footer copyright text for WCAG
2015-12-07 11:16:37 -05:00
Sarina Canelake
337eabbb00 Merge pull request #10836 from edx/kill-foldit
Remove 'FoldIt' XModule
2015-12-07 10:18:40 -05:00
Awais Qureshi
7b21674852 Merge pull request #10751 from edx/awais786/ECOM-2866-new-checkout-page-for-testing
Awais786/ecom 2866 new checkout page for testing
2015-12-07 14:12:08 +05:00
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