Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,950 Commits 1 Branch 0 Tags
df5dd1a4dbfce2df4e828db5dc75ca9f33c7e774
Commit Graph

27950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
df5dd1a4db Merge pull request #6385 from ataki/ataki/gridfs-hotfix 
Fix visual bug with large file error msg in cms.
 2015-01-14 10:42:56 -05:00
Carlos Andrés Rocha
36813c0261 Merge pull request #6351 from rocha/fix-email-opt-in-list-export-command 
Fix email_opt_in_list export command to parse options correctly.
 2015-01-14 10:36:01 -05:00
Sarina Canelake
9142268614 Merge pull request #6603 from edx/sarina/fix-i18n 
Fix i18n from Destination team pages
 2015-01-14 10:16:29 -05:00
Stephen Sanchez
da9c30b207 Merge pull request #6596 from edx/sanchez/course_role_admin_form 
Improve Django Admin Panel for Admin Roles.
 2015-01-14 08:56:15 -05:00
AlasdairSwan
4052c729be Merge pull request #6600 from edx/alasdair/register-form-submit-fix 
ECOM-412 Set buttons types so enter now triggers register button
 2015-01-14 08:12:26 -05:00
Carlos Andrés Rocha
327cc04f40 Fix email_opt_in_list export command to parse options correctly. 2015-01-13 18:57:30 -05:00
stephensanchez
aed89e422a Improve Django Admin Panel for Course Access Roles. Related to ECOM-857. Allows internal staff to easily use the Django Admin view to create new finance and sales admins. 2015-01-13 21:57:28 +00:00
John Eskew
c11a9f056e Merge pull request #6590 from edx/jeskew/optimize_split_asset_search 
Optimize large amounts of asset metadata in the Split modulestore.

Other thumb from @dmitchell  in PR: https://github.com/edx/edx-platform/pull/6456
 2015-01-13 16:28:49 -05:00
Sarina Canelake
e88c298a94 Fix i18n from Destination team pages 2015-01-13 16:14:53 -05:00
John Eskew
6de1137f67 Optimize large amounts of asset metadata in the Split modulestore. 
Use binary search instead of linear search.
Add tests for saving asset metadata lists.
Refactor to use common code across modulestores.
 2015-01-13 15:20:42 -05:00
AlasdairSwan
9046001130 ECOM-412 Set buttons types so enter now triggers register button 2015-01-13 14:28:34 -05:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries 
Content libraries MVP
 2015-01-13 11:20:20 -08:00
Adam
2b9b531c16 Merge pull request #6597 from edx/release 
Release
 2015-01-13 13:46:34 -05:00
Braden MacDonald
bce8ee692f Fix bug when deleting first of two recently added blocks 2015-01-13 10:11:59 -08:00
Stephen Sanchez
158a0a0e2e Merge pull request #6374 from edx/sanchez/enable_redeem_codes 
Enable redeem codes for Verified Cert Courses
 2015-01-13 13:06:55 -05:00
Adam
f699177900 Merge pull request #6565 from edx/hotfix/2014-01-12 
Change split to handle dags and fix
 2015-01-13 12:51:14 -05:00
Piotr Mitros
6d184f7b20 Merge pull request #6570 from edx/pmitros/eia-test-cases 
Adds testability to the EIA file
 2015-01-13 11:52:49 -05:00
AlasdairSwan
6dc4bf9ac9 Merge pull request #6588 from edx/alasdair/footer-mobile-app-links 
ECOM-880 added mobile app links to footer enabled by feature flag ENABLE...
 2015-01-13 11:04:07 -05:00
Piotr Mitros
b7484ea7ac Adds testability to the EIA file 2015-01-13 11:01:41 -05:00
stephensanchez
b188430679 Enable redeem codes. 
Update the redeem code schema

Updating the redeem code schema.

Adding migration file.

Adding course mode support when redeeming a code.

Conflicts:
	lms/djangoapps/shoppingcart/views.py

Add sales admin privileges for redeem code generation.

Making sure redeem code URLs work for verified courses.

pep8 violations

Code Review and Test Cleanup changes

Added tests, fixed tests.

Updating the boolean checks in ecommerce template
 2015-01-13 15:21:24 +00:00
AlasdairSwan
d706f4de32 ECOM-880 added mobile app links to footer enabled by feature flag ENABLE_FOOTER_MOBILE_APP_LINKS 
Allow configuration to override links to mobile app stores
 2015-01-13 10:12:54 -05:00
Waqas Khalid
70b38fc3a3 Merge pull request #6034 from mlkwaqas/waqas/tnl776-multiple-inline-discussion-problem 
In inline discussion two discussion module override actions
 2015-01-13 19:59:23 +05:00
John Eskew
be4c016083 Merge pull request #6312 from edx/jeskew/import_export_perf_testing 
Performance testing of asset metadata in course import/export
 2015-01-13 09:29:54 -05:00
John Eskew
6873c04599 First iteration of code which tests performance of asset metadata 
during course import/export. Uses external code_block_timer module.
   Also, add script which validates XML file against an XSD file.
   Uses the unittest framework - but is currently skipped.
 2015-01-13 08:47:24 -05:00
Shrhawk
c3f789021a Merge pull request #6285 from Shrhawk/shr/bug/TNL-904-tolerance-is-broken 
Fix tolerance broken
 2015-01-13 17:08:52 +05:00
Nimisha Asthagiri
e57f3e3b03 Merge pull request #6572 from edx/mobile/fix-decorator-api 
Fix Mobile API decorators
 2015-01-13 06:20:10 -05:00
Jesse Zoldak
eaa4f7c05b Merge pull request #6578 from edx/zoldak/disable-pylint-R0801 
WIP disable R0801
 2015-01-13 06:05:05 -05:00
Syed Hassan Raza
66b949b745 Fix tolerance broken 2015-01-13 16:01:46 +05:00
Waqas Khalid
fd0d475b0f Merge pull request #6361 from mlkwaqas/waqas/tnl720-unable-to-report-mark-answer 
Unable to report/vote/endorse after editing response
 2015-01-13 15:45:44 +05:00
Waqas Khalid
2a67632b7b Unable to report/vote/endorse after editing response 
When user update the response after editing he would
be unablt to report/vote/endorse the response. This
problem was caused due to double binding of event in
backbone view.

TNL-720
 2015-01-13 13:47:02 +05:00
Waheed Ahmed
47fbda9dd9 Merge pull request #6370 from edx/waheed/tnl920-fix-code-mirror-xml-editor-height 
Fixed CodeMirror editor view height in studio.
 2015-01-13 13:31:55 +05:00
Nimisha Asthagiri
9566a46a4d Fix Mobile API decorators. 2015-01-13 02:29:53 -05:00
Aamir
05575ecce4 Merge pull request #6548 from edx/aamir-khan/ECOM-335-caching 
ECOM-335 Created new branch from master and put all changes from aamir-k...
 2015-01-13 12:11:37 +05:00
Waheed Ahmed
05d9d139b5 Fixed CodeMirror editor view height in studio. 
TNL-920
 2015-01-13 12:11:20 +05:00
AlasdairSwan
1e051e5ef8 Merge pull request #6555 from edx/alasdair/decoupled-verification-a11y 
Alasdair/decoupled verification a11y
 2015-01-12 18:52:28 -05:00
Jesse Zoldak
fdb586786e Disable pylint R0801 duplicate-code checker 2015-01-12 17:02:12 -05:00
Brian Talbot
10168b6908 ECOM-873 accessability updates for decoupled verification 2015-01-12 16:21:34 -05:00
Braden MacDonald
012e6e6fd3 Update font awesome icons 2015-01-12 13:21:27 -08:00
Christopher Lee
0625b84d12 Merge pull request #6557 from edx/clee-MA-187-value-error 
Clee ma 187 value error
 2015-01-12 16:18:20 -05:00
Braden MacDonald
6ea5a8a595 Fix hard-coded studio name 2015-01-12 13:08:40 -08:00
Brian Talbot
4d7c7c5f68 Merge pull request #6574 from edx/talbs/fix-shoppingcart-icons 
FIX: Polishing Vertical Alignment on Shopping Cart Action Icons
 2015-01-12 15:57:36 -05:00
Brian Talbot
471f9e179e fix: adjusting vertical alignment on shopping cart action icons 2015-01-12 15:54:52 -05:00
Clinton Blackburn
64bc0649ce Merge pull request #6566 from edx/clintonb/remove-unicode-file 
Removed Unicode Test Artifact
 2015-01-12 15:42:21 -05:00
Don Mitchell
ed3f609757 Change split to handle dags and fix 
children references on copy and delete w/ more than one parent
 2015-01-12 15:11:45 -05:00
Braden MacDonald
16dc83dfc0 Merge pull request #6492 from open-craft/content_libraries/13-analytics-enhancements 
Content libraries analytics enhancements (SOL-121)
 2015-01-12 12:10:01 -08:00
Adam
dbab66c546 Merge pull request #6564 from edx/merge-release 
Merge release
 2015-01-12 14:44:29 -05:00
Clinton Blackburn
9e973c75d0 Removed Unicode Test Artifact 
This file should not have been committed by #6447. It is causing issues for Mac OS X users, preventing checkouts and rebases.
 2015-01-12 14:24:38 -05:00
christopher lee
3e5f7bacdd MA-187 ValueError fix 
Fix for MA-187 where a value error was thrown when
a course has a video directly under a section. This
PR handles the situations where a chapter or section
can be none, and then returns the appropriate url
if available.
 2015-01-12 14:15:18 -05:00
Braden MacDonald
05fc6738f6 Add in "previous_count" and "max_count" 2015-01-12 11:14:35 -08:00
Braden MacDonald
10fe9c0180 pylint fixes 2015-01-12 11:00:51 -08:00