Commits · 14ceffcb105265d731ba874630179bf90faffc5d · edx / edx-platform · GitLab

03 Nov, 2014 4 commits
- Merge pull request #300 from edx-solutions/mattdrayer/api-update-project-fkey · 14ceffcb
```
mattdrayer/api-update-project-fkey: Added organizations FK
```
  Matt Drayer committed Nov 03, 2014
  14ceffcb Browse Files
- Merge pull request #299 from edx-solutions/mattdrayer/api-groupprofile-clean-xblockid · 604227f7
```
mattdrayer/api-groupprofile-clean-xblockid: Migrate transitional content...
```
  Matt Drayer committed Nov 03, 2014
  604227f7 Browse Files
- mattdrayer/api-groupprofile-clean-xblockid: Migrate transitional content ids to original format · 9dca79c1
  Matt Drayer committed Nov 03, 2014
  
  9dca79c1 Browse Files
- mattdrayer/api-update-project-fkey: Added organizations FK · 7ccba2d3
  Matt Drayer committed Nov 03, 2014
  
  7ccba2d3 Browse Files
31 Oct, 2014 2 commits
- Merge pull request #298 from edx-solutions/ziafazal/api-fix-company-proficiency-avg · 2c170065
```
ziafazal/api-fix-company-proficiency-avg: fix for incorrect average calculation
```
  Matt Drayer committed Oct 31, 2014
  2c170065 Browse Files
- ziafazal/api-fix-company-proficiency-avg: fix for · e17be72c
```
incorrect average calculation
```
  Zia Fazal committed Oct 31, 2014
  e17be72c Browse Files
30 Oct, 2014 7 commits
- Merge pull request #296 from edx-solutions/mattdrayer/api-org-migration · 1e7f5a6f
```
mattdrayer/api-org-migration: Moved api_manager data migration work to o...
```
  Matt Drayer committed Oct 30, 2014
  1e7f5a6f Browse Files
- mattdrayer/api-org-migration: Moved api_manager data migration work to orgs app · 00918f7f
  Matt Drayer committed Oct 30, 2014
  
  00918f7f Browse Files
- Merge pull request #294 from edx-solutions/ziafazal/api-add-course-image-to-overview · 6a13a011
```
ziafazal/api-add-course-image-to-overview: added course_image_url to course overview api
```
  Matt Drayer committed Oct 30, 2014
  6a13a011 Browse Files
- Merge pull request #292 from edx-solutions/mattdrayer/api-cmc-stage-fix · 0daa5141
```
mattdrayer/api-cmc-stage-fix: Strip i4x:// prefix from stage column values
```
  Matt Drayer committed Oct 30, 2014
  0daa5141 Browse Files
- ziafazal/api-add-course-image-to-overview: added · fffd0842
```
course_image_url to course overview api

added video to overview page
```
  Zia Fazal committed Oct 30, 2014
  fffd0842 Browse Files
- image-explorer: update hash · d815b636
  Xavier Antoviaque committed Oct 30, 2014
  
  d815b636 Browse Files
- mattdrayer/api-cmc-stage-fix: Strip i4x prefix from stage column values · abbc8ce1
  Matt Drayer committed Oct 29, 2014
  
  abbc8ce1 Browse Files
29 Oct, 2014 5 commits
- Merge pull request #290 from edx-solutions/mattdrayer/api-progress-generator-fix · b63438ed
```
mattdrayer/api-progress-generator-fix: Repaired existence check
```
  Matt Drayer committed Oct 29, 2014
  b63438ed Browse Files
- mattdrayer/api-progress-generator-fix: Repaired existence check · 047239ec
  Matt Drayer committed Oct 29, 2014
  
  047239ec Browse Files
- Merge pull request #288 from edx-solutions/ziafazal/api-make-org-separate-app-am · 8e134c9f
```
ziafazal/api-make-org-separate-app: created separate app for organizations
```
  Matt Drayer committed Oct 29, 2014
  8e134c9f Browse Files
- drag-n-drop: Update hash · aa9029fa
  Xavier Antoviaque committed Oct 29, 2014
  
  aa9029fa Browse Files
- initial changes · f7b6206b
```
completed tests and added type filter

removed organizations app

migration to delete tables
```
  Zia Fazal committed Oct 29, 2014
  f7b6206b Browse Files
28 Oct, 2014 4 commits
- Merge pull request #287 from edx-solutions/ziafazal/api-fix-duplicats-on-cohort-page · c054598a
```
ziafazal/api-fix-duplicats-on-cohort-page:fixed duplicates when user is enrolled in more than one course
```
  Matt Drayer committed Oct 28, 2014
  c054598a Browse Files
- discussion: Update hash · 28b0ca38
  Xavier Antoviaque committed Oct 28, 2014
  
  28b0ca38 Browse Files
- fixed duplicates when user is enrolled in more than one course · 2461e1f9
  Zia Fazal committed Oct 28, 2014
  
  2461e1f9 Browse Files
- image-explorer: Update hash · b48a4333
  Xavier Antoviaque committed Oct 28, 2014
  
  b48a4333 Browse Files
27 Oct, 2014 3 commits
- discussion: Update hash · 8dfbc1cc
  Xavier Antoviaque committed Oct 27, 2014
  
  8dfbc1cc Browse Files
- Merge pull request #286 from open-craft/discussion-integration · b4fe3c89
```
Discussion integration
```
  Xavier Antoviaque committed Oct 27, 2014
  b4fe3c89 Browse Files
- drag-n-drop-v2: Update hash · d0f84762
  Xavier Antoviaque committed Oct 27, 2014
  
  d0f84762 Browse Files
24 Oct, 2014 6 commits
- discussion-integration: Fixed call to safe_content in x_module. · a4e16c5e
  Jonathan Piacenti committed Oct 24, 2014
  
  a4e16c5e Browse Files
- discussion-integration: Ignore query string when deriving course from URL. · 8ef293b6
  Jonathan Piacenti committed Oct 24, 2014
  
  8ef293b6 Browse Files
- Merge pull request #285 from edx-solutions/ziafazal/api-org-groups-relationship · eb3a32aa
```
ziafazal/api-org-groups-relationship: added groups
```
  Matt Drayer committed Oct 24, 2014
  eb3a32aa Browse Files
- Merge pull request #283 from edx-solutions/ziafazal/api-fix-bug-mysql-datetime-error · 28f9ba67
```
fixed mysql date time error and broken organization tests
```
  Matt Drayer committed Oct 24, 2014
  28f9ba67 Browse Files
- fixed mysql date time error · 35f8cbfd
```
added if check for mysql
```
  Zia Fazal committed Oct 24, 2014
  35f8cbfd Browse Files
- ziafazal/api-org-groups-relationship: added group · 4c487764
```
association with organisation
```
  Zia Fazal committed Oct 24, 2014
  4c487764 Browse Files
23 Oct, 2014 4 commits
- Merge pull request #284 from edx-solutions/ziafazal/api-strip-unenrolled-users-from-social-stats · 67cf6607
```
ziafazal/api-strip-unenrolled-users-from-social-stats:strip un-enrolled users from social stats
```
  Matt Drayer committed Oct 23, 2014
  67cf6607 Browse Files
- ziafazal/api-strip-unenrolled-users-from-social-stats · c810768b
```
strip un-enrolled users from social stats
```
  Zia Fazal committed Oct 23, 2014
  c810768b Browse Files
- Merge pull request #282 from edx-solutions/ziafazal/api-exclude-unenrolled-from-org-metrics · 8213b00a
```
added active flag on organisation metrics
```
  Matt Drayer committed Oct 23, 2014
  8213b00a Browse Files
- added active flag on organisation metrics · 68c225ad
  Zia Fazal committed Oct 23, 2014
  
  68c225ad Browse Files
22 Oct, 2014 5 commits
- Merge pull request #281 from edx-solutions/mattdrayer/api-time-series-fix · 33be2be6
```
mattdrayer/api-time-series-fix: Use backticks instead of quotes
```
  Matt Drayer committed Oct 22, 2014
  33be2be6 Browse Files
- mattdrayer/api-time-series-fix: Use backticks instead of quotes · daf3016f
  Matt Drayer committed Oct 22, 2014
  
  daf3016f Browse Files
- Merge pull request #280 from edx-solutions/ziafazal/api-exclude-unenrolled-from-counts · 9841ef95
```
ziafazal/api-exclude-unenrolled-from-counts:exclude un-enrolled users from course metrics/counts
```
  Matt Drayer committed Oct 22, 2014
  9841ef95 Browse Files
- ziafazal/api-exclude-unenrolled-from-counts:exclude · b2eeec53
```
un-enrolled users from counts
```
  Zia Fazal committed Oct 22, 2014
  b2eeec53 Browse Files
- mentoring: Update hash · 414de554
  Xavier Antoviaque committed Oct 22, 2014
  
  414de554 Browse Files