Commits · b92ab6c981693eb05227bd55a05e1d4c2ed6cb20 · edx / course-discovery · GitLab

22 Aug, 2016 8 commits
- Corrected migration SQL · b92ab6c9
```
"key" is a keyword for MySQL. This was missed due to tests being run against SQLite.

ECOM-5195
```
  Clinton Blackburn committed Aug 22, 2016
  b92ab6c9 Browse Files
- Post-merge fixes for Course model and data loader (#268) · ed5957f6
```
- Corrected data loader URL
- Added migration to remove duplicated courses

ECOM-5195
```
  Clinton Blackburn committed Aug 22, 2016
  ed5957f6 Browse Files
- Merge pull request #249 from edx/clintonb/course-model-update · 03650f75
```
Updated course and course run data models and data loaders
```
  Clinton Blackburn committed Aug 22, 2016
  03650f75 Browse Files
- Improved CourseRun admin · e343a770
```
ECOM-5195
```
  Clinton Blackburn committed Aug 22, 2016
  e343a770 Browse Files
- Updated course and course run data models and data loaders · 1dd3681b
```
ECOM-5195 and ECOM-5196
```
  Clinton Blackburn committed Aug 22, 2016
  1dd3681b Browse Files
- Merge pull request #267 from edx/clintonb/update-search-doc · da420c53
```
Updated search template for programs
```
  Clinton Blackburn committed Aug 22, 2016
  da420c53 Browse Files
- Updated search template for programs · 02752397
```
ECOM-5316
```
  Clinton Blackburn committed Aug 22, 2016
  02752397 Browse Files
- Moved to templates within app · 501dbeac
```
App-specific templates should live within the respective app(s). This leads to better organization and less confusion for developers searching for templates.

 ECOM-5316
```
  Clinton Blackburn committed Aug 22, 2016
  501dbeac Browse Files
19 Aug, 2016 10 commits
- Merge pull request #263 from edx/pdesjardins/update-swagger-label · 130dfb4d
```
Update the Swagger doc label for the catalog API
```
  Peter Desjardins committed Aug 19, 2016
  130dfb4d Browse Files
- Update the Swagger doc label for the catalog API · b5815aa3
```
Update the label that's shown at the top of the swagger doc. It is currently "course discovery API," but I understand that the preferred terminology is "catalog API."
```
  Peter Desjardins committed Aug 19, 2016
  b5815aa3 Browse Files
- Merge pull request #262 from edx/schen/ECOM-5277 · aa55c8ec
```
ECOM-5277 create the credit_redemption_overview programs field
```
  Simon Chen committed Aug 19, 2016
  aa55c8ec Browse Files
- ECOM-5277 create the credit_redemption_overview programs field · f54414e0
  Simon Chen committed Aug 19, 2016
  
  f54414e0 Browse Files
- Merge pull request #261 from edx/clintonb/code-cleanup · a62a16cc
```
Code Cleanup
```
  Clinton Blackburn committed Aug 18, 2016
  a62a16cc Browse Files
- Moved mock data to data_loaders.tests · 87ba7eea
```
ECOM-5094
```
  Clinton Blackburn committed Aug 18, 2016
  87ba7eea Browse Files
- Removed duplicated code in marketing site data loader tests · 0a05ea5e
```
ECOM-5094
```
  Clinton Blackburn committed Aug 18, 2016
  0a05ea5e Browse Files
- Updated factories · a6eb3740
```
Removed duplicated code associated with adding m2m objects.

ECOM-5094
```
  Clinton Blackburn committed Aug 18, 2016
  a6eb3740 Browse Files
- Merge pull request #260 from edx/renzo/authoring-orgs-only · 77ac05a8
```
Restrict serialized program organizations to authoring ones only
```
  Renzo Lucioni committed Aug 18, 2016
  77ac05a8 Browse Files
- Restrict serialized program organizations to authoring ones only · 96b98181
  Renzo Lucioni committed Aug 18, 2016
  
  96b98181 Browse Files
18 Aug, 2016 10 commits
- Merge pull request #254 from edx/mdikan/WIP-programs-add-to-course · 555bc751
```
Update to course API to include (condensed) program info - https://openedx.atlassian.net/browse/ECOM-5095
```
  mikedikan committed Aug 18, 2016
  555bc751 Browse Files
- Update to course API to include (condensed) program info · 5107ad29
  Mike Dikan committed Aug 18, 2016
  
  5107ad29 Browse Files
- Merge pull request #258 from edx/schen/ECOM-5264 · 125bf70c
```
ECOM-5264 Make sure the banner image is stored at the correct path in S3
```
  Simon Chen committed Aug 18, 2016
  125bf70c Browse Files
- ECOM-5264 Make sure the banner image is stored at the correct path in S3 · e06df4ba
  Simon Chen committed Aug 18, 2016
  
  e06df4ba Browse Files
- Merge pull request #257 from edx/bderusha/program-dupes-ECOM-5209 · 16e6f8c7
```
Update program data loader to match drupal loader
```
  Bill DeRusha committed Aug 18, 2016
  16e6f8c7 Browse Files
- Update program data loader to match drupal loader · c3bf5f97
  Bill DeRusha committed Aug 18, 2016
  
  c3bf5f97 Browse Files
- Merge pull request #256 from edx/renzo/fix-no-orgs · 64e29046
```
Allow ProgramSearchSerializer to deal with missing organization bodies
```
  Renzo Lucioni committed Aug 18, 2016
  64e29046 Browse Files
- Allow ProgramSearchSerializer to deal with missing organization bodies · 013b7f46
  Renzo Lucioni committed Aug 18, 2016
  
  013b7f46 Browse Files
- Merge pull request #255 from edx/renzo/authoring-organizations · 98c38ede
```
Add authoring organizations to programs in search results
```
  Renzo Lucioni committed Aug 17, 2016
  98c38ede Browse Files
- Add authoring organizations to programs in search results · 864e54f8
```
Keeps serialized organizations in search and programs API responses consistent. ECOM-5285.
```
  Renzo Lucioni committed Aug 17, 2016
  864e54f8 Browse Files
17 Aug, 2016 8 commits
- Merge pull request #237 from edx/schen/ECOM-5031 · ec7b4469
```
ECOM-5031 Incorporate the stdImage library for the program banner image
```
  Simon Chen committed Aug 17, 2016
  ec7b4469 Browse Files
- ECOM-4419 Create the stdimage library integration · ebb4292e
  Simon Chen committed Aug 17, 2016
  
  ebb4292e Browse Files
- Merge pull request #206 from edx/mattdrayer/add-partner-docs · 8540060f
```
mattdrayer/add-partner-docs: Update "Getting Started" section
```
  Matt Drayer committed Aug 17, 2016
  8540060f Browse Files
- mattdrayer/add-partner-docs: Update "Getting Started" section · 6fdbe32c
  Matt Drayer committed Aug 17, 2016
  
  6fdbe32c Browse Files
- Updated dependencies (#252) · 81738534
  Clinton Blackburn committed Aug 17, 2016
  
  81738534 Browse Files
- Merge pull request #251 from edx/clintonb/minor-improvements · 4c494a4f
```
Miscellaneous updates
```
  Clinton Blackburn committed Aug 16, 2016
  4c494a4f Browse Files
- Updated requirements · 1792fc2b
```
ECOM-5094
```
  Clinton Blackburn committed Aug 16, 2016
  1792fc2b Browse Files
- Added additional Chinese language tags · 83620206
```
ECOM-5094
```
  Clinton Blackburn committed Aug 16, 2016
  83620206 Browse Files
16 Aug, 2016 4 commits
- Merge pull request #250 from edx/renzo/uuid-list-filter · c303d2cc
```
Allow programs to be filtered by comma-separated UUIDs
```
  Renzo Lucioni committed Aug 16, 2016
  c303d2cc Browse Files
- Allow programs to be filtered by comma-separated UUIDs · 61a3e903
```
ECOM-5261
```
  Renzo Lucioni committed Aug 16, 2016
  61a3e903 Browse Files
- Updated Person model and data loader (#243) · a9c5877c
```
ECOM-5193 and ECOM-5194
```
  Clinton Blackburn committed Aug 16, 2016
  a9c5877c Browse Files
- Merge pull request #248 from edx/renzo/program-type-filter · d5a47469
```
Allow programs to be filtered by type
```
  Renzo Lucioni committed Aug 16, 2016
  d5a47469 Browse Files