Commits · b2eeec53d1dcd39d0975deb87babd782a0952389 · edx / edx-platform · GitLab

22 Oct, 2014 1 commit
- ziafazal/api-exclude-unenrolled-from-counts:exclude · b2eeec53
```
un-enrolled users from counts
```
  Zia Fazal committed Oct 22, 2014
  b2eeec53 Browse Files
21 Oct, 2014 9 commits
- Merge pull request #279 from edx-solutions/mattdrayer/api-serialize-content-fix · 382069c3
```
mattdrayer/api-serialize-content-fix: Addressed id/key issue
```
  Matt Drayer committed Oct 21, 2014
  382069c3 Browse Files
- mattdrayer/api-serialize-content-fix: Addressed id/key issue · 38a5a25a
  Matt Drayer committed Oct 21, 2014
  
  38a5a25a Browse Files
- xblock-utils: Add hash to requirements · fdfe052d
  Xavier Antoviaque committed Oct 21, 2014
  
  fdfe052d Browse Files
- Merge pull request #277 from edx-solutions/ziafazal/api-add-org-filter-to-social-stats · 1133ffa4
```
added organization filter
```
  Matt Drayer committed Oct 21, 2014
  1133ffa4 Browse Files
- Merge pull request #276 from edx-solutions/ziafazal/api-added-participant-activity-to-metrics · 52a26bd1
```
ziafazal/api-added-participant-activity-to-metrics: 
```
  Matt Drayer committed Oct 21, 2014
  52a26bd1 Browse Files
- added organization filter · 97533410
  Zia Fazal committed Oct 21, 2014
  
  97533410 Browse Files
- mentoring: Update hash · 16d8acc5
  Xavier Antoviaque committed Oct 21, 2014
  
  16d8acc5 Browse Files
- ziafazal/api-added-participant-activity-to-metrics: added · a4860f43
```
active_users and users_enrolled metrics
```
  Zia Fazal committed Oct 21, 2014
  a4860f43 Browse Files
- hash updated for xblock group project · a302a278
  Martyn James committed Oct 20, 2014
  
  a302a278 Browse Files
20 Oct, 2014 2 commits
- Merge pull request #275 from edx-solutions/mattdrayer/profiler-updates · b075bd05
```
mattdrayer/profiler-updates: PEP8/Pylint
```
  Matt Drayer committed Oct 20, 2014
  b075bd05 Browse Files
- mattdrayer/profiler-updates: PEP8/Pylint · 0bbe9349
  Matt Drayer committed Oct 20, 2014
  
  0bbe9349 Browse Files
17 Oct, 2014 9 commits
- Merge pull request #274 from edx-solutions/mattdrayer/api-courses-list-fix · f97ad409
```
mattdrayer/api-courses-list-fix: Add course_id to resource urls
```
  Matt Drayer committed Oct 17, 2014
  f97ad409 Browse Files
- mattdrayer/api-courses-list-fix: Add course_id to resource urls · 34354777
  Matt Drayer committed Oct 17, 2014
  
  34354777 Browse Files
- Merge pull request #273 from edx-solutions/mattdrayer/data-conversion-update · 52259321
```
Addressed data migration issues
```
  Matt Drayer committed Oct 17, 2014
  52259321 Browse Files
- Addressed data migration issues · 094bcd7e
  Matt Drayer committed Oct 17, 2014
  
  094bcd7e Browse Files
- Merge pull request #271 from edx-solutions/mattdrayer/gradebook-script-rename · cf6a7547
```
mattdrayer/gradebook-script-rename: Fixed conflicted command name
```
  Matt Drayer committed Oct 17, 2014
  cf6a7547 Browse Files
- mattdrayer/gradebook-script-rename: Fixed conflicted command name · b6edd7d6
  Matt Drayer committed Oct 17, 2014
  
  b6edd7d6 Browse Files
- Merge pull request #272 from edx-solutions/ziafazal/api-course-time-series-metrics-am · d332578a
```
added modules_completed metric
```
  Matt Drayer committed Oct 17, 2014
  d332578a Browse Files
- merged with master · 614f9239
  Zia Fazal committed Oct 17, 2014
  
  614f9239 Browse Files
- Merge pull request #270 from edx-solutions/ziafazal/api-course-time-series-metrics-am · afcdc508
```
course metrics in time series 
```
  Matt Drayer committed Oct 17, 2014
  afcdc508 Browse Files
16 Oct, 2014 2 commits
- Merge pull request #267 from edx-solutions/mattdrayer/api-course-key-conversion · 8da5a0c0
```
mattdrayer/api-course-key-conversion:  CourseKey data migrations, plus g...
```
  Matt Drayer committed Oct 16, 2014
  8da5a0c0 Browse Files
- initial changes · 481a4b7e
```
added tests

added users_completed

added users_not_started
```
  Zia Fazal committed Oct 16, 2014
  481a4b7e Browse Files
15 Oct, 2014 5 commits
- mentoring: Update hash · 99f90c76
  Xavier Antoviaque committed Oct 15, 2014
  
  99f90c76 Browse Files
- Merge pull request #269 from edx-solutions/ziafazal/api-fix-users-grade-complete-count · e5632d05
```
ziafazal/api-fix-users-grade-complete-count: fixed count exceeding total...
```
  Matt Drayer committed Oct 15, 2014
  e5632d05 Browse Files
- ziafazal/api-fix-users-grade-complete-count: fixed count exceeding total participants · 1304881c
```
and users_grade_average float conversion exception when average is None
```
  Zia Fazal committed Oct 15, 2014
  1304881c Browse Files
- Merge pull request #268 from edx-solutions/opaquekeys-update · bc8db14f
```
opaquekeys-update: Parse the short-lived slashes and locations syntax
```
  Matt Drayer committed Oct 15, 2014
  bc8db14f Browse Files
- opaquekeys-update: Parse the short-lived slashes and locations syntax · 404f27d5
```
Update hash to include the fix for opaque keys parsing of slashes and
location syntaxes.
```
  Xavier Antoviaque committed Oct 15, 2014
  404f27d5 Browse Files
14 Oct, 2014 8 commits
- mattdrayer/api-course-key-conversion: CourseKey data migrations, plus gradebook history fix · 4c275cd5
  Matt Drayer committed Oct 14, 2014
  
  4c275cd5 Browse Files
- Merge pull request #266 from edx-solutions/mjames/NoSlashes · 7ea09382
```
slashes: formatted ids removed
```
  Martyn James committed Oct 14, 2014
  7ea09382 Browse Files
- slashes: formatted ids removed · 9052db98
  Martyn James committed Oct 14, 2014
  
  9052db98 Browse Files
- Merge pull request #249 from edx-solutions/ziafazal/api-calculate-progress-on-completions · cadd4367
```
ziafazal/api-calculate-progress-on-completions: calculate progress on module completion
```
  Matt Drayer committed Oct 14, 2014
  cadd4367 Browse Files
- merged with master · fa4d7ac9
  Matt Drayer committed Oct 14, 2014
  
  fa4d7ac9 Browse Files
- Merge pull request #265 from edx-solutions/aspen-merge · 692de26c
```
Aspen release - Merge additional commits since RC
```
  Matt Drayer committed Oct 14, 2014
  692de26c Browse Files
- Merge branch 'openedx/rc/aspen-2014-09-10' into aspen-merge · a11409e0
  Xavier Antoviaque committed Oct 14, 2014
  
  a11409e0 Browse Files
- Merge pull request #263 from open-craft/acceptance-rebase-20140926 · 7b74fe4d
```
Acceptance rebase 20140926
```
  Xavier Antoviaque committed Oct 14, 2014
  7b74fe4d Browse Files
13 Oct, 2014 3 commits
- acceptance-rebase-20140926: Load internationalization of CourseMode lazily. · f5225495
```
Fixes broken test running, since non-lazy evaluation creates an importError.
```
  Jonathan Piacenti committed Oct 13, 2014
  f5225495 Browse Files
- acceptance-rebase-20140926: Fixed imports for discussion SCSS. · 5573d02d
  Jonathan Piacenti committed Oct 13, 2014
  
  5573d02d Browse Files
- acceptance-rebase-20140926: Update cached test DBs - lettuce & bok_choy · a1388de8
  Jonathan Piacenti committed Oct 13, 2014
  
  a1388de8 Browse Files
10 Oct, 2014 1 commit
- Merge pull request #254 from edx-solutions/ziafazal/api-remove-rounding · 544c0966
```
ziafazal/api-remove-rounding: remove round in progress
```
  Matt Drayer committed Oct 10, 2014
  544c0966 Browse Files