Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,171 Commits 1 Branch 0 Tags
10d2e81833dcf98c5bd7b83c4e40c76e00ae68c9
Commit Graph

34171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
clrux
10d2e81833 Merge pull request #10866 from edx/clrux/ac-245 
Fix: correcting play/skip icon for bumper
 2015-12-07 15:04:42 -05:00
David Baumgold
ad95413c79 Merge pull request #10855 from edx/disable-footer-on-login-page 
Use `disable_footer` variable to disable footer on login page
 2015-12-07 14:07:47 -05:00
Chris Rodriguez
4161ae9980 Tests 2015-12-07 14:05:07 -05:00
Chris Rodriguez
bb3ac95f24 Fix: correcting play/skip icon for bumper 2015-12-07 14:05:07 -05:00
Jim Abramson
98b63a79fc Merge pull request #10862 from edx/jsa/programs-token-endpoint 
Implement an endpoint to get id_tokens for programs.
 2015-12-07 13:49:31 -05:00
Sarina Canelake
a753d1efcf Merge pull request #10856 from edx/remove-unused-translations 
Remove outdated language files
 2015-12-07 13:36:18 -05:00
clrux
678686177c Merge pull request #10801 from edx/clrux/ac-263 
Xmodule: darkening 'correct' green color for WCAG AA requirements
 2015-12-07 13:28:00 -05:00
jsa
2fbfcfd2ff Implement an endpoint to get id_tokens for programs. 
ECOM-2440
 2015-12-07 12:52:00 -05:00
Chris Rodriguez
c7ade04090 Xmodule: darkening 'correct' green color for WCAG AA requirements 2015-12-07 11:59:57 -05:00
Mushtaq Ali
e49f90ed25 Merge pull request #10804 from edx/mushtaq/tnl3825-fix-show-user-course-specific-team 
Fix display course specific user teams
 2015-12-07 21:44:56 +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
clrux
62039f70e3 Merge pull request #10798 from edx/clrux/ac-256 
Xmodule: syncing link color with LMS
 2015-12-07 11:16:15 -05:00
clrux
5cf41a0586 Merge pull request #10800 from edx/clrux/ac-261 
Xmodule: darkening gray text for WCAG AA requirements
 2015-12-07 11:15:42 -05:00
Sarina Canelake
e917c7f5a6 Remove outdated language files 2015-12-07 10:28:27 -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
1d57ef220e Fix course specific user teams in teams dashboard page 2015-12-07 18:46:01 +05:00
Syed Hasan raza
4f131fec9c Merge pull request #10806 from edx/shr/bug/TNL-3076-Handout-links-not-updated-at-import 
Update handout link with current course_id
 2015-12-07 14:13:47 +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
Syed Hassan Raza
706716694a Update handout link with current course_id 2015-12-07 13:21:10 +05:00
Eugeny Kolpakov
e908b569eb Merge pull request #10823 from edx/hash_update/XBlock 
Dependency update: Bumped XBlock version
 2015-12-07 10:37:53 +07:00
Sarina Canelake
af9cff47e5 Merge pull request #10837 from edx/kill-licenses 
Remove "Licenses" djangoapp
 2015-12-06 11:39:15 -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
Nimisha Asthagiri
4a530690e1 Remove unused "has_cert_config" field on CourseDetails. 2015-12-04 16:03:06 -05:00
Nimisha Asthagiri
91153aea83 Update Course About API to include effort and video 
MA-1661
 2015-12-04 16:03:06 -05:00
Nimisha Asthagiri
d6ced072c4 Refactor CourseDetails 2015-12-04 16:03:05 -05:00
Sarina Canelake
92a436b11b Merge pull request #10834 from edx/kill-admin-dash 
Remove admin dashboard (AN-3351)
 2015-12-04 15:41:39 -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
Sarina Canelake
f7e141b147 Remove admin dashboard (AN-3351) 2015-12-04 14:39:19 -05:00
frances botsford
e9a323405b Merge pull request #10609 from edx/frances/adjust-studio-cert-limits 
Add certificates signatory limit help text in Studio
 2015-12-04 13:14:28 -05:00
chrisndodge
2677540543 Merge pull request #10828 from edx/release 
Merge pull request #10725 from edx/rc/2015-11-24
 2015-12-04 13:07:49 -05:00
Feanil Patel
bdd701d29f Merge pull request #10826 from edx/feanil/one_down 
Remove This awful code
 2015-12-04 12:57:05 -05:00
Ned Batchelder
e0ef89ed3c Merge pull request #10827 from edx/ned/20151204-update-translations 
Update translations (autogenerated message)
 2015-12-04 12:25:18 -05:00
Clinton Blackburn
01f0e2e37c Merge pull request #10824 from edx/clintonb/credit-auth-fix 
Corrected permission class and test
 2015-12-04 11:52:27 -05:00
Ned Batchelder
0ff6cb1447 Update translations (autogenerated message) 2015-12-04 16:37:52 +00: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
Feanil Patel
356a175969 Remove This awful code 
We no longer have XML courses so we don't need to compile their coffee script.
 2015-12-04 11:11:01 -05:00
Clinton Blackburn
c90880719f Corrected permission class and test 
- The permission now checks the correct request attribute (GET instead of data).
- The Credit API view test has been updated to check for the positive access instead of just denial.

 ECOM-3096
 2015-12-04 10:18:53 -05:00
Matt Drayer
c41a887762 Merge pull request #10805 from edx/saleem-latif/SOL-1435 
SOL-1435: Add Certificate Regeneration history table.
 2015-12-04 09:56:18 -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
David Baumgold
684239892d Merge pull request #10782 from pomegranited/master 
MA-240 Added window beforeunload handler to the ActiveVideoUploadList…
 2015-12-04 09:17:49 -05:00
Ahsan Ulhaq
2e76517ab3 Merge pull request #10820 from edx/ahsan/ECOM-2929-Update-Track-Selection-page 
Update Track Selection page
 2015-12-04 13:03:11 +05:00
E. Kolpakov
bed4babb5e Bumped XBlock version 2015-12-04 14:43:42 +07:00
Awais
198d33dc13 New AB Testing URL for checkout page. 
ECOM-2866
 2015-12-04 07:04:59 +00:00
Saleem Latif
1e16e873a4 Add Certificate Regeneration history table. 2015-12-04 10:24:02 +05:00