Commits · b406a70f5acf1e4143a3c311ef2001eb0a66571d · edx / edx-platform

02 Aug, 2016 8 commits
- Merge pull request #13148 from edx/aj/TNL-4950_xBlockCounts · b406a70f
```
Added documentation and example json file
```
  Albert (AJ) St. Aubin committed Aug 02, 2016
  b406a70f Browse Files
- Merge pull request #13125 from edx/renzo/multiple-program-types · c5434c53
```
Allow program listing page to display programs from any category
```
  Renzo Lucioni committed Aug 02, 2016
  c5434c53 Browse Files
- Merge pull request #13147 from edx/release · 13c8e392
```
Release
```
  mikedikan committed Aug 02, 2016
  13c8e392 Browse Files
- Added documentation and example json file · 87538185
```
Updated README with greater detail

updated README

PR update

PR update (squash)

README updated with minor PR updates
```
  Albert St. Aubin committed Aug 02, 2016
  87538185 Browse Files
- Merge pull request #13130 from edx/rc/2016-08-02 · e77f9159
```
Release Candidate rc/2016-08-02
```
  mikedikan committed Aug 02, 2016
  e77f9159 Browse Files
- Merge pull request #13035 from OmarIthawi/edraak/rtl-fixups · ba74ba90
```
Two RTL Fixups in Studio and CAPA problems
```
  alisan617 committed Aug 02, 2016
  ba74ba90 Browse Files
- Two RTL Fixups in Studio and CAPA problems · 1655625b
```
  - Fixed RTL icon margin in the studio
  - Make math equation fields always LTR in CAPA problems
```
  Omar Al-Ithawi committed Aug 02, 2016
  1655625b Browse Files
- Merge pull request #13127 from edx/saleem-latif/MAYN-207 · c8fe48b9
```
MAYN-207: Update configuration helpers to take into account microsite configurations
```
  Saleem Latif committed Aug 02, 2016
  c8fe48b9 Browse Files
01 Aug, 2016 14 commits
- Allow program listing page to display programs from any category · 8196e1a0
```
This work removes most references to XSeries from the LMS in an attempt to be more general. ECOM-5018.
```
  Renzo Lucioni committed Aug 01, 2016
  8196e1a0 Browse Files
- Merge pull request #13135 from edx/release · df63f728
```
Release
```
  mikedikan committed Aug 01, 2016
  df63f728 Browse Files
- Merge pull request #13141 from edx/adam/revert-commit · 6b9b0925
```
Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Imp…
```
  mikedikan committed Aug 01, 2016
  6b9b0925 Browse Files
- Merge pull request #13113 from edx/aj/TNL-4950_xBlockCounts · 153843d7
```
Script to collect data on the xblock usage within the edx platform, T…
```
  Albert (AJ) St. Aubin committed Aug 01, 2016
  153843d7 Browse Files
- Merge pull request #13087 from edx/clrux/ac-543 · 685bc2ff
```
AC-543 fixing bulk cert exception implicit labels
```
  Chris committed Aug 01, 2016
  685bc2ff Browse Files
- Merge pull request #13131 from edx/christina/retry-celery · 37db65fa
```
Retry on failures (database locking).
```
  Christina Roberts committed Aug 01, 2016
  37db65fa Browse Files
- Merge pull request #13081 from edx/bjacobel/eslint · 829b7641
```
Replace JSHint with ESLint and the new JavaScript styleguide
```
  Brian Jacobel committed Aug 01, 2016
  829b7641 Browse Files
- Merge pull request #13124 from open-craft/smarnach/manage-user · d6203b7f
```
Add support to set initial password hash to manage_user command.
```
  Sven Marnach committed Aug 01, 2016
  d6203b7f Browse Files
- fix failing test by updating require_global_staff decorator · 6c743c54
  Adam Palay committed Aug 01, 2016
  
  6c743c54 Browse Files
- Merge pull request #13118 from shaunagm/master · 9b48eaf2
```
Change relative paths to absolute paths in in acceptance test imports
```
  shaunagm committed Aug 01, 2016
  9b48eaf2 Browse Files
- Script to collect data on the xblock usage within the edx platform, This script… · 0d102caa
```
Script to collect data on the xblock usage within the edx platform, This script uses the Course block API and returns CSV reports

Updates for Pep8 compliance

Fixed issues found while testing with greater datasets and found during report review

PR updates (Squash)
```
  Albert St. Aubin committed Aug 01, 2016
  0d102caa Browse Files
- Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Implement… · feb042d4
```
Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46"

This reverts commit 27646b7e.
```
  Adam Palay committed Aug 01, 2016
  feb042d4 Browse Files
- Update configuration helpers to take into account microsite configurations · cff28539
  Saleem Latif committed Aug 01, 2016
  
  cff28539 Browse Files
- Merge pull request #13115 from edx/aphanse/modify-coveragerc · 88920510
```
Change python coveragerc file
```
  Aasavari Phanse committed Aug 01, 2016
  88920510 Browse Files
29 Jul, 2016 17 commits
- Merge pull request #13133 from edx/hotfix/2016-07-29 · 83d0b239
```
test that passing unicode to a youtube id does not throw an error (TN…
```
  Adam committed Jul 29, 2016
  83d0b239 Browse Files
- Merge pull request #13019 from mitocw/fix/aq/emit_course_published_event · 70929ffb
```
Fixed progress page update on save ccx and grade book crash issue
```
  John Eskew committed Jul 29, 2016
  70929ffb Browse Files
- fix quality failure · 74ab4ad9
  Adam Palay committed Jul 29, 2016
  
  74ab4ad9 Browse Files
- AC-543 fixing bulk cert exception implicit labels · a10b61f8
  Chris Rodriguez committed Jul 29, 2016
  
  a10b61f8 Browse Files
- test that passing unicode to a youtube id does not throw an error (TNL-5127) · ec1cbdf5
  Adam Palay committed Jul 29, 2016
  
  ec1cbdf5 Browse Files
- Add back JSHint tests · 9c959b9d
  Brian Jacobel committed Jul 29, 2016
  
  9c959b9d Browse Files
- Install and configure eslint and eslint-config-edx (alongside JSHint for now) · af762733
  Brian Jacobel committed Jul 29, 2016
  
  af762733 Browse Files
- Retry on failures (database locking). · 7efc7fe4
```
TNL-5091
```
  cahrens committed Jul 29, 2016
  7efc7fe4 Browse Files
- Made ccx id unicode in app · 34034aa6
  Amir Qayyum Khan committed Jul 29, 2016
  
  34034aa6 Browse Files
- Merge pull request #12794 from edx/benp/collectstatic-logging · 2c4ab116
```
FEDX-152. Pipe collectstatic results to a file for bok-choy tests.
```
  Ben Patterson committed Jul 29, 2016
  2c4ab116 Browse Files
- Fixed progress page update on save ccx · d5fcb609
  Amir Qayyum Khan committed Jul 29, 2016
  
  d5fcb609 Browse Files
- FEDX-152. Pipe collectstatic results to a file for bok-choy tests. · 066450d2
  Ben Patterson committed Jul 29, 2016
  
  066450d2 Browse Files
- Merge pull request #12818 from edx/jia/MA-2536 · 550f8520
```
MA-2536: get 'course_about' url in enrollment
```
  wajeeha-khalid committed Jul 29, 2016
  550f8520 Browse Files
- MA-2536: get 'course_about' url in enrollment · 986dcff6
  wajeeha-khalid committed Jul 29, 2016
  
  986dcff6 Browse Files
- Add support to set initial password hash to manage_user command. · 0206dfae
  Sven Marnach committed Jul 29, 2016
  
  0206dfae Browse Files
- Merge pull request #13119 from edx/jia/MA-2646 · cad10c23
```
MA-2646: handle profile_image in requested_fields for anonymous user
```
  wajeeha-khalid committed Jul 29, 2016
  cad10c23 Browse Files
- MA-2646: handle profile_image in requested_fields for anonymous user · 551fd7ee
  wajeeha-khalid committed Jul 29, 2016
  
  551fd7ee Browse Files
28 Jul, 2016 1 commit
- Remove unused imports, move too-long imports to multiple lines · f8d28889
  Shauna Gordon-McKeon committed Jul 28, 2016
  
  f8d28889 Browse Files