Commits · c8fe48b94756f5946d26d629bc03c23b62b90482 · edx / edx-platform · GitLab

02 Aug, 2016 1 commit
- 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 9 commits
- 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
- 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
- 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 14 commits
- 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
- AC-543 fixing bulk cert exception implicit labels · a10b61f8
  Chris Rodriguez committed Jul 29, 2016
  
  a10b61f8 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 15 commits
- Remove unused imports, move too-long imports to multiple lines · f8d28889
  Shauna Gordon-McKeon committed Jul 28, 2016
  
  f8d28889 Browse Files
- Switch relative to absolute urls in imports (tests/lms part 2) · 12a61931
  Shauna Gordon-McKeon committed Jul 28, 2016
  
  12a61931 Browse Files
- Switch relative to absolute urls in imports (tests/lms part 1) · 89ed6f1c
  Shauna Gordon-McKeon committed Jul 28, 2016
  
  89ed6f1c Browse Files
- Switch relative to absolute urls in imports (video, discussion, misc) · 29bb5b50
  Shauna Gordon-McKeon committed Jul 28, 2016
  
  29bb5b50 Browse Files
- Switch relative to absolute urls in imports (tests/studio part 2) · 5d50e76e
  Shauna Gordon-McKeon committed Jul 28, 2016
  
  5d50e76e Browse Files
- Switch relative to absolute urls in imports (tests/studio part 1) · 787b4205
  Shauna Gordon-McKeon committed Jul 28, 2016
  
  787b4205 Browse Files
- Merge pull request #13023 from edx/kkim/country_tz_api · 3a65ca02
```
Country Time Zone API
```
  Kevin Kim committed Jul 28, 2016
  3a65ca02 Browse Files
- Merge pull request #13116 from edx/christina/remove-extra-save · a35a6b73
```
There is no need to call save after add/remove.
```
  Christina Roberts committed Jul 28, 2016
  a35a6b73 Browse Files
- Add endpoint for commonly used country time zones · 127095b9
  Kevin Kim committed Jul 28, 2016
  
  127095b9 Browse Files
- Merge pull request #13123 from edx/sstudent/milestones-fie · 194c5096
```
Fixing test failures on master
```
  sanfordstudent committed Jul 28, 2016
  194c5096 Browse Files
- fixing failing tests on master from enabling milestones_app feature flag · 03256937
  Sanford Student committed Jul 28, 2016
  
  03256937 Browse Files
- Merge pull request #13117 from edx/pwattenberger/ECOM-5065 · 59ac60f2
```
ECOM-5065 Don't retry invalid email response from Sailthru
```
  PaulWattenberger committed Jul 28, 2016
  59ac60f2 Browse Files
- ECOM-5065 Don't treat invalid email response from Sailthru as retryable error · dd4bab3c
  PaulWattenberger committed Jul 28, 2016
  
  dd4bab3c Browse Files
- Merge pull request #13083 from edx/tnl/enable_milestones · 7fc02076
```
Enable Milestones in LMS Tests
```
  sanfordstudent committed Jul 28, 2016
  7fc02076 Browse Files
- Merge pull request #13101 from edx/raees/chrome-bokchoy-skip-discussion-sort-preference · e861b609
```
Skipped test failing on chrome due to old version
```
  raeeschachar committed Jul 28, 2016
  e861b609 Browse Files
27 Jul, 2016 1 commit
- Merge pull request #13114 from edx/pwattenberger/ECOM-5059 · 97489999
```
ECOM-5059 Fix domain Sailthru logon cookie dropped in to
```
  PaulWattenberger committed Jul 27, 2016
  97489999 Browse Files