Commits · cb6bc3b062c577a2ecf7069a71845f1b32d863e9 · edx / edx-platform · GitLab

14 Nov, 2014 2 commits
- Copied test specs · cb6bc3b0
  jsa committed Nov 14, 2014
  
  cb6bc3b0 Browse Files
- Moved discussion XBlock to edx-platform · 70067eb6
```
(cherry picked from commit a7c0a2a)
```
  E. Kolpakov committed Nov 14, 2014
  70067eb6 Browse Files
13 Nov, 2014 2 commits
- drag-n-drop: Update hash · 6efca845
  Xavier Antoviaque committed Nov 13, 2014
  
  6efca845 Browse Files
- Merge pull request #311 from open-craft/fix_test_runners · 13b13910
```
A few patches to fix dependency issues with Organizations.
```
  Xavier Antoviaque committed Nov 13, 2014
  13b13910 Browse Files
12 Nov, 2014 1 commit
- mentoring: update hash · 5ff43758
  Xavier Antoviaque committed Nov 12, 2014
  
  5ff43758 Browse Files
11 Nov, 2014 1 commit
- discussion: Update hash · 0197f00c
  Xavier Antoviaque committed Nov 11, 2014
  
  0197f00c Browse Files
10 Nov, 2014 4 commits
- Merge pull request #315 from edx-solutions/mattdrayer/api-remove-isactive-user-filter · e2a8d8dc
```
mattdrayer/api-remove-isactive-user-filter: Removed registration check f...
```
  Matt Drayer committed Nov 10, 2014
  e2a8d8dc Browse Files
- mattdrayer/api-remove-isactive-user-filter: Removed registration check from older operations · 9421eef3
  Matt Drayer committed Nov 10, 2014
  
  9421eef3 Browse Files
- Merge pull request #314 from edx-solutions/ziafazal/api-update-user-title-when-empty · 3f11ab14
```
ziafazal/api-update-user-title-when-empty:accept empty user title
```
  Matt Drayer committed Nov 10, 2014
  3f11ab14 Browse Files
- ziafazal/api-update-user-time-when-emtpy:accept empty user title · 20f972b4
```
added comment
```
  Zia Fazal committed Nov 10, 2014
  20f972b4 Browse Files
07 Nov, 2014 2 commits
- Merge pull request #293 from edx-solutions/ziafazal/api-move-cmc-to-progress · 546ae2c0
```
moved cmc from api_manager to progress
```
  Matt Drayer committed Nov 07, 2014
  546ae2c0 Browse Files
- Updating group project xblock hash · 4822b37a
  Martyn James committed Nov 07, 2014
  
  4822b37a Browse Files
06 Nov, 2014 4 commits
- A few patches to fix dependency issues with Organizations. · 5e967365
  Jonathan Piacenti committed Nov 06, 2014
  
  5e967365 Browse Files
- Merge pull request #308 from edx-solutions/derf/progress_detached_categories_setting · 5031854b
```
set PROGRESS_DETACHED_CATEGORIES for prod environments
```
  Fred Smith committed Nov 06, 2014
  5031854b Browse Files
- set PROGRESS_DETACHED_CATEGORIES for prod environments · f2d4a14f
  Fred Smith committed Nov 06, 2014
  
  f2d4a14f Browse Files
- mattdrayer/api-migrate_transitional_ids: Cleaned up two additional tables · 84a3a512
```
merged with master

changes after matts suggestions
```
  Matt Drayer committed Nov 06, 2014
  84a3a512 Browse Files
05 Nov, 2014 4 commits
- image-explorer: Update hash · fb5c7c7c
  Xavier Antoviaque committed Nov 05, 2014
  
  fb5c7c7c Browse Files
- Merge pull request #304 from edx/clintonb/api-cleanup · 31dabfcf
```
Using course ID regex from set
```
  Matt Drayer committed Nov 05, 2014
  31dabfcf Browse Files
- Merge branch 'release' into master · b1324d3e
  Xavier Antoviaque committed Nov 05, 2014
  
  b1324d3e Browse Files
- mentoring: Update hash · 6567b83f
  Xavier Antoviaque committed Nov 05, 2014
  
  6567b83f Browse Files
04 Nov, 2014 5 commits
- Using course ID regex from set · f7d18806
```
- API now use same regex as the rest of LMS
- Content regex includes the period (.) character
```
  Clinton Blackburn committed Nov 04, 2014
  f7d18806 Browse Files
- Merge pull request #303 from edx-solutions/mattdrayer/api-migrate_transitional_ids · 9169d854
```
mattdrayer/api-migrate_transitional_ids: Cleaned up two additional table...
```
  Matt Drayer committed Nov 04, 2014
  9169d854 Browse Files
- Merge pull request #302 from edx-solutions/mattdrayer/api-migrate_transitional_ids · 7c5e0c05
```
mattdrayer/api-migrate_transitional_ids: Cleaned up two additional table...
```
  Matt Drayer committed Nov 04, 2014
  7c5e0c05 Browse Files
- mattdrayer/api-migrate_transitional_ids: Cleaned up two additional tables · fda05a6c
  Matt Drayer committed Nov 03, 2014
  
  fda05a6c Browse Files
- Merge pull request #301 from edx-solutions/master · 00033f21
```
changes from master to release
```
  Fred Smith committed Nov 03, 2014
  00033f21 Browse Files
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 2 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