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

6923 Commits

Author SHA1 Message Date
Sarina Canelake
2431baff8f Remove notification_image_for_tab logic (ORA1) 2015-12-11 15:07:08 -05:00
Sarina Canelake
92a7ea5dae Remove ORA1 staff grading coffeescript and templates 2015-12-11 15:07:08 -05:00
Sarina Canelake
76095c6f78 Remove ORA1 LMS templates 2015-12-11 15:07:06 -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
Nimisha Asthagiri
c14c146d0e Merge pull request #10841 from edx/mobile/optimize-course-api 
Optimize Course Catalog using CourseOverview
 2015-12-11 10:03:35 -05:00
Bill DeRusha
094f770962 Merge pull request #10944 from edx/bderusha/hcfa-legal-copy 
Update Financial Aid copy.
 2015-12-11 09:03:00 -05:00
asadiqbal
9a01078088 SOL-1455 enhancement 2015-12-11 14:56:43 +05:00
Nimisha Asthagiri
2b8441a072 Update Course Catalog to use CourseOverview 2015-12-10 20:37:50 -05:00
David Ormsbee
deb291464a Merge pull request #10903 from open-craft/staff-debug-everywhere 
Remove staff debug category type whitelist.
 2015-12-10 16:54:24 -05:00
Bill DeRusha
55810061b3 Update Financial Aid copy. 2015-12-10 16:20:22 -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
Saleem Latif
3134a76118 Revised Generate Certificates Section and added Certificate Generation history UI. 2015-12-10 16:26:19 +05:00
AlasdairSwan
46dc9d70ae Finished tests 2015-12-09 10:00:21 -05:00
Matjaz Gregoric
bb25473a7c Remove staff debug category type whitelist. 
Show the 'Staff debug' button on all blocks, including custom xblocks.

Staff debug was only available on selected components for historical reasons,
because it used to be much more intrusive.
 2015-12-09 10:45:32 +01: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
David Baumgold
11b3d9399d Disable footer on finish_auth.html 2015-12-08 11:29:42 -05:00
asadiqbal
dfd9b463f0 SOL-1455 2015-12-08 17:51:46 +05:00
Peter Fogg
c84258d84e Merge pull request #10858 from edx/bderusha/hcfa-language 
Update copy for HCFA & don't show audit certs
 2015-12-07 14:58:53 -05:00
Bill DeRusha
692e5d777a Update copy for HCFA 
Update Zendesk ticket to correctly add group.

Add logic to hide new audit certs
 2015-12-07 14:18:55 -05:00
David Baumgold
1a2ffbda68 Disable footer for courseware-chromeless.html 2015-12-07 13:54:23 -05:00
Adam
0f3a0946dd Merge pull request #10859 from edx/mushtaq/moment-requirejs-loading-fix 
Load requirejs-config before module-js
 2015-12-07 12:20:56 -05:00
David Baumgold
f4023e821f Use disable_footer variable to disable footer on login page 
Rather than Mako block hack
 2015-12-07 10:39:42 -05:00
David Baumgold
72fc25ae12 Use disable_footer variable to disable footer on login page 
Rather than Mako block hack
 2015-12-07 10:26:47 -05:00
Sarina Canelake
337eabbb00 Merge pull request #10836 from edx/kill-foldit 
Remove 'FoldIt' XModule
 2015-12-07 10:18:40 -05:00
Mushtaq Ali
06442036ce Load requirejs before module-js 2015-12-07 16:26:37 +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
Sarina Canelake
af8a0bb676 Remove "Licenses" djangoapp 2015-12-06 10:55:15 -05:00
Sarina Canelake
2cfeb34f45 Merge pull request #10825 from edx/kill-psycho 
Remove psychometrics app
 2015-12-04 17:23:20 -05:00
Nimisha Asthagiri
7429a32ba8 Merge pull request #10799 from edx/mobile/course-api-fields-MA-1661 
Update Course About API to include effort and video (MA-1661)
 2015-12-04 17:17:21 -05:00
Sarina Canelake
e932632b49 Remove psychometrics app 2015-12-04 16:37:34 -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
Sarina Canelake
f7e141b147 Remove admin dashboard (AN-3351) 2015-12-04 14:39:19 -05:00
Nimisha Asthagiri
d170c92f3b Refactor course_image_url 2015-12-04 11:25:40 -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
Bill DeRusha
4b94d6367a Update dashboard banners and track selection for audit track 
Remove cert messaging from audit cert/grade info partial

move enrollment display method to helpers
 2015-12-03 13:22:08 -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
Michael Frey
29b6ccf5e4 Added new Course List API. 2015-11-24 15:54:03 +00:00
Ahsan Ulhaq
d729e97f50 Merge pull request #10658 from edx/ahsan/ECOM-2897-Update-help-text-for-Name-field-in-edx-registration 
Update help text for Name field in edx registration
 2015-11-24 19:41:00 +05:00