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

11117 Commits

Author SHA1 Message Date
jsa
6fb3daa772 support group_access. JIRA: TNL-649 2015-01-15 10:33:44 -05:00
jsa
17d892c521 make block.get_parent() work. 
Co-Authored-By: Christina Roberts <christina@edx.org>
Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
Co-Authored-By: Don Mitchell <dmitchell@edx.org>
 2015-01-15 10:33:44 -05:00
John Eskew
df5ba26ac6 Handle the correct exception to cause a 404 error upon asset not found 
instead of a 500 error. Add 404 test.
 2015-01-15 09:44:05 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses 
It's a problem for accessibility
 2015-01-15 09:03:12 -05:00
Syed Hassan Raza
5bcd506e4a Fix codemirror css for long text 2015-01-15 14:50:55 +05:00
polesye
fc0f6e9878 Logger: Add possibility to send sync requests. 2015-01-15 02:16:11 +02:00
Tim Babych
dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes 
TNL-213: Student Notes
 2015-01-15 02:02:13 +02:00
Jason Bau
0ba1828f93 Fix shib code to handle course.enrollment_domain=None 2015-01-14 14:36:33 -08:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. 
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
 2015-01-14 23:34:11 +02:00
chrisndodge
32bc4ff058 Merge pull request #6620 from open-craft/kelketek/library-content-plurality 
Fixed pluralization of matching problems in Library Content Module.
 2015-01-14 14:16:49 -05:00
Jonathan Piacenti
f7fd2aa56f Fixed pluralization of matching problems in Library Content Module. 2015-01-13 22:34:01 +00: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
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
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
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
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
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
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
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
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
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
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
Adam Palay
7e45858276 resolve merge conflicts between release and master 2015-01-12 13:47:30 -05:00
Braden MacDonald
3a973d4274 Unit tests for library content analytics 2015-01-12 10:39:12 -08:00
Braden MacDonald
3973317aa9 Report the original LibraryUsageLocator in LMS analytics 2015-01-12 10:39:12 -08:00
Braden MacDonald
407265bc45 Store the usage locator of library blocks in split when they are inherited into a course 2015-01-12 10:39:12 -08:00
Braden MacDonald
91cb371de0 Emit per-student library content events to the tracking log for analytics 2015-01-12 10:39:12 -08:00
Braden MacDonald
e4ea28f7f6 Minor pylint fixes 2015-01-12 10:39:12 -08:00
E. Kolpakov
195d5b57bc pylint fixes 2015-01-12 09:58:51 -08:00
Mark Hoeber
75a26a7e7d Merge pull request #6447 from edx/markhoeber-doc1437 
Enrollment API Doc
 2015-01-12 12:11:32 -05:00
Mark Hoeber
a28fd30b09 Enrollment API Doc 2015-01-12 11:15:32 -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
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
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
Braden MacDonald
134a75b367 Minor tweaks to reduce conflicts with PR 6492 2015-01-12 13:42:56 +03:00