Commits · 2d216fc6109fe78f1518984dd9f47452b695cb77 · edx / edx-platform · GitLab

17 Jul, 2015 11 commits
- Merge pull request #8960 from edx/release-2015-07-08-conflict · 2d216fc6
```
Release 2015-07-08 conflict
```
  Max Rothman committed Jul 17, 2015
  2d216fc6 Browse Files
- Merge pull request #8964 from edx/zoldak/MA-1038 · 626d3fb0
```
Skip test that had a hardcoded date expectation  MA-1038
```
  Jesse Zoldak committed Jul 17, 2015
  626d3fb0 Browse Files
- Skip test that had a hardcoded date expectation MA-1038 · c2b4cf21
  Jesse Zoldak committed Jul 17, 2015
  
  c2b4cf21 Browse Files
- Merge pull request #8943 from edx/zoldak/more-flaky-js · 913a5dfe
```
Disable potentially flaky jasmine tests
```
  Jesse Zoldak committed Jul 17, 2015
  913a5dfe Browse Files
- Merge pull request #8940 from edx/zoldak/SOL-1053-skip · 41350002
```
Mark too-flaky test for skipping
```
  Jesse Zoldak committed Jul 17, 2015
  41350002 Browse Files
- Merge pull request #8837 from edx/benmcmorran/discussion-caching-3 · 2cf3390b
```
TNL-2389 Use discussion id map cache for thread creation and update
```
  Ben McMorran committed Jul 17, 2015
  2cf3390b Browse Files
- Merge branch 'release' into release-2015-07-08-conflict · d7b57309
```
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/templates/courseware/progress.html
	openedx/core/djangoapps/credit/tests/test_api.py
```
  Max Rothman committed Jul 17, 2015
  d7b57309 Browse Files
- Mark too-flaky test for skipping · ec6258a7
  Jesse Zoldak committed Jul 17, 2015
  
  ec6258a7 Browse Files
- Disable potentially flaky jasmine tests SOL-1065 · da68af5c
  Jesse Zoldak committed Jul 17, 2015
  
  da68af5c Browse Files
- Merge pull request #8953 from edx/vkaracic/TNL-394-additional-testing · c0de9429
```
TNL-394: Additional testing
```
  Vedran Karačić committed Jul 17, 2015
  c0de9429 Browse Files
- TNL-394: Additional testing · f5234b1a
```
This is an additional test for:
https://openedx.atlassian.net/browse/TNL-394
to test if the get_user function escapes values correctly.
```
  vkaracic committed Jul 17, 2015
  f5234b1a Browse Files
16 Jul, 2015 8 commits
- Merge pull request #8955 from edx/zoldak/cleanup-js-includes · e89d8e14
```
Remove unused includes
```
  Jesse Zoldak committed Jul 16, 2015
  e89d8e14 Browse Files
- Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required · 2d19eafa
```
Decorated instructor dashboard with sudo_required.
```
  Awais Jibran committed Jul 16, 2015
  2d19eafa Browse Files
- Merge pull request #8867 from edx/aamir-khan/ECOM-1816-credit-info-recept-page · 937ca38f
```
ECOM-1816: added the provider detail on the receipt page.
```
  Awais Qureshi committed Jul 16, 2015
  937ca38f Browse Files
- ECOM-1816: added the provider detail on the receipt page. · d5dda647
  aamir-khan committed Jul 16, 2015
  
  d5dda647 Browse Files
- Merge pull request #8932 from edx/tasawer/story/ecom-1858-provider-and-eligibility-details · ba06ab19
```
ECOM-1858
```
  tasawernawaz committed Jul 16, 2015
  ba06ab19 Browse Files
- Update code of get_eligibility api. · 1ded8b54
```
ECOM-1858
```
  Tasawer committed Jul 16, 2015
  1ded8b54 Browse Files
- Added DjangoSudo functionality for instructor dashboard and course team page · bc052db1
  Waheed Ahmed committed Jul 16, 2015
  
  bc052db1 Browse Files
- Merge pull request #8945 from ubc/wmono/update-authors · ae0e21b3
```
Update AUTHORS
```
  Sarina Canelake committed Jul 15, 2015
  ae0e21b3 Browse Files
15 Jul, 2015 21 commits
- Merge pull request #8938 from edx/renzo/update-edx-oauth2-provider · 7f6e61b1
```
Update edx-oauth2-provider to 0.5.3
```
  Renzo Lucioni committed Jul 15, 2015
  7f6e61b1 Browse Files
- Update AUTHORS · 3c489c85
  William Ono committed Jul 15, 2015
  
  3c489c85 Browse Files
- Remove unused includes · 7aebf068
  Jesse Zoldak committed Jul 15, 2015
  
  7aebf068 Browse Files
- Merge pull request #7322 from edx/sarina/remove-old-analytics-dashboard · bb7ba752
```
Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag AN-4583
```
  Sarina Canelake committed Jul 15, 2015
  bb7ba752 Browse Files
- Update edx-oauth2-provider to 0.5.3 · ea37ada4
  Renzo Lucioni committed Jul 15, 2015
  
  ea37ada4 Browse Files
- Merge pull request #8908 from edx/asadiqbal08/SOL-1050 · 0f2a36a6
```
asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL
```
  Matt Drayer committed Jul 15, 2015
  0f2a36a6 Browse Files
- asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL · 19d9ccbf
  asadiqbal committed Jul 15, 2015
  
  19d9ccbf Browse Files
- ziafazal/SOL-980: Fix error while generating certificates · b5c32ec4
  Zia Fazal committed Jul 15, 2015
  
  b5c32ec4 Browse Files
- Merge pull request #8912 from edx/asadiqbal08/SOL-1046 · 3f432d49
```
SOL-1046 converted anchor to button for linkedIn
```
  Matt Drayer committed Jul 15, 2015
  3f432d49 Browse Files
- Merge pull request #8933 from edx/revert-setuptools · 8c4bb8bf
```
Revert setuptools
```
  David Baumgold committed Jul 15, 2015
  8c4bb8bf Browse Files
- Remove outdated Analytics scripts, code, and css · 376fe0a5
  Sarina Canelake committed Jul 15, 2015
  
  376fe0a5 Browse Files
- Add messaging about Insights to Analytics instructor tab · 4f2be41a
  Sarina Canelake committed Jul 15, 2015
  
  4f2be41a Browse Files
- Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag · 9b905ae7
  Sarina Canelake committed Jul 15, 2015
  
  9b905ae7 Browse Files
- Add query count tests · d36eb83a
  Ben McMorran committed Jul 15, 2015
  
  d36eb83a Browse Files
- asadiqbal08/SOL-1046: Convert LinkedIn anchor tag to button · 56015fec
```
* remove the onclick event
* add mako check to Javascript handler
```
  asadiqbal committed Jul 15, 2015
  56015fec Browse Files
- Merge pull request #8931 from edx/ziafazal/fix-SOL-1008 · 66e1b11a
```
SOL-1008: only edx PM can activate/deactivate or delete certificate configuration
```
  Matt Drayer committed Jul 15, 2015
  66e1b11a Browse Files
- Revert MySQL-python upgrade · 2ff0f636
  David Baumgold committed Jul 15, 2015
  
  2ff0f636 Browse Files
- Revert setuptools upgrade · 1a3f0958
  David Baumgold committed Jul 15, 2015
  
  1a3f0958 Browse Files
- Merge pull request #8820 from edx/db/release-notes-column-in-release-script · 444cddaa
```
Add a column for release notes in the release.py table
```
  David Baumgold committed Jul 15, 2015
  444cddaa Browse Files
- Merge pull request #8851 from edx/vkaracic/PLAT-619-2 · 4eb4a82e
```
PLAT-619: Custom error messages for delete course command
```
  Vedran Karačić committed Jul 15, 2015
  4eb4a82e Browse Files
- only ddx PM can activate/deactivate or delete certificate configuration · 0793cc8b
```
fix for flaky test

fix for broken test

fixed quality violation
```
  Zia Fazal committed Jul 15, 2015
  0793cc8b Browse Files