Commits · a00c2a7c4786c879615b813b591f679169015bfd · edx / edx-platform · GitLab

28 Dec, 2015 11 commits
- Course API: Change field name from course_id to id · a00c2a7c
  Nimisha Asthagiri committed Dec 28, 2015
  
  a00c2a7c Browse Files
- Merge pull request #11049 from edx/mobile/catalog-api-overview-field · 6bbc46b1
```
Update Course Catalog API to support About Overview field
```
  Nimisha Asthagiri committed Dec 28, 2015
  6bbc46b1 Browse Files
- Update Course Catalog API to include About Overview field. · 3d84e292
  Nimisha Asthagiri committed Dec 28, 2015
  
  3d84e292 Browse Files
- Merge pull request #11012 from edx/cdodge/edx-proctoring-0.12 · 1b3e7302
```
use edx-proctoring version 0.12.x
```
  Douglas Hall committed Dec 28, 2015
  1b3e7302 Browse Files
- Merge pull request #11075 from edx/benp/fix-flaky-hello · d460eb62
```
Fix flaky condition.
```
  Ben Patterson committed Dec 28, 2015
  d460eb62 Browse Files
- Merge pull request #11065 from edx/benp/fix-flaky-course-import · 1599ae2f
```
Fix flaky condition. TNL-3937.
```
  Ben Patterson committed Dec 28, 2015
  1599ae2f Browse Files
- Merge pull request #11067 from edx/cdodge/allow-nested-templates · 88e21c36
```
Replace https://github.com/edx/edx-platform/pull/10780 with this PR
```
  Douglas Hall committed Dec 28, 2015
  88e21c36 Browse Files
- use edx-proctoring version 0.12.x · 45ce2896
  Chris Dodge committed Dec 28, 2015
  
  45ce2896 Browse Files
- Fix flaky condition in lettuce test. · 056158d7
  Ben Patterson committed Dec 28, 2015
  
  056158d7 Browse Files
- Merge pull request #11053 from edx/peter-fogg/enrollment-api-slashes · d9b181e8
```
Add optional trailing slashes to the Enrollment API.
```
  Peter Fogg committed Dec 28, 2015
  d9b181e8 Browse Files
- Apply patch from hasnain-naveed/HOL-4-navigation-template-change in order to get… · 0b4f3599
```
Apply patch from hasnain-naveed/HOL-4-navigation-template-change in order to get a Jenkins build running
```
  Chris Dodge committed Dec 27, 2015
  0b4f3599 Browse Files
27 Dec, 2015 2 commits
- Merge pull request #11057 from edx/course_api/has_access_performance · 76df0f06
```
Performance enhancement in see_exists: reverse order of checks
```
  Nimisha Asthagiri committed Dec 27, 2015
  76df0f06 Browse Files
- Fix flaky condition. TNL-3937. · d5220682
  Ben Patterson committed Dec 26, 2015
  
  d5220682 Browse Files
23 Dec, 2015 6 commits
- Performance enhancement in see_exists: reverse order of checks · 44abf7a9
  Nimisha Asthagiri committed Dec 23, 2015
  
  44abf7a9 Browse Files
- Merge pull request #11047 from edx/mobile/course-api-filter · 765f5285
```
Update Course Catalog API to support filters
```
  Nimisha Asthagiri committed Dec 23, 2015
  765f5285 Browse Files
- Merge pull request #11056 from edx/raees/chrome-bokchoy-test-cannot-upload-sjson-translation · 365191d6
```
Fixed test cannot upload json translation failing on Chrome
```
  raeeschachar committed Dec 23, 2015
  365191d6 Browse Files
- Update Course Catalog API to support filters · 8e3f4e05
  Nimisha Asthagiri committed Dec 23, 2015
  
  8e3f4e05 Browse Files
- Fixed test cannot upload json translation failing on Chrome · e5cbb1c9
  raeeschachar committed Dec 23, 2015
  
  e5cbb1c9 Browse Files
- Merge pull request #11051 from Ayub-Khan/ayubkhan/TNL-3822 · 766c3dca
```
Fix escaping in studio editor
```
  Usman Khalid committed Dec 23, 2015
  766c3dca Browse Files
22 Dec, 2015 16 commits
- Add options trailing slashes to the Enrollment API. · 3149aaa3
```
This allows the edX REST API Client to perform a sucessful GET against
this API, since Slumber (which our client is based off of) appends the
trailing slash by default.
```
  Peter Fogg committed Dec 22, 2015
  3149aaa3 Browse Files
- Merge pull request #10962 from edx/robrap/TNL-3425 · f5a63b1e
```
Deprecate escaping in display_name_with_default
```
  Robert Raposa committed Dec 22, 2015
  f5a63b1e Browse Files
- Merge pull request #11036 from edx/raees/chrome-bokchoy-test-cohort-by-csv-unicode · 62597a17
```
Fixed test cohort by csv unicode failing on Chrome
```
  raeeschachar committed Dec 22, 2015
  62597a17 Browse Files
- Deprecate escaping in display_name_with_default · 5e69224c
```
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
```
  Robert Raposa committed Dec 22, 2015
  5e69224c Browse Files
- Merge pull request #11052 from edx/clytwynec/a11y-tests · 590e0481
```
Fix exit status of A11y tests
```
  Christine Lytwynec committed Dec 22, 2015
  590e0481 Browse Files
- Update pylintrc_tweaks · 424d26c9
```
Add changes for longer names.  This will get backed out once it
makes it in to edx-pylint.

TNL-3425
```
  Robert Raposa committed Dec 22, 2015
  424d26c9 Browse Files
- Merge pull request #11044 from edx/revert-10994-mushtaq/improve_get_item · 82ca667d
```
Revert "Append block item only if it has path to root"
```
  Ben Patterson committed Dec 22, 2015
  82ca667d Browse Files
- Fix exit status of A11y tests · 51766a73
  Christine Lytwynec committed Dec 22, 2015
  
  51766a73 Browse Files
- Merge pull request #11046 from edx/merge-release-into-master · 72ed155c
```
Merge release into master
```
  Peter Fogg committed Dec 22, 2015
  72ed155c Browse Files
- Merge pull request #11043 from edx/pdesjardins/DOC-2543-b · 2bf25b2f
```
Edit text strings in default template for web certificates to make them more generally applicable
```
  Peter Desjardins committed Dec 22, 2015
  2bf25b2f Browse Files
- Merge pull request #11022 from edx/bookmarking · 5e972b2a
```
Bookmarking
```
  Usman Khalid committed Dec 22, 2015
  5e972b2a Browse Files
- Merge pull request #10988 from edx/saleem-latif/SOL-1493 · ca2b8c27
```
SOL-1493: Web Certificates: Platform Branding integration
```
  Matt Drayer committed Dec 22, 2015
  ca2b8c27 Browse Files
- Merge pull request #11038 from edx/raees/chrome-bokchoy-test-search-flaky · 05b96f8c
```
Fixed test search flaky on Firefox and Chrome
```
  raeeschachar committed Dec 22, 2015
  05b96f8c Browse Files
- Merge pull request #11016 from edx/ekafeel/bookmarks-limit · a93ef10f
```
Limit the number of bookmarks a learner can add in a course
```
  Usman Khalid committed Dec 22, 2015
  a93ef10f Browse Files
- Move get_logo_url from branding/__init__.py to branding/api.py for consistency. · 3967d809
  Saleem Latif committed Dec 22, 2015
  
  3967d809 Browse Files
- Web Certificates: Platform Branding integration · 475429c0
  Saleem Latif committed Dec 22, 2015
  
  475429c0 Browse Files
21 Dec, 2015 5 commits
- Edited text strings in the default template for web certificates to remove… · 451ae3b2
```
Edited text strings in the default template for web certificates to remove wording specific to edx.org. Addresses DOC-2543.
```
  Peter Desjardins committed Dec 21, 2015
  451ae3b2 Browse Files
- Merge pull request #11032 from edx/pmitros/external-xblock-tests · 41195761
```
Allow us to run tests from external XBlock repositories
```
  Piotr Mitros committed Dec 21, 2015
  41195761 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · 39de6e82
  Peter Fogg committed Dec 21, 2015
  
  39de6e82 Browse Files
- Merge pull request #11026 from edx/patch/2015-12-21 · bc121bfb
```
Patch 2015-12-21
```
  Peter Fogg committed Dec 21, 2015
  bc121bfb Browse Files
- Allow us to run tests from external XBlock repositories · ea27d19c
  Piotr Mitros committed Dec 21, 2015
  
  ea27d19c Browse Files