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

4617 Commits

Author SHA1 Message Date
Calen Pennington
1e6d83b59e Merge pull request #9307 from cpennington/user-state-client-metrics 
User state client metrics
 2015-08-18 10:43:37 -04:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Brian Talbot
944f51a60b LMS: removing old and not needed edx.org MKTG iframe assets 
* removing templates/styling
* removing test logic and URLs
 2015-08-14 16:17:19 -04:00
Calen Pennington
3f9027d05e Log delete_many calls and metrics 2015-08-14 10:22:24 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Calen Pennington
448356ed3e Log the size of block state and the number of blocks missing state when retrieved with get_many 2015-08-13 16:32:05 -04:00
Calen Pennington
31f29763fd Increase sample rate when measuring DjangoXBlockUserStateClient metrics 2015-08-13 16:31:33 -04:00
Will Daly
ad9d9eb04e Support team UI for regenerating certificates 
* Add new role for support staff.
* Move dashboard/support functionality into a new Django app called "support".
* Add support view for searching and regenerating certificates.
* Refactor certificates views into separate files.
 2015-08-12 07:09:46 -07:00
Peter Fogg
344ff8c1bc Merge pull request #9267 from edx/release 
2015-08-11 release
 2015-08-11 12:07:21 -04:00
Akiva Leffert
ba03081320 Merge pull request #9260 from edx/aleffert/start-date-error 
Show vaguer error message if using default start date
 2015-08-11 10:28:44 -04:00
Sven Marnach
55ace6baa8 Make new masquerading code compatible to existing session data. 
The new masquerading code introduced in PR #8775 adds a new attribute to
CourseMasquerade objects stored in the user's session.  When users who have
active masquerading configuration access instances with the new code, and
AttributeError occurs when trying to access the attribute user_name.

This fix ensures that CourseMasquerade objects receive all required attributes
when they are unpickled from the session.
 2015-08-11 10:47:25 +02:00
Peter Fogg
a6891609be Test Cale's RC fix. 2015-08-10 19:36:32 -04:00
Akiva Leffert
2632fd7ecd Show vaguer error message if using default start date 2015-08-10 17:26:36 -04:00
Calen Pennington
584453202f Use the correct attribute when accessing StudentModuleHistory creation dates 2015-08-10 14:56:03 -04:00
Calen Pennington
34892b9680 Add more information when logging data about differing history and score entries 2015-08-10 14:56:03 -04:00
Calen Pennington
93b1b69854 Don't violate the empty-dict vs None semantics of student_module during delete_many 2015-08-10 14:42:18 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application 
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
 2015-08-10 10:29:45 -04:00
cahrens
2b57603436 Handle case of video in a content library with no transcripts. 
This partially addresses TNL-1776
 2015-08-07 13:19:12 -04:00
Ned Batchelder
2300f382cf Ignore more directories to speed up extracting i18n strings. 
Also, remove the one use of _() in a test feature, since there's no
point.
 2015-08-06 10:39:04 -04:00
John Eskew
56da28526e Merge pull request #9155 from edx/jeskew/csm_api_events_to_datadog 
Add DataDog histogram events to DjangoXBlockUserStateClient class.
 2015-08-04 18:19:55 -04:00
John Eskew
f3e59acbf1 Add DataDog histogram events to DjangoXBlockUserStateClient class. 2015-08-04 17:14:05 -04:00
Ned Batchelder
ceb5655b2d Merge pull request #9171 from edx/ned/update-pylint 
Update pylint and astroid, reduces pylint count by 400
 2015-08-04 09:28:35 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
John Eskew
ffc8a11789 Merge pull request #9092 from cpennington/user-state-client-tests 
User state client tests
 2015-08-03 12:25:05 -04:00
Linda Liu
8aa2d67b6d Merge pull request #8946 from edx/lliu/view-course-access 
Add access response information into view_course_access
 2015-08-01 13:55:25 -04:00
Calen Pennington
83c10331fa Add a test of submission history display 2015-08-01 08:13:25 -04:00
Calen Pennington
6ba611cb5f Remove remove_input_state.py, as it was one-time fix code, and is not worth porting to the new interface 2015-08-01 08:13:25 -04:00
Calen Pennington
aa374ca12a Make DjangoXBlockUserStateClient pass semantic tests 
This required the following changes to the DjangoXBlockUserStateClient
semantics:

1) Changes get/get_many to return XBlockUserState tuples, rather
than state dictionaries or (block_key, state) tuples.
2) Raises DoesNotExist if get_history is called on an XBlock that has
had no data saved to it.
3) Returns XBlockUserState tuples as the results of get_history.
 2015-08-01 08:13:25 -04:00
Calen Pennington
53b37e7412 Remove extraneous documentation, contracts, and method definitions 2015-08-01 08:13:25 -04:00
Calen Pennington
704ae7139a Add a subclass-implementation of the UserStateClient tests 2015-08-01 08:12:04 -04:00
utkjad
b85b50d11a Removing @contract 2015-07-31 17:44:16 +00:00
tlindaliu
3b483d14bc MA-851: Add access response information into view_course_access 2015-07-31 09:30:40 -04:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files 
No need to go through Mako
 2015-07-28 09:36:31 -04:00
John Eskew
756008aa9b Merge pull request #8768 from open-craft/jump_to_children_ospr 
Jump to children
 2015-07-27 13:42:32 -04:00
Awais Jibran
d838686c1b Merge pull request #9043 from edx/aj/tnl-2879-xml-course-error 
Grading doesn't work for XML courses
 2015-07-27 18:38:54 +05:00
Braden MacDonald
5aa127a9bf Merge pull request #8995 from open-craft/masquerade-cohorts 
Allow previewing cohorted content when masquerading (SOL-1064)
 2015-07-26 11:18:23 -07:00
Peter Fogg
8fc5444095 Merge pull request #9020 from edx/peter-fogg/404-not-live 
Redirect to dashboard from non-live courses.
 2015-07-24 13:49:45 -04:00
Peter Fogg
c8ed59ac61 Redirect to dashboard from non-live courses. 
TNL-2693
 2015-07-24 13:05:47 -04:00
Awais Jibran
334005ef2f Grading doesn't work for XML courses 
TNL-2879
 2015-07-24 19:17:46 +05:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration . 
TNL-2413
 2015-07-24 17:03:46 +05:00
Braden MacDonald
0defc55b84 Allow previewing cohorted content when masquerading 2015-07-22 00:54:15 -07:00
Jonathan Piacenti
c8339072dd Fixup for tests. 2015-07-21 14:39:19 +00:00
Jonathan Piacenti
405b266fa7 Addressed notes. 2015-07-21 14:39:18 +00:00
Jonathan Piacenti
a6ae44a0db Add ability to activate a child block via jump_to_id. 2015-07-21 14:39:18 +00:00
Will Daly
a725e84233 Merge pull request #8983 from edx/will/ecom-1912-and-1913 
Credit progress page formatting bugfixes.
 2015-07-20 14:14:53 -07:00
Will Daly
d3f58b689f Credit progress page formatting bugfixes. 
* Correctly format the student's full name on the progress page.
* Add tests for progress page credit requirements display.
* Display grade percentage for credit requirement on progress page
 2015-07-20 13:08:13 -07:00
Renzo Lucioni
b50c905865 Remove modulestore dependency from Enrollment API 
Sets the Enrollment API free of the modulestore by replacing modulestore queries with calls to the CourseOverview model. Course deletion invalidates the corresponding CourseOverview. XCOM-462.
 2015-07-20 13:41:19 -04:00
Max Rothman
80cf4d6ecb Merge pull request #8969 from edx/release-merge-test 
Release merge test
 2015-07-20 10:38:37 -04:00