Commits · d14c7cf14f7dfad36e6799aa22017a60c0690738 · edx / edx-platform · GitLab

24 Feb, 2015 23 commits
- Use flaky from clytwynec fork · d14c7cf1
  Christine Lytwynec committed Feb 24, 2015
  
  d14c7cf1 Browse Files
- fix extra_args for lib tests · 371f7ca4
  Christine Lytwynec committed Feb 24, 2015
  
  371f7ca4 Browse Files
- add --with-flaky in jenkins script · 35b6e15d
  Christine Lytwynec committed Feb 24, 2015
  
  35b6e15d Browse Files
- add flaky decorator to StudioLibraryContainerTest.test_out_of_date_message · ac03f874
```
Relates to: TE-745
```
  Christine Lytwynec committed Feb 24, 2015
  ac03f874 Browse Files
- add flaky to requirements file · c229fcad
  Christine Lytwynec committed Feb 24, 2015
  
  c229fcad Browse Files
- Merge pull request #7089 from edx/clintonb/cs-api-fix · 6f7a0665
```
Fixed Course List Endpoint
```
  Clinton Blackburn committed Feb 24, 2015
  6f7a0665 Browse Files
- Merge pull request #7066 from edx/dcikatic/SOL-259 · 8acdf532
```
SOL-259 Change HTML content listed type in index from HTML Content to Te...
```
  Martyn James committed Feb 24, 2015
  8acdf532 Browse Files
- Merge pull request #6914 from edx/dcikatic/courseware_search_index_DRF · d8799057
```
Changing search_reindex call to be more inline with DRF convention
```
  Martyn James committed Feb 24, 2015
  d8799057 Browse Files
- Merge pull request #7093 from edx/pylint-6k · 3a9a7961
```
Pylint violations are below 6000
```
  David Baumgold committed Feb 24, 2015
  3a9a7961 Browse Files
- Fixed Course List Endpoint · 0385a8b5
```
Updated filter to ensure only course descriptors are returned.
```
  Clinton Blackburn committed Feb 24, 2015
  0385a8b5 Browse Files
- Pylint violations are below 6000 · a1fc25b8
  David Baumgold committed Feb 24, 2015
  
  a1fc25b8 Browse Files
- Merge pull request #7088 from edx/ned/move-docs-to-docs · d8a45294
```
Move internal documentation to the internal documentation directory
```
  Ned Batchelder committed Feb 24, 2015
  d8a45294 Browse Files
- Merge pull request #7078 from edx/db/upgrade-pip · 3b06d711
```
Use pip 6.0.8
```
  David Baumgold committed Feb 24, 2015
  3b06d711 Browse Files
- Changing search_reindex call to be more inline with DRF convention · b597df2e
  Dino Cikatic committed Feb 24, 2015
  
  b597df2e Browse Files
- Move internal documentation to the internal documentation directory · 1b7e8b78
  Ned Batchelder committed Feb 24, 2015
  
  1b7e8b78 Browse Files
- Merge pull request #7083 from edx/ned/readme-rst · a76e5c68
```
Convert README.md to README.rst
```
  Ned Batchelder committed Feb 24, 2015
  a76e5c68 Browse Files
- Merge pull request #7070 from edx/benp/fix-tnl1479 · 954d8ed9
```
Wait for DOM to reflect the selected option.
```
  Ben Patterson committed Feb 24, 2015
  954d8ed9 Browse Files
- Merge pull request #7080 from edx/adam/merge-release-into-master · 0b9e5719
```
Adam/merge release into master
```
  Adam committed Feb 24, 2015
  0b9e5719 Browse Files
- Merge pull request #7025 from edx/mobile/oauth2-allow-inactive-user · b280e44f
```
MA-291 Allow API access without email activation.
```
  Nimisha Asthagiri committed Feb 24, 2015
  b280e44f Browse Files
- Wait for DOM to reflect the selected option. · 8e7c17d5
```
TNL-1479
```
  Ben Patterson committed Feb 24, 2015
  8e7c17d5 Browse Files
- fix quality violation · 338ab4a6
  Adam Palay committed Feb 24, 2015
  
  338ab4a6 Browse Files
- Convert README.md to README.rst · 0b41d0f2
  Ned Batchelder committed Feb 24, 2015
  
  0b41d0f2 Browse Files
- MA-291 Allow API access without email activation · 83a3adb9
  Nimisha Asthagiri committed Feb 24, 2015
  
  83a3adb9 Browse Files
23 Feb, 2015 17 commits
- Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master · 3aca0d54
```
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/bulk_email/tasks.py
```
  Adam Palay committed Feb 23, 2015
  3aca0d54 Browse Files
- Merge pull request #6668 from edx/ziafazal/entrance-exam-management-on-instructor-dashboard-am · 9856deed
```
Ziafazal/entrance exam management on instructor dashboard
```
  Matt Drayer committed Feb 23, 2015
  9856deed Browse Files
- Merge pull request #7072 from edx/hotfix/2015-02-23 · 320d4812
```
split up bulk email query for students and unenrolled course staff (TNL-...
```
  Adam committed Feb 23, 2015
  320d4812 Browse Files
- Instructor Dashboard management tools for Entrance Exams · b3f85e1d
```
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality
```
  Zia Fazal committed Feb 23, 2015
  b3f85e1d Browse Files
- Use pip 6.0.8 · 310a60ee
  David Baumgold committed Feb 23, 2015
  
  310a60ee Browse Files
- Merge pull request #7071 from edx/will/ecom-1108 · 80ae7176
```
Preserve enrollment_action and course_id querystring params in header 'Sign In' button
```
  Will Daly committed Feb 23, 2015
  80ae7176 Browse Files
- Merge pull request #7074 from edx/sarina/20150223-translations-update · 169175b7
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Feb 23, 2015
  169175b7 Browse Files
- Update translations (autogenerated message) · 40745c28
  Sarina Canelake committed Feb 23, 2015
  
  40745c28 Browse Files
- Merge pull request #7073 from edx/will/linkedin-margin-fix · 94daf078
```
Fix right margin of LinkedIn add-to-profile button
```
  Will Daly committed Feb 23, 2015
  94daf078 Browse Files
- Fix right margin of LinkedIn add-to-profile button · 1d985b91
  Will Daly committed Feb 23, 2015
  
  1d985b91 Browse Files
- Merge pull request #7040 from edx/will/finish-linkedin · 000cfa78
```
Finish LinkedIn button
```
  Will Daly committed Feb 23, 2015
  000cfa78 Browse Files
- Add tracking code to LinkedIn URL. · f854726e
```
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
```
  Will Daly committed Feb 23, 2015
  f854726e Browse Files
- Make the linked in configuration migration backwards compatible · 36855475
  Will Daly committed Feb 23, 2015
  
  36855475 Browse Files
- Force English for email opt in text appearing on the marketing site · badcb78a
  Will Daly committed Feb 23, 2015
  
  badcb78a Browse Files
- python standard logging · cfb2df11
  Syed Hassan Raza committed Feb 23, 2015
  
  cfb2df11 Browse Files
- Bump MongoDBProxy to handle AutoReconnect during find_one · b9c9a58a
  Calen Pennington committed Feb 23, 2015
  
  b9c9a58a Browse Files
- Merge pull request #7027 from edx/jeskew/defn_loading_perf_problems · d3e2cb0f
```
Rollback override of lazy definition loading for large courses.
```
  John Eskew committed Feb 23, 2015
  d3e2cb0f Browse Files