Commits · 9b3841f62c06d8919fd486bcf066521d5924345d · edx / edx-platform · GitLab

19 Oct, 2015 1 commit
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · 9b3841f6
```
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
```
  Adam Palay committed Oct 19, 2015
  9b3841f6 Browse Files
16 Oct, 2015 15 commits
- Merge pull request #9845 from edx/christina/bio-hyperlink · 300bd431
```
Make HTML for non-editable views on leaner profile page more logical
```
  Christina Roberts committed Oct 16, 2015
  300bd431 Browse Files
- profile page style cleanup · 113cab87
```
remove link style, add pointer, adjust spacing on profile
```
  Frances Botsford committed Oct 16, 2015
  113cab87 Browse Files
- Merge pull request #10195 from edx/hotfix/2015-10-15 · 3a61cca7
```
Hotfix/2015 10 15
```
  Adam committed Oct 16, 2015
  3a61cca7 Browse Files
- Merge pull request #10147 from edx/saleem-latif/SOL-1266-feedback-changes · 83734989
```
saleem-latif/SOL-1266: Move Course Number and Course Number Override below Course Title section
```
  Matt Drayer committed Oct 16, 2015
  83734989 Browse Files
- Merge pull request #10170 from mitocw/gdm_fix_pylint_lms.djangoapps.ccx · a72425c8
```
Fixed pylint violation for files in lms/djangoapps/ccx
```
  Sarina Canelake committed Oct 16, 2015
  a72425c8 Browse Files
- Fixed pylint violation for files in lms/djangoapps/ccx · 220c1e29
  Giovanni Di Milia committed Oct 16, 2015
  
  220c1e29 Browse Files
- Make HTML for non-editable views more logical. · c6ba7474
```
TNL-3297
```
  cahrens committed Oct 16, 2015
  c6ba7474 Browse Files
- Merge pull request #10226 from edx/adam/skip-test-if-third-party-auth-not-installed · 5ec3d83d
```
skip LTIConfig test when third_party_auth is not installed
```
  Adam committed Oct 16, 2015
  5ec3d83d Browse Files
- Merge pull request #10222 from edx/mashtaq/fix-quality-template-escaping · 387d4f6a
```
Fix quality for template escaping
```
  Adam committed Oct 16, 2015
  387d4f6a Browse Files
- skip LTIConfig test when third_party_auth is not installed · 9a79bf2e
  Adam Palay committed Oct 16, 2015
  
  9a79bf2e Browse Files
- Fix quality for template escaping · 1b49f0cd
  Mushtaq Ali committed Oct 16, 2015
  
  1b49f0cd Browse Files
- Merge pull request #10218 from edx/sarina/20151016-update-translations · d367f7ad
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Oct 16, 2015
  d367f7ad Browse Files
- Update translations (autogenerated message) · 6e47cbfb
  Sarina Canelake committed Oct 16, 2015
  
  6e47cbfb Browse Files
- Changes after testing on staging · 5f766f38
  Saleem Latif committed Oct 16, 2015
  
  5f766f38 Browse Files
- Merge pull request #10201 from mitocw/gdm_fix_pylint_lms.djangoapps.certificates · d26d03da
```
Fixed pylint violation for files in lms/djangoapps/certificates
```
  Matt Drayer committed Oct 16, 2015
  d26d03da Browse Files
15 Oct, 2015 12 commits
- Merge pull request #10129 from edx/benp/more-unique-cohort-bokchoy · c54de688
```
Make these tests more unique for multiprocessing.
```
  Ben Patterson committed Oct 15, 2015
  c54de688 Browse Files
- Merge pull request #10183 from edx/ahsan/ECOM-2551-Update-Credit-Eligibility-Table-for-Skips · da9f0f23
```
Update Credit Requirement Status Table for Skips
```
  Ahsan Ulhaq committed Oct 16, 2015
  da9f0f23 Browse Files
- Merge pull request #10154 from edx/saleem-latif/SOL-1297 · f1951df2
```
saleem-latif/SOL-1297: updated message for 500 error on certificate preview
```
  Matt Drayer committed Oct 15, 2015
  f1951df2 Browse Files
- Merge pull request #10193 from edx/christina/move-require-test · 50fd135c
```
Clean up of common JS specs using RequireJS.
```
  Christina Roberts committed Oct 15, 2015
  50fd135c Browse Files
- Fixed pylint violation for files in lms/djangoapps/certificates · 476f6821
  Giovanni Di Milia committed Oct 15, 2015
  
  476f6821 Browse Files
- Move main_requirejs to live with the requirejs files. · b67f07af
  cahrens committed Oct 15, 2015
  
  b67f07af Browse Files
- Move edx.utils.validate. · a099ff86
```
The test was not running where it lived before.
```
  cahrens committed Oct 15, 2015
  a099ff86 Browse Files
- Bump Problem Builder to include fix from pb PR 71 · a144fdde
  Braden MacDonald committed Oct 15, 2015
  
  a144fdde Browse Files
- MAYN-116 Including GTM code from microsite · db547cc6
  asadiqbal committed Oct 15, 2015
  
  db547cc6 Browse Files
- Merge pull request #10115 from edx/ziafazal/SOL-1254 · 3e5ad298
```
ziafazal/SOL-1254: Student should see rest of courseware as soon as Entrance Exam is passed
```
  Matt Drayer committed Oct 15, 2015
  3e5ad298 Browse Files
- Update Credit Eligibility Table for Skips · 7fa9d73a
```
ECOM-2551
```
  Ahsan Ulhaq committed Oct 15, 2015
  7fa9d73a Browse Files
- updated message for 500 error on certificate preview · 466abcdc
  Saleem Latif committed Oct 15, 2015
  
  466abcdc Browse Files
14 Oct, 2015 12 commits
- Merge pull request #10159 from mitocw/gdm_fix_pylint · 6fb89fee
```
Fixed pylint violations for files in lms/
```
  Matt Drayer committed Oct 14, 2015
  6fb89fee Browse Files
- Merge pull request #10169 from mitocw/gdm_fix_pylint_lms.djangoapps.bulk_email · 927dc102
```
Fixed pylint violation for files in lms/djangoapps/bulk_email
```
  Matt Drayer committed Oct 14, 2015
  927dc102 Browse Files
- Merge pull request #10160 from mitocw/gdm_fix_pylint_lms.djangoapps.branding · 744c1025
```
Fixed pylint violations for files in lms/djangoapps/branding
```
  Matt Drayer committed Oct 14, 2015
  744c1025 Browse Files
- Fixed pylint violation for files in lms/djangoapps/bulk_email · 08dfe5e9
  Giovanni Di Milia committed Oct 14, 2015
  
  08dfe5e9 Browse Files
- Fixed pylint violation for files in lms/djangoapps/branding · ecdb0b27
  Giovanni Di Milia committed Oct 14, 2015
  
  ecdb0b27 Browse Files
- Fixed pylint violation for files in lms/ · ddc46833
  Giovanni Di Milia committed Oct 14, 2015
  
  ddc46833 Browse Files
- Merge pull request #10161 from edx/mattdrayer/update-gencert-modes · 3e89af3a
```
mattdrayer/update-gencert-modes: Added prof-ed modes to set
```
  Matt Drayer committed Oct 14, 2015
  3e89af3a Browse Files
- mattdrayer/update-gencert-modes: Added prof-ed modes to set · 6dfa81e5
  Matt Drayer committed Oct 14, 2015
  
  6dfa81e5 Browse Files
- Merge pull request #10144 from justinabrahms/fail-fast-flag-description-fix · 2b5810db
```
Fix help description for test's --fail_fast flag
```
  Sarina Canelake committed Oct 14, 2015
  2b5810db Browse Files
- Add myself to the AUTHORs file. · ac35571a
  Justin Abrahms committed Oct 14, 2015
  
  ac35571a Browse Files
- Merge pull request #10137 from edx/chrome-bok-choy-all-tests-in-own-learner-profile-page-test · e72feead
```
Fixed all tests in OwnLearnerProfilePageTest that were failing on Chrome
```
  raeeschachar committed Oct 14, 2015
  e72feead Browse Files
- Merge pull request #10131 from open-craft/fix-microsite-import · 6f08eb0f
```
Fix staticfiles import in microsite.py.
```
  Fred Smith committed Oct 14, 2015
  6f08eb0f Browse Files