Commits · 0cce36a8b2e1705743c21bbd914696bc74a2068e · edx / edx-platform · GitLab

20 Aug, 2015 40 commits
- Copied test specs · 0cce36a8
  jsa committed Aug 20, 2015
  
  0cce36a8 Browse Files
- Moved discussion XBlock to edx-platform · 382c2edf
```
(cherry picked from commit a7c0a2a)
```
  E. Kolpakov committed Aug 20, 2015
  382c2edf Browse Files
- discussion-integration: Fixed call to prepare_content in x_module. · 1ce71942
  Jonathan Piacenti committed Aug 20, 2015
  
  1ce71942 Browse Files
- discussion-integration: Ignore query string when deriving course from URL. · 0ec2e643
  Jonathan Piacenti committed Aug 20, 2015
  
  0ec2e643 Browse Files
- added organization filter · 9dd21a04
  Zia Fazal committed Aug 20, 2015
  
  9dd21a04 Browse Files
- ziafazal/api-added-participant-activity-to-metrics: added · c4804485
```
active_users and users_enrolled metrics
```
  Zia Fazal committed Aug 20, 2015
  c4804485 Browse Files
- mattdrayer/profiler-updates: PEP8/Pylint · 00008c06
  Matt Drayer committed Aug 20, 2015
  
  00008c06 Browse Files
- mattdrayer/api-courses-list-fix: Add course_id to resource urls · ddc979d3
  Matt Drayer committed Aug 20, 2015
  
  ddc979d3 Browse Files
- Addressed data migration issues · 6aeb6d47
  Matt Drayer committed Aug 20, 2015
  
  6aeb6d47 Browse Files
- mattdrayer/gradebook-script-rename: Fixed conflicted command name · 23c72e73
  Matt Drayer committed Aug 20, 2015
  
  23c72e73 Browse Files
- merged with master · 4690e310
  Zia Fazal committed Aug 20, 2015
  
  4690e310 Browse Files
- initial changes · c0973074
```
added tests

added users_completed

added users_not_started
```
  Zia Fazal committed Aug 20, 2015
  c0973074 Browse Files
- mattdrayer/api-course-key-conversion: CourseKey data migrations, plus gradebook history fix · 9329b563
  Matt Drayer committed Aug 20, 2015
  
  9329b563 Browse Files
- ziafazal/api-fix-users-grade-complete-count: fixed count exceeding total participants · c67ccc58
```
and users_grade_average float conversion exception when average is None
```
  Zia Fazal committed Aug 20, 2015
  c67ccc58 Browse Files
- slashes: formatted ids removed · c651642d
  Martyn James committed Aug 20, 2015
  
  c651642d Browse Files
- merged with master · 46675ffb
  Matt Drayer committed Aug 20, 2015
  
  46675ffb Browse Files
- ziafazal/api-remove-rounding: remove round in progress · a5f107bc
```
avoid auto round by casting denominator to float
```
  Zia Fazal committed Aug 20, 2015
  a5f107bc Browse Files
- mattdrayer/api-org-course-avg: Added average grade to response · a7a8e196
  Matt Drayer committed Aug 20, 2015
  
  a7a8e196 Browse Files
- Don't consider complete if proforma is 0; cannot possibly be · f2168356
  Martyn James committed Aug 20, 2015
  
  f2168356 Browse Files
- Reverted a minor change in get_cohort to fix failing test in course_groups · 9eaf7206
  Alan Boudreault committed Aug 20, 2015
  
  9eaf7206 Browse Files
- Fix api_manager failing tests about cohorts · e9491d59
  Alan Boudreault committed Aug 20, 2015
  
  e9491d59 Browse Files
- Add ENABLE_DISCUSSION_EMAIL_DIGEST in api_manager · 79744b52
```
Conflicts:
	lms/djangoapps/api_manager/users/tests.py
```
  Alan Boudreault committed Aug 20, 2015
  79744b52 Browse Files
- mattdrayer/api-orgs-complete-count: New metrics operation · b686b2da
  Matt Drayer committed Aug 20, 2015
  
  b686b2da Browse Files
- rename misnumbered migration · ec39092c
  Fred Smith committed Aug 20, 2015
  
  ec39092c Browse Files
- ziafazal/api-fix-course-image-url: make image url relative · 9a8e6318
```
uncomment discussion stats call
```
  Zia Fazal committed Aug 20, 2015
  9a8e6318 Browse Files
- mattdrayer/api-proforma-migration: Added migration file · 651641ea
  Matt Drayer committed Aug 20, 2015
  
  651641ea Browse Files
- mattdrayer/rebase-20140926-cherrypicks: Added recent commits to rebase branch · 84692676
  Matt Drayer committed Aug 20, 2015
  
  84692676 Browse Files
- update schema for workgroup feedback · 6e9fb2a9
```
relabel migration at 0008
```
  Chris Dodge committed Aug 20, 2015
  6e9fb2a9 Browse Files
- revert-multiple-cohorts: Add checks in code and a management command to ease the revert · 134a7016
  Alan Boudreault committed Aug 20, 2015
  
  134a7016 Browse Files
- Rebase of workgroup cohorts change · 7857896e
  Alan Boudreault committed Aug 20, 2015
  
  7857896e Browse Files
- mattdrayer/rebase-20140916: Initial test fixes · 0de4f601
  Matt Drayer committed Aug 20, 2015
  
  0de4f601 Browse Files
- Tweak to allow for case when weight is explicity None · 6454290f
  Martyn James committed Aug 20, 2015
  
  6454290f Browse Files
- Solves problem when course components have non-numeric values for grade-weight · ba1466ca
  Martyn James committed Aug 20, 2015
  
  ba1466ca Browse Files
- Addresses problem when too many excluded users were being excluded · 0820e752
  Martyn James committed Aug 20, 2015
  
  0820e752 Browse Files
- Added new assistant role · e6384b92
  Martyn James committed Aug 20, 2015
  
  e6384b92 Browse Files
- gradebook appears to bomb if there is no data to aggregate · 79405d9a
  Chris Dodge committed Aug 20, 2015
  
  79405d9a Browse Files
- ziafazal/api-add-company-logo-to-organization-model: added logo_url field · 0bd39386
  Zia Fazal committed Aug 20, 2015
  
  0bd39386 Browse Files
- mattdrayer/test_graders_fix: Added due field to Score namedtuples · 5535f68b
  Matt Drayer committed Aug 20, 2015
  
  5535f68b Browse Files
- Protect against divide by zero when course has no scores · 4219e1af
  Martyn James committed Aug 20, 2015
  
  4219e1af Browse Files
- mattdrayer/api-proforma-realistic: Apply average score to unscored categories · b959469a
  Matt Drayer committed Aug 20, 2015
  
  b959469a Browse Files