Commits · aba76a0912b0827d34140f6dec4d1f9438299310 · edx / edx-platform

26 Sep, 2014 5 commits
- Merge pull request #5391 from edx/clytwynec/skip_firefox_version_check_if_not_using_firefox · aba76a09
```
skipping the firefox version validation if firefox is not the browser be...
```
  clytwynec committed Sep 26, 2014
  aba76a09 Browse Files
- Merge pull request #5400 from edx/merge-conflicts-release · b6a5bea0
```
Merge conflicts release
```
  Adam committed Sep 26, 2014
  b6a5bea0 Browse Files
- Merge pull request #5304 from edx/markhoeber-doc910 · 792c8eaf
```
Updated help link and content of Studio container page
```
  Mark Hoeber committed Sep 26, 2014
  792c8eaf Browse Files
- Merge pull request #5398 from edx/sanchez/fix_about_page_header · c88e9140
```
Allowing new styles on White Label about pages.
```
  Stephen Sanchez committed Sep 26, 2014
  c88e9140 Browse Files
- Merge pull request #5199 from edx/ned/remove-jsdraw · 4d56f62d
```
Remove JSDraw
```
  Ned Batchelder committed Sep 25, 2014
  4d56f62d Browse Files
25 Sep, 2014 18 commits
- Merge remote-tracking branch 'origin/release' into merge-conflicts-release · 01f2f81c
```
Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
```
  Adam Palay committed Sep 25, 2014
  01f2f81c Browse Files
- Merge pull request #5397 from edx/hotfix-annotations · 79a3bfcb
```
Hotfix annotations
```
  Adam committed Sep 25, 2014
  79a3bfcb Browse Files
- Merge pull request #5386 from open-craft/fix-anonymous-ids-unicode · fbd9cc13
```
Fix UnicodeError with anonymous student IDs
```
  Sarina Canelake committed Sep 25, 2014
  fbd9cc13 Browse Files
- Crude solution to allowing new styles on White Label about pages. · 3fd3bd4e
  Stephen Sanchez committed Sep 25, 2014
  
  3fd3bd4e Browse Files
- skipping the firefox version validation if firefox is not the browser being used · b059d37b
  Christine Lytwynec committed Sep 25, 2014
  
  b059d37b Browse Files
- Merge branch 'release' · 0ed3a95d
```
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
```
  Andy Armstrong committed Sep 25, 2014
  0ed3a95d Browse Files
- Merge pull request #5395 from lduarte1991/lduarte-harvardx-pr30 · 73b3e218
```
Annotation Tools: Fixes issue - Thumbnail check breaks tool on creation
```
  Adam committed Sep 25, 2014
  73b3e218 Browse Files
- Merge pull request #5374 from edx/markhoeber-documentaton-doc995 · 2fbf67b2
```
Release Notes - Sept 25, 2014
```
  srpearce committed Sep 25, 2014
  2fbf67b2 Browse Files
- Annotation Tools: Thumbnail check breaks on creation · 7f8dd6a1
```
 - Fixed second similar function.

Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
```
  lduarte1991 committed Sep 25, 2014
  7f8dd6a1 Browse Files
- Merge pull request #5387 from edx/will/account-and-profile-more-tests · daeddf3e
```
Added test for email activation and confirmation
```
  Will Daly committed Sep 25, 2014
  daeddf3e Browse Files
- Merge pull request #5378 from edx/zoldak/look-into-languagetest · 77178e9f
```
Add explanation and small optimizations to LanguageTest
```
  Jesse Zoldak committed Sep 25, 2014
  77178e9f Browse Files
- Merge pull request #5328 from edx/flowerhack/auto-login · c5ae921d
```
Automatically log in users who access third party login after trying to register for a course
```
  Julia Hansbrough committed Sep 25, 2014
  c5ae921d Browse Files
- Added test for email activation and confirmation · 84463ef1
  Will Daly committed Sep 25, 2014
  
  84463ef1 Browse Files
- Merge pull request #5383 from edx/will/account-and-profile-rebase · afa39a86
```
Add Django apps for student account and profile
```
  Will Daly committed Sep 25, 2014
  afa39a86 Browse Files
- Add Django apps for student account and profile. · 7f8c6bb0
```
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
```
  Will Daly committed Sep 25, 2014
  7f8c6bb0 Browse Files
- Merge pull request #5276 from edx/anton/forums-topic · 85af48a3
```
Change the topic of a previously posted post.
```
  Anton Stupak committed Sep 25, 2014
  85af48a3 Browse Files
- Fix UnicodeError with anonymous student IDs · 8e326722
  Braden MacDonald committed Sep 24, 2014
  
  8e326722 Browse Files
- Merge pull request #5370 from edx/jeskew/wrap_studio_views_in_bulk_ops · fcf57a8e
```
Wrap studio views in bulk operations to minimize mongo calls.
```
  John Eskew committed Sep 24, 2014
  fcf57a8e Browse Files
24 Sep, 2014 17 commits
- Add bulk_operations wrapper around all course-query-intensive Studio views. · 46cd9b0a
  John Eskew committed Sep 24, 2014
  
  46cd9b0a Browse Files
- Response to CR · 6b061ad2
  Julia Hansbrough committed Sep 24, 2014
  
  6b061ad2 Browse Files
- Pass _get_course_module() depth param down into modulestore get_course() instead… · 2f060733
```
Pass _get_course_module() depth param down into modulestore get_course() instead of hard-coded zero.
```
  John Eskew committed Sep 24, 2014
  2f060733 Browse Files
- Merge pull request #5385 from rocha/use-strings-in-session-key-value-store · ed68b0ab
```
Use strings instead of tuples as keys in SessionKeyValueStore.
```
  Carlos Andrés Rocha committed Sep 24, 2014
  ed68b0ab Browse Files
- Merge pull request #5335 from edx/sanchez/add_course_info_to_wiki · c28162b5
```
Making the django main template navigation course aware.
```
  Stephen Sanchez committed Sep 24, 2014
  c28162b5 Browse Files
- Merge pull request #5363 from mlkwaqas/waqas/tnl315-cannot-remove-discussion-admin · 52dd2734
```
Course admin should be able to de-admin dicussion admins
```
  Waqas Khalid committed Sep 25, 2014
  52dd2734 Browse Files
- Release Notes - Sept 25, 2014 · 7630cf7a
  Mark Hoeber committed Sep 24, 2014
  
  7630cf7a Browse Files
- Merge pull request #5384 from edx/frances/fix/prof-ed-status-AB-tes · e22bd1b6
```
fixes for status for prof ed and verified registration
```
  Andy Armstrong committed Sep 24, 2014
  e22bd1b6 Browse Files
- Use strings instead of tuples as keys in SessionKeyValueStore · fc04d8f2
```
Some Django packages expect only strings as keys in the user session,
and it is also a recommended practice in the Django manual.
```
  Carlos Andrés Rocha committed Sep 24, 2014
  fc04d8f2 Browse Files
- Merge pull request #5381 from edx/sarina/annotations-fix · 75257083
```
Image Annotation Tool: Fixes _isOpenSeaDragon function
```
  Sarina Canelake committed Sep 24, 2014
  75257083 Browse Files
- Merge pull request #5382 from edx/revert-5380-revert-5359-cdodge/add-microsite-tag-to-zendesk · 74fb8e93
```
Revert "Revert "add an additional tag so we can route zendesk tickets be...
```
  Andy Armstrong committed Sep 24, 2014
  74fb8e93 Browse Files
- Update translations (autogenerated message) · 5cdd4f4c
  Sarina Canelake committed Sep 24, 2014
  
  5cdd4f4c Browse Files
- fixes for status for prof ed and verified registration on both variants of AB test · b889f9ef
  Frances Botsford committed Sep 24, 2014
  
  b889f9ef Browse Files
- Merge pull request #5379 from edx/oleg/lti-add-username-email · 5b72e159
```
Allow students to send username and email to third parties (TNL-405).
```
  Oleg Marshev committed Sep 24, 2014
  5b72e159 Browse Files
- Merge pull request #5375 from rocha/update-oauth2-provider · 617b53cb
```
Update version of edx-oauth2-provider
```
  Carlos Andrés Rocha committed Sep 24, 2014
  617b53cb Browse Files
- TNL-171: Change topic of a previously posted post. · 00c7e60e
  polesye committed Sep 24, 2014
  
  00c7e60e Browse Files
- Course admin should be able to de-admin dicussion admins · d0d225d8
```
As a global staff or course staff once you added yourself
in the discussion admins you cannot revoke it back unless
you remove yourself as course staff. Any of the course staff
member should be able to remove others from discussion admins
whether they are course staff or not.

TNL-315
```
  Waqas Khalid committed Sep 24, 2014
  d0d225d8 Browse Files