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

27829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Adam Palay
ba102b4a66 fix quality violation 2015-01-12 13:52:15 -05:00
Adam Palay
7e45858276 resolve merge conflicts between release and master 2015-01-12 13:47:30 -05:00
Adam
0435289a17 Merge pull request #6554 from edx/hotfix/2015-01-12 
Hotfix/2015 01 12
 2015-01-12 13:30:47 -05:00
Mark Hoeber
75a26a7e7d Merge pull request #6447 from edx/markhoeber-doc1437 
Enrollment API Doc
 2015-01-12 12:11:32 -05:00
Sarina Canelake
484ce3ed00 Merge pull request #6553 from edx/sarina/20150112-translations-update 
Update translations (autogenerated message)
 2015-01-12 11:31:51 -05:00
Mark Hoeber
a28fd30b09 Enrollment API Doc 2015-01-12 11:15:32 -05:00
Adam
8dd7b78065 Merge pull request #6501 from edx/adam/update-copy-date 
update copyright dates
 2015-01-12 10:59:11 -05:00
Awais
beeaec5a55 ECOM-335 Created new branch from master and put all changes from aamir-khan/ECOM-335-caching-api into this branch. 2015-01-12 20:58:48 +05:00
Jesse Zoldak
a8adce13fb Merge pull request #6530 from edx/zoldak/fix-annotation-test 
Fix flakiness on annotation selenium test
 2015-01-12 10:58:04 -05:00
Sarina Canelake
55d85ad643 Update translations (autogenerated message) 2015-01-12 10:48:58 -05:00
Aamir
ab06f37cfb Merge pull request #6521 from edx/aamir-khan/ECOM-528-donation-verified-courses 
Aamir khan/ecom 528 donation verified courses
 2015-01-12 20:46:11 +05:00
Sarina Canelake
cc61715888 fix es translation 2015-01-12 10:42:52 -05:00
Don Mitchell
2bf3966716 Add a fix_not_found command to get rid 
of dangling children references to blocks.
TNL-1141
 2015-01-12 10:42:52 -05:00
arbisoft
62ea486570 ECOM-528 updated the test cases 2015-01-12 15:55:06 +05:00
Waqas Khalid
80e0d56afd Merge pull request #6368 from sjackso/login_error_fix 
Login error fix TNL-140
 2015-01-12 15:06:15 +05:00
Renzo Lucioni
7a9ec6bd7a Merge pull request #6546 from edx/renzo/fix-jasmine-tests 
Prevent Jasmine tests from redirecting in dev mode
 2015-01-11 17:07:11 -05:00
Renzo Lucioni
8ef0e77e46 Prevent Jasmine tests from redirecting in dev mode 
Also prevent Jasmine from attempting to load deleted templates
 2015-01-11 16:08:29 -05:00
Nimisha Asthagiri
66e6d1cf7a Merge pull request #6352 from edx/gprice/video-upload-csv 
Add CSV download button to Studio video upload page
 2015-01-09 21:48:54 -05:00
Nimisha Asthagiri
4b53f4df27 Studio video upload CSV download changes. 2015-01-09 20:48:48 -05:00
Greg Price
8d8ca83d94 Add download button to Studio video upload page 
The button downloads the CSV data containing all video URLs.
 2015-01-09 19:45:31 -05:00
Greg Price
4e1925129e Add URL download endpoint for Studio video uploads 
The endpoint returns an Excel-dialect CSV file for download.
 2015-01-09 19:45:31 -05:00
arbisoft
50961fe5ad ECOM-528 code refactoring 2015-01-10 05:08:24 +05:00
Renzo Lucioni
cc306843bc Merge pull request #6508 from edx/renzo/split-payment-verification-fixes 
Fix cosmetic issues with the split payment and verification flow
 2015-01-09 17:42:48 -05:00
Dennis Jen
47f3252215 Merge pull request #6529 from edx/release 
Merge release back into master
 2015-01-09 17:22:15 -05:00
Jesse Zoldak
ff4f0787ec Merge pull request #6522 from edx/zoldak/video-troubleshooting 
Add debug logging to video tests
 2015-01-09 16:21:07 -05:00
Dennis Jen
0e03834d00 Merge pull request #6524 from edx/hotfix/2014-01-09 
Handle children pointers to non-existent children in has_changes
 2015-01-09 15:58:59 -05:00