Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,639 Commits 1 Branch 0 Tags
369f2c54d1d85a7c0118399cce08a7d4ca8a920e
Commit Graph

26639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
369f2c54d1 Merge pull request #5810 from edx/benp/improve-run-quality 
Reduce complexity in run_quality.
 2014-11-04 16:04:20 -05:00
Ben Patterson
493672b173 Reduce complexity in run_quality. 2014-11-04 16:01:30 -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
Don Mitchell
436b32a66d Merge pull request #5800 from edx/dhm/xml_assetstore 
Abstract asset methods into own interface class
 2014-11-04 10:43:41 -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
Gabe Mulley
9e98810832 Merge pull request #5781 from mulby/mobile-eventing-v2 
Implement shim for mobile video events.
 2014-11-03 18:45:38 -05:00
Sarina Canelake
aeb3a7f575 fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 2014-11-03 16:49:18 -05:00
Don Mitchell
aa07355e87 Abstract asset methods into own interface class 
then impl the read ones as NotImplementedError placeholders on xml modulestore
PLAT-70
 2014-11-03 14:45:30 -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
David Baumgold
688d4c968a Merge pull request #4806 from edx/talbs/studio-stylesweep-unused 
Studio: Removing older/deprecated style rules
 2014-11-03 13:36:05 -05:00
Christina Roberts
7f98540e21 Merge pull request #5808 from edx/zub/bugfix/tnl-138-createunitthrowserror 
fix click event for actual target
 2014-11-03 10:36:17 -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
zubair-arbi
dd71ca0f8a fix click event for actual target 
TNL-138
 2014-11-03 09:37:02 -05: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
Carlos Andrés Rocha
09c1f524c1 Merge pull request #5820 from rocha/dont-raise-error-on-course-export-command-cleanup 
Ignore errors during cleanup of course export command.
 2014-10-31 14:46:41 -07:00
Carol Tong
9610c3b205 Merge pull request #5811 from edx/carol/docs/DOC-977 
Add warning about sensitive info in course export
 2014-10-31 15:21:48 -04:00
Carlos Andrés Rocha
6ad235f5db Ignore errors during cleanup of course export command. 2014-10-31 15:20:17 -04:00
Carol Tong
6cecfd0f93 Update change log for export security warning 
DOC-977
 2014-10-31 15:14:13 -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
Carol Tong
254777f464 Add warning about sensitive info in course export 
DOC-977/DOC-991
 2014-10-31 14:48:06 -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
Martyn James
1d4c781e9b Merge pull request #5799 from edx/hotfix_candidate/2014-10-30 
Merging Hotfix candidate/2014 10 30 as per release process
 2014-10-31 13:37:48 -04:00
Sarina Canelake
f76288c042 Merge pull request #5726 from edx/sarina/fix-wording-reset-button 
Update wording per Doc
 2014-10-31 13:27:51 -04:00
Jesse Zoldak
71f237d361 Revert "Fix lettuce css_fill method for devstack" 
This reverts commit 471abb8c28.
 2014-10-31 11:51:28 -04:00
Jesse Zoldak
471abb8c28 Fix lettuce css_fill method for devstack 2014-10-31 11:48:35 -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
Muhammad Ammar
b82167f783 Merge pull request #5806 from edx/ammar/te-567 
Correct script exit status
 2014-10-31 19:18:34 +05: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
muhammad-ammar
ac8c6d18ca Correct script exit status 
TE-567
 2014-10-31 07:48:56 +00:00
Chris Dodge
8b25a4c1cb fix the link in the button on the receipt page 2014-10-30 21:10:22 -04:00
Jesse Zoldak
074c09687c Merge pull request #5803 from Stanford-Online/caijim/resetbutton 
Commenting out flaky string input test case
 2014-10-30 17:37:19 -04:00
Jim
3ceb0e5c6a Commenting out flaky string input test case 2014-10-30 14:33:36 -07:00
Jesse Zoldak
7ca78d6e43 Merge pull request #5724 from edx/zoldak/improve-rerun-test 
Improve rerun test
 2014-10-30 16:27:29 -04:00
David Baumgold
2a669e57b9 re-add search-icon.png 2014-10-30 16:25:36 -04:00
Carol Tong
97d9d95663 Merge pull request #5765 from edx/carol/docs/DOC-1100 
Add email template for verified certificate date
 2014-10-30 15:25:24 -04:00
Carol Tong
41b16452b4 Add email template for verified certificate date 2014-10-30 15:23:12 -04:00
Calen Pennington
4007d5ebcb Wrap ModuleSystem and DescriptorSystem into a single object, to continue holding up the XModule house of cards 
[PLAT-191]
 2014-10-30 14:23:16 -04:00
Adam
75fab0ccfd Merge pull request #5538 from edx/adam/generalized-draft-import-export-2 
Adam/generalized draft import export 2
 2014-10-30 13:53:57 -04:00
David Baumgold
7141e4851b content-types is no longer around 2014-10-30 13:52:31 -04:00
David Baumgold
1b49dd0e6d Deleted some unused images under common 2014-10-30 13:49:45 -04:00
David Baumgold
6577138dff Removed more files from cms 2014-10-30 13:41:30 -04:00
David Baumgold
766fac735f Remove extra large-FOO-icon.png files 2014-10-30 13:34:53 -04:00
Daniel Friedman
355a3b45ad Merge pull request #5764 from edx/dan-f/highlight-active-unit-in-outline 
Highlight active unit in studio container page's outline
 2014-10-30 13:13:34 -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
Sarina Canelake
3d7ce0bb07 Merge pull request #5792 from edx/sarina/i18n 
Fix i18n and quality errors in course_groups/views.py
 2014-10-30 13:09:51 -04:00
Alison Hodges
fc2906da14 Merge pull request #5769 from edx/ahodges/doc/DOC491 
Corrected link to Developer's guide
 2014-10-30 12:24:48 -04:00
Alison Hodges
fc89ccaa6d Corrected link to Developer's guide 
@mhoeber , @stroilova
 2014-10-30 12:23:10 -04:00