Commits · a9dce7c33191a0a0a5436bff947bd457d5615b94 · edx / edx-platform · GitLab

25 Mar, 2015 1 commit
- Clean up transactional behavior in User API · a9dce7c3
  Andy Armstrong committed Mar 25, 2015
  
  a9dce7c3 Browse Files
23 Mar, 2015 18 commits
- 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
- 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 17 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
- Updated create_order endpoint to use E-Commerce API for order creation and enrollment · 306a267d
```
This functionality is activated by adding a SKU to a non-honor course mode. When the feature is activated, verified orders will be created by the E-Commerce Service instead of LMS. After payment, the E-Commerce Service will also create the enrollment.
```
  Clinton Blackburn committed Mar 20, 2015
  306a267d Browse Files
- pylint --> 1.4.2, and pin astroid · 6c70f30d
  Ned Batchelder committed Mar 20, 2015
  
  6c70f30d Browse Files
- Merge pull request #7431 from edx/zoldak/SOL-336 · 5d65f577
```
Decorate flaky test SOL-336
```
  Jesse Zoldak committed Mar 20, 2015
  5d65f577 Browse Files
- Merge pull request #7426 from edx/adam/merge-release-to-master · d012428c
```
Adam/merge release to master
```
  Adam committed Mar 20, 2015
  d012428c Browse Files
- Decorate flaky test SOL-336 · bb4e5776
  Jesse Zoldak committed Mar 20, 2015
  
  bb4e5776 Browse Files
- certificates: revising compiled CSS paths to match existing LMS patterns · f4c3a732
  Brian Talbot committed Mar 20, 2015
  
  f4c3a732 Browse Files
- Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types · 60cb7cf3
```
Standrize buttons in assessment problems
```
  Ahsan Ulhaq committed Mar 20, 2015
  60cb7cf3 Browse Files
- Merge pull request #7380 from OmarIthawi/edraak/platform-name-in-password-reset-confirm · 90a0459e
```
Keep platform_name in the password_reset_confirm.html always TNL-1654
```
  Sarina Canelake committed Mar 20, 2015
  90a0459e Browse Files
- Merge pull request #7405 from edx/shr/bug/PLAT-466-Bad-course-about-page-value-500-error · 1e73c272
```
handle invalid-key exception for split courses
```
  Shrhawk committed Mar 20, 2015
  1e73c272 Browse Files