Commits · 8b1589d2fefa5fce2baaa5b07dc79e6150921749 · edx / edx-platform · GitLab

20 Aug, 2015 40 commits
- A few patches to fix dependency issues with Organizations. · 8b1589d2
  Jonathan Piacenti committed Aug 20, 2015
  
  8b1589d2 Browse Files
- mattdrayer/api-remove-isactive-user-filter: Removed registration check from older operations · a2168c2c
  Matt Drayer committed Aug 20, 2015
  
  a2168c2c Browse Files
- ziafazal/api-update-user-time-when-emtpy:accept empty user title · 2f4defa6
```
added comment
```
  Zia Fazal committed Aug 20, 2015
  2f4defa6 Browse Files
- mattdrayer/api-migrate_transitional_ids: Cleaned up two additional tables · 71aacb36
```
merged with master

changes after matts suggestions
```
  Matt Drayer committed Aug 20, 2015
  71aacb36 Browse Files
- set PROGRESS_DETACHED_CATEGORIES for prod environments · 0da87a9d
  Fred Smith committed Aug 20, 2015
  
  0da87a9d Browse Files
- Using course ID regex from set · 9f614c73
```
- API now use same regex as the rest of LMS
- Content regex includes the period (.) character
```
  Clinton Blackburn committed Aug 20, 2015
  9f614c73 Browse Files
- mattdrayer/api-migrate_transitional_ids: Cleaned up two additional tables · 0c9e37f3
  Matt Drayer committed Aug 20, 2015
  
  0c9e37f3 Browse Files
- mattdrayer/api-update-project-fkey: Added organizations FK · 1bffde01
  Matt Drayer committed Aug 20, 2015
  
  1bffde01 Browse Files
- mattdrayer/api-groupprofile-clean-xblockid: Migrate transitional content ids to original format · f64a9b46
  Matt Drayer committed Aug 20, 2015
  
  f64a9b46 Browse Files
- ziafazal/api-fix-company-proficiency-avg: fix for · c51a6fc7
```
incorrect average calculation
```
  Zia Fazal committed Aug 20, 2015
  c51a6fc7 Browse Files
- mattdrayer/api-org-migration: Moved api_manager data migration work to orgs app · 10bd9e8a
  Matt Drayer committed Aug 20, 2015
  
  10bd9e8a Browse Files
- ziafazal/api-add-course-image-to-overview: added · 777e2b97
```
course_image_url to course overview api

added video to overview page
```
  Zia Fazal committed Aug 20, 2015
  777e2b97 Browse Files
- mattdrayer/api-cmc-stage-fix: Strip i4x prefix from stage column values · 789a15ae
  Matt Drayer committed Aug 20, 2015
  
  789a15ae Browse Files
- mattdrayer/api-progress-generator-fix: Repaired existence check · 8e443f59
  Matt Drayer committed Aug 20, 2015
  
  8e443f59 Browse Files
- initial changes · c9de3875
```
completed tests and added type filter

removed organizations app

migration to delete tables
```
  Zia Fazal committed Aug 20, 2015
  c9de3875 Browse Files
- fixed duplicates when user is enrolled in more than one course · 31adeb0c
  Zia Fazal committed Aug 20, 2015
  
  31adeb0c Browse Files
- ziafazal/api-org-groups-relationship: added group · 03e0bf7d
```
association with organisation
```
  Zia Fazal committed Aug 20, 2015
  03e0bf7d Browse Files
- fixed mysql date time error · fab6e489
```
added if check for mysql
```
  Zia Fazal committed Aug 20, 2015
  fab6e489 Browse Files
- ziafazal/api-strip-unenrolled-users-from-social-stats · 00802f7f
```
strip un-enrolled users from social stats
```
  Zia Fazal committed Aug 20, 2015
  00802f7f Browse Files
- added active flag on organisation metrics · 7959d2db
  Zia Fazal committed Aug 20, 2015
  
  7959d2db Browse Files
- mattdrayer/api-time-series-fix: Use backticks instead of quotes · a5844662
  Matt Drayer committed Aug 20, 2015
  
  a5844662 Browse Files
- ziafazal/api-exclude-unenrolled-from-counts:exclude · 43493ddf
```
un-enrolled users from counts
```
  Zia Fazal committed Aug 20, 2015
  43493ddf Browse Files
- mattdrayer/api-serialize-content-fix: Addressed id/key issue · e4ebd113
  Matt Drayer committed Aug 20, 2015
  
  e4ebd113 Browse Files
- Backported edx-platform hosted discussion XBlock to edx-solutions (part 2) · 62fa253a
  E. Kolpakov committed Aug 20, 2015
  
  62fa253a Browse Files
- Add topic selection to inline thread editing, fixing errors · 8c934284
```
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549

Conflicts:
	common/static/coffee/spec/discussion/view/discussion_thread_edit_view_spec.js
	common/static/coffee/src/discussion/discussion_module_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_edit_view.js
	lms/djangoapps/django_comment_client/forum/views.py
```
  jsa committed Aug 20, 2015
  8c934284 Browse Files
- 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