Commits · 990f6a0b76bdd6565698f25c9b234a4a98bdbcf7 · edx / edx-platform

24 Mar, 2015 2 commits
- Merge pull request #7462 from edx/clrux/logistration-text-alignment-fix · 990f6a0b
```
Centering the third-party social media buttons
```
  Chris committed Mar 24, 2015
  990f6a0b Browse Files
- Centering social media buttons · 0bdb43a4
  Chris Rodriguez committed Mar 24, 2015
  
  0bdb43a4 Browse Files
23 Mar, 2015 26 commits
- Merge pull request #7455 from edx/aleffert/video_web_only · 0f0ee6a3
```
Add web-only setting to video module
```
  Greg Price committed Mar 23, 2015
  0f0ee6a3 Browse Files
- Merge pull request #7452 from edx/cdodge/get-courses-filter · 4900d7a5
```
do the ORG filtering as part of the mongo query. Also, don't trigger met...
```
  chrisndodge committed Mar 23, 2015
  4900d7a5 Browse Files
- Add web-only setting to video module · 438ce5f7
```
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.

JIRA: MA-307
```
  Greg Price committed Mar 23, 2015
  438ce5f7 Browse Files
- do the ORG filtering as part of the mongo query. Also, don't trigger metadata… · b6a333f3
```
do the ORG filtering as part of the mongo query. Also, don't trigger metadata inheritence calculations when just trying to load 'about' information, which is not tied into the course tree anyhow (i.e. no parent/child relationship)
```
  Chris Dodge committed Mar 23, 2015
  b6a333f3 Browse Files
- Merge pull request #7425 from edx/clrux/ux-1784-generate-certificates · 30058b91
```
Styling for automatic cert generation on Progress page
```
  Will Daly committed Mar 23, 2015
  30058b91 Browse Files
- Merge pull request #7447 from edx/sarina/20150323-update-translations · 8710c638
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Mar 23, 2015
  8710c638 Browse Files
- Update translations (autogenerated message) · 71486fc4
  Sarina Canelake committed Mar 23, 2015
  
  71486fc4 Browse Files
- Merge pull request #6706 from edx/ammar/tnl-181 · 6fb48eb1
```
Allow Instructor To Rename Cohorts And Set Cohort Assignment Method.
```
  Usman Khalid committed Mar 23, 2015
  6fb48eb1 Browse Files
- Styling for automatic cert generation on Progress page · f8da29b9
  Chris Rodriguez committed Mar 23, 2015
  
  f8da29b9 Browse Files
- Merge pull request #7423 from edx/mjames/update_search_hash · e8cf0a35
```
Updating edx-search hash to include bugfixes
```
  Martyn James committed Mar 23, 2015
  e8cf0a35 Browse Files
- Merge pull request #7150 from edx/dcikatic/courseware_search_tracking · 775de9e8
```
SOL-217 Adding basic analytics events logging for courseware search - In discussing with @mulby, we agreed to allow this to go in , and we'll add a story to improve the tests at a later time.
```
  Martyn James committed Mar 23, 2015
  775de9e8 Browse Files
- Merge pull request #7017 from edx/ammar/move-cohort-management-tnl-1268 · 7426102d
```
Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab.
```
  Usman Khalid committed Mar 23, 2015
  7426102d Browse Files
- Fixes after rebase. · c50f8281
  Usman Khalid committed Mar 23, 2015
  
  c50f8281 Browse Files
- Merge pull request #7437 from edx/will/ecom-1229 · 3f2cd706
```
Course info page no longer creates enrollments.
```
  Will Daly committed Mar 23, 2015
  3f2cd706 Browse Files
- Cohort discussion topics via UI in instructor dashboard. · e6c75529
```
TNL-1256
```
  muzaffaryousaf committed Mar 23, 2015
  e6c75529 Browse Files
- Removed cohort_config from advanced settings page. · e07f45b5
```
TNL-1258
```
  Usman Khalid committed Mar 23, 2015
  e07f45b5 Browse Files
- Use RequestCache to cache cohorts information. · eee6250f
```
TNL-1258
```
  Usman Khalid committed Mar 23, 2015
  eee6250f Browse Files
- Refactor django_comment_client.utils.prepare_content() to query · d382f569
```
course cohort settings only once.

TNL-1258
```
  Usman Khalid committed Mar 23, 2015
  d382f569 Browse Files
- Cache cohort info during requests to reduce SQL queries. · a9e0082c
```
TNL-1258
```
  Usman Khalid committed Mar 23, 2015
  a9e0082c Browse Files
- Use cohort settings from CourseCohortSettings. · d59be994
```
TNL-1258
```
  Usman Khalid committed Mar 23, 2015
  d59be994 Browse Files
- Change labels · b56e1233
  muhammad-ammar committed Mar 23, 2015
  
  b56e1233 Browse Files
- Rename `Cohort Management` to `Cohorts` · 9ce66c78
```
Move `Cohorts` section after `Membership` section
```
  muhammad-ammar committed Mar 23, 2015
  9ce66c78 Browse Files
- Changes after Andy's Review · 70efd284
  Muhammad Ammar committed Mar 23, 2015
  
  70efd284 Browse Files
- Enable/disable cohorts from the instructor dashboard and move cohorts management to its own tab · 3ce494f5
```
TNL-1268
```
  Muhammad Ammar committed Mar 23, 2015
  3ce494f5 Browse Files
- Added get_cohort_associated_assignment_type method. · d8396924
  muzaffaryousaf committed Mar 23, 2015
  
  d8396924 Browse Files
- Allow Instructor To Rename Cohorts And Set Cohort Assignment Method · 0ebd8c29
```
TNL-181
```
  muhammad-ammar committed Mar 23, 2015
  0ebd8c29 Browse Files
21 Mar, 2015 4 commits
- Merge pull request #7440 from edx/nimisha/fix-account-creation-merge-issue · ec6cc04b
```
Fixes merge conflict with account creation transaction.
```
  Nimisha Asthagiri committed Mar 21, 2015
  ec6cc04b Browse Files
- Fixes merge conflict with account creation transaction. · dd8aba8f
  Nimisha Asthagiri committed Mar 21, 2015
  
  dd8aba8f Browse Files
- Merge pull request #7420 from open-craft/fix-library-analytics · c35cd5d8
```
Fix two content library analytics issues (SOL-521)
```
  Braden MacDonald committed Mar 20, 2015
  c35cd5d8 Browse Files
- Fix two content library analytics issues (SOL-521) · 7764f364
  Braden MacDonald committed Mar 20, 2015
  
  7764f364 Browse Files
20 Mar, 2015 8 commits
- Merge pull request #7353 from edx/mobile/third-party-oauth-reg · 289469dd
```
Mobile registration with Google/FB
```
  Nimisha Asthagiri committed Mar 20, 2015
  289469dd Browse Files
- Merge pull request #7436 from edx/ned/upgrade-pylint · 8a1877f0
```
Upgrade pylint
```
  Ned Batchelder committed Mar 20, 2015
  8a1877f0 Browse Files
- Lower the pylint threshold · 5a414914
  Ned Batchelder committed Mar 20, 2015
  
  5a414914 Browse Files
- Fix unidiomatic type checking · f396c115
  Ned Batchelder committed Mar 20, 2015
  
  f396c115 Browse Files
- MA-95: Update Registration endpoint to support 3rd party credentials · dfcef9dd
```
Automatically link edX account with social account in login mobile API path
```
  Nimisha Asthagiri committed Mar 20, 2015
  dfcef9dd Browse Files
- Merge pull request #7430 from edx/talbs/fix-certs-csspath · c01ab4a8
```
Certificates: Revising compiled CSS paths to match existing LMS patterns
```
  Brian Talbot committed Mar 20, 2015
  c01ab4a8 Browse Files
- Merge pull request #7378 from edx/clintonb/pay-with-oscar · 89620a33
```
Creating orders with E-Commerce API
```
  Clinton Blackburn committed Mar 20, 2015
  89620a33 Browse Files
- Course info page no longer creates enrollments. · 704e8836
```
The course info page was getting-or-creating
a course enrollment with is_active=0.  This commit
changes the operation to a "get" so that extra
enrollment records are not created.
```
  Will Daly committed Mar 20, 2015
  704e8836 Browse Files