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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Hoeber
58f0071475 Update doc readme.rst 2014-11-04 19:14:46 -05:00
Mark Hoeber
1dee2f8549 Merge pull request #5833 from edx/markhoeber-remove-documentation-files 
Remove documentation files moved to edx-documentation repo
 2014-11-04 19:13:46 -05:00
Mark Hoeber
cdd5f4e932 Merge pull request #5843 from edx/markhoeber-doc-readme 
Readme for documentation directory
 2014-11-04 19:13:22 -05:00
Mark Hoeber
27678416bc Readme for documentation directory 2014-11-04 19:12:52 -05:00
John Eskew
3534ba70ca Changes for PR review: More compact tests, enumeration for metadata 
sort order, etc.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 18:49:38 -05:00
Daniel Friedman
f938a5d965 Merge pull request #5840 from edx/renzo/fix-track-selection-tests 
Fix track selection tests
 2014-11-04 16:58:04 -05:00
frances botsford
6047664b99 Merge pull request #5835 from OmarIthawi/omarithawi/fixed-rtl-icon-spacing-in-discussion 
Fixed spacing of RTL icon in discussion
 2014-11-04 16:44:17 -05:00
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
AlasdairSwan
864040eeb9 Merge pull request #5839 from edx/alasdair/logistraion-css-fix 
ECOM-583 Fixes the CSS bugs
 2014-11-04 15:36:39 -05:00
Renzo Lucioni
d9d09e2b4b Fix track selection tests 2014-11-04 15:25:38 -05:00
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
1de92697f7 Merge pull request #5771 from edx/renzo/flip-access-view 
Flip order of register and login options in the access view
 2014-11-04 14:01:16 -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
John Eskew
098bba16e1 Implement copy_all_asset_metadata for Old Mongo->Old Mongo. 
Add tests for copying all asset metadata.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 11:38:56 -05:00
John Eskew
062e0b2174 Implement course-wide asset paging methods. 
Add SortedCollection class to help sort lists efficiently.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 11:35:02 -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
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
Omar Al-Ithawi
b79180bb97 Fixed spacing of RTL icon in discussion 2014-11-04 14:30:23 +02: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
Mark Hoeber
d008ef611a Remove documentation files moved to edx-documentation repo 2014-11-03 18:35:15 -05:00
Sarina Canelake
aeb3a7f575 fixup! Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4) 2014-11-03 16:49:18 -05:00
Sarina Canelake
bf298f9bed Merge pull request #5832 from edx/sarina/20141103-update-translations 
Update translations '
 2014-11-03 15:25:25 -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
Sarina Canelake
67ebd5ecd8 Update translations ' 
(autogenerated message)
 2014-11-03 14:21:41 -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
Renzo Lucioni
664c901e16 Merge pull request #5830 from edx/renzo/test-user-api-password-reset 
Fix tests of user API views
 2014-11-03 10:27:41 -05:00
Renzo Lucioni
a60213c814 Fix tests of user API views 2014-11-03 10:14:31 -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
Ned Batchelder
cce2aa7fdc No need to use which on a .py file 2014-11-01 16:31:44 -04: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
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
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
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