Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

10211 Commits

Author SHA1 Message Date
AlasdairSwan
588e1db629 ECOM-583 Fixes the CSS bugs 2014-11-04 14:56:34 -05:00
Renzo Lucioni
5d110273a9 Merge pull request #5834 from edx/renzo/fix-track-selection-copy 
Fix track selection header copy
 2014-11-04 14:03:05 -05:00
Renzo Lucioni
fca44138dd Flip order of register and login options in the access view 2014-11-04 13:59:44 -05:00
Renzo Lucioni
17a3f556fb Fix track selection header copy 2014-11-04 13:54:31 -05:00
Dennis Jen
b27401554c Feature flagged enrollment counts on instructor dashboard. 
* enrollments counts removed from legacy dashboard
 2014-11-04 12:56:53 -05:00
Sarina Canelake
fece2b9dd2 Merge pull request #5821 from edx/sarina/remove-old-admin-files 
Remove admin files deprecated in Django 1.4
 2014-11-04 10:55:13 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8 
Remove more pep8 violations
 2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Omar Al-Ithawi
b79180bb97 Fixed spacing of RTL icon in discussion 2014-11-04 14:30:23 +02:00
Sarina Canelake
aeb3a7f575 fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 2014-11-03 16:49:18 -05:00
Gabe Mulley
821c97fbb4 Implement shim for mobile video events. 
This PR addresses the following issues:

1) All requests return a 200 OK unless there is an authorization failure. This is deliberate in case the secret key is compromised.
2) Push all of the nasty logic necessary to generate compatible video events into the LMS instead of trying to do that mapping on the mobile devices.
3) Stop using the deprecated "action" field in the segment.io event. According to their support team this field should not be used anymore and is just around for backwards compatibility reasons.

Fixes: AN-3818
 2014-11-03 14:12:07 -05:00
Clinton Blackburn
22952af61f Merge pull request #5782 from edx/remove-analytics-demographics 
Updates to Demographics Display
 2014-11-03 10:07:31 -05:00
Sarina Canelake
15495e6ff3 Remove old 404 page 2014-11-01 00:13:06 -04:00
Sarina Canelake
6a06ff6a75 Remove unused static assets 2014-11-01 00:11:23 -04:00
Sarina Canelake
ed76907c0d Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4

Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
 2014-11-01 00:01:17 -04:00
Chris Dodge
805a8a5797 rename file 2014-10-31 15:20:30 -04:00
Carlos Andrés Rocha
6ad235f5db Ignore errors during cleanup of course export command. 2014-10-31 15:20:17 -04:00
Martyn James
9f3b9c7ba3 Merge pull request #5818 from edx/release 
Merging latest updates to release
 2014-10-31 14:49:04 -04:00
chrisndodge
640072a646 Merge pull request #5804 from edx/cdodge/fix-receipt-link 
fix the link in the button on the receipt page
 2014-10-31 14:01:40 -04:00
Adam
47c445db4e Merge pull request #5794 from edx/adam/shorten-title-width 
courseware header bar should not overflow shopping cart button TNL-722
 2014-10-31 10:52:38 -04:00
frances botsford
6986715951 Merge pull request #5750 from edx/frances/fix/receipt-layout-fixes 
Verified Receipt page layout fixes
 2014-10-31 10:09:34 -04:00
Feanil Patel
7d2a2f896c Merge pull request #5291 from fmyzjs/s3_storgae 
When s3fs cannot be accessed replaced with osfs
 2014-10-31 09:52:02 -04:00
Calen Pennington
b4562ffe6b Merge pull request #5783 from cpennington/proxy-through-module-system-to-descriptor-system 
Fix PLAT-191
 2014-10-31 09:31:13 -04:00
Chris Dodge
684d67654b add missing file 2014-10-31 09:22:53 -04:00
muhammad-ammar
fcaa783e43 Unit Test Improvements 
TE-489
 2014-10-31 11:55:13 +00:00
Chris Dodge
6fcfb2a6a3 allow for a customized region on the receipt page that is microsite brand specific 2014-10-30 22:17:02 -04:00
Chris Dodge
8b25a4c1cb fix the link in the button on the receipt page 2014-10-30 21:10:22 -04:00
Jim
3ceb0e5c6a Commenting out flaky string input test case 2014-10-30 14:33:36 -07:00
Diana Huang
47979e5bcf Add tests for the enrollment_interface 2014-10-30 17:15:26 -04:00
Diana Huang
fc468bf696 Set up basic enrollment infrastructure. 2014-10-30 17:15:26 -04:00
Renzo Lucioni
471f513566 Merge pull request #5770 from edx/renzo/logistration-i18n 
i18n logistration
 2014-10-30 14:20:08 -04:00
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Adam Palay
6a40ed1d74 courseware header bar should not overflow shopping cart button TNL-722 2014-10-30 12:16:56 -04:00
Daniel Friedman
8b73de9123 Merge pull request #5728 from edx/dan-f/grade-export-split-test 
Verify grade export works for problems in split tests
 2014-10-30 11:04:54 -04:00
Daniel Friedman
9bf22ea9fe Verify grade export works for problems in split tests 
TNL-41
 2014-10-30 09:58:16 -04:00
AlasdairSwan
ff753f2bcb Merge pull request #5784 from edx/alasdair/rwd-header-and-footer 
Alasdair/rwd header and footer
 2014-10-30 09:21:21 -04:00
AlasdairSwan
0c22db688f ECOM-406 removed commented out code, moved colours to variables and fixed hover state for mobile menu 2014-10-30 09:20:48 -04:00
Nimisha Asthagiri
994ac6da6d Fixes for MOB-836 and MOB-766 and MA-96. 2014-10-29 22:06:42 -04:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive 
Made the header and footer responsive
 2014-10-29 14:00:54 -04:00
Calen Pennington
34d09085ab Remove proxying of resources_fs, and add a unittest that exposes the problem 
[PLAT-191]
 2014-10-29 13:48:57 -04:00
Clinton Blackburn
13579ca9a8 Updates to Demographics Display 
- Gating on feature enabled for Open edX users
- If feature disabled and Insights URL is set, displaying message pointing users to Insights
 2014-10-29 12:31:44 -04:00
Clinton Blackburn
a3171eb8d8 Removed Analytics API Client 
Instructors should use Insights instead.
 2014-10-29 10:25:18 -04:00
Will Daly
c553a47c26 Update third party auth on the logistration form 2014-10-28 17:00:48 -04:00
Diana Huang
13986d8475 Update tests to match new text. 2014-10-28 16:28:58 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
 2014-10-28 15:16:27 -04:00
Diana Huang
9f441d22b0 Merge pull request #5745 from edx/will/third-party-auth-fixes 
Third Party Auth Fixes
 2014-10-28 13:06:40 -04:00